kernel/omap seandroid-tuna-3.0

kernel/omap seandroid-tuna-3.0

[William Roberts]

[PATCH] Support older compilers by wrapping smc .arch

The earlier patch broke 4.4.0 builds, but it looks like 4.4.0
is no longer supported as other kernel erros spew when building
with that toolchain. However, I don't think that my patch should
be the one to break backwards compatability.

Opinions appreciated!

--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

[PATCH] Support older compilers by wrapping smc .arch

[William Roberts]

From: William Roberts <bill.c.roberts@gmail.com>

Fixes build bug
security/smc/bridge_pub2sec.S:95: Error: selected processor does not support ARM mode `smc #0'

Signed-off-by: William Roberts <w.roberts@sta.samsung.com>
---
 security/smc/bridge_pub2sec.S |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/security/smc/bridge_pub2sec.S b/security/smc/bridge_pub2sec.S
index 30b8b35..e433380 100644
--- a/security/smc/bridge_pub2sec.S
+++ b/security/smc/bridge_pub2sec.S
@@ -74,7 +74,9 @@ return_from_irq:
 	b	label_smc
 
 label_smc:
-	.arch_extension sec
+#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 6
+        .arch_extension sec
+#endif
 	INVALIDATE_BTB
 	dsb
 	dmb
-- 
1.7.0.4


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

Re: [PATCH] Support older compilers by wrapping smc .arch

[Stephen Smalley]

On Wed, 2012-07-25 at 13:38 -0700, William Roberts wrote:
> From: William Roberts <bill.c.roberts@gmail.com>
> 
> Fixes build bug
> security/smc/bridge_pub2sec.S:95: Error: selected processor does not support ARM mode `smc #0'
> 
> Signed-off-by: William Roberts <w.roberts@sta.samsung.com>

Thanks, applied.

> ---
>  security/smc/bridge_pub2sec.S |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/security/smc/bridge_pub2sec.S b/security/smc/bridge_pub2sec.S
> index 30b8b35..e433380 100644
> --- a/security/smc/bridge_pub2sec.S
> +++ b/security/smc/bridge_pub2sec.S
> @@ -74,7 +74,9 @@ return_from_irq:
>  	b	label_smc
>  
>  label_smc:
> -	.arch_extension sec
> +#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 6
> +        .arch_extension sec
> +#endif
>  	INVALIDATE_BTB
>  	dsb
>  	dmb

-- 
Stephen Smalley
National Security Agency


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

Re: [PATCH] Support older compilers by wrapping smc .arch

[Michal Mašek]

On 07/25/2012 10:38 PM, William Roberts wrote:
> From: William Roberts <bill.c.roberts@gmail.com>
> 
> Fixes build bug
> security/smc/bridge_pub2sec.S:95: Error: selected processor does not support ARM mode `smc #0'
> 
> Signed-off-by: William Roberts <w.roberts@sta.samsung.com>
> ---
>  security/smc/bridge_pub2sec.S |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/security/smc/bridge_pub2sec.S b/security/smc/bridge_pub2sec.S
> index 30b8b35..e433380 100644
> --- a/security/smc/bridge_pub2sec.S
> +++ b/security/smc/bridge_pub2sec.S
> @@ -74,7 +74,9 @@ return_from_irq:
>  	b	label_smc
>  
>  label_smc:
> -	.arch_extension sec
> +#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 6

Should the ".arch_extension sec" line be present when compiling with
some future compiler (eg. 5.1)? If so then this condition is not correct
because it will not be met if the major number is greater than 4 and
minor number is lower than 6 (eg. version 5.1). I do not know the proper
syntax but the condition should look something like this:

#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)

> +        .arch_extension sec
> +#endif
>  	INVALIDATE_BTB
>  	dsb
>  	dmb

--
Michal Mašek


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.