Annotate arm userspace assembler sources stating their tolerance to

the non-executable stack.

Reviewed by:	andrew
Sponsored by:	The FreeBSD Foundation

diff --git a/contrib/compiler-rt/lib/builtins/arm/aeabi_memcmp.S b/contrib/compiler-rt/lib/builtins/arm/aeabi_memcmp.S
index 051ce435bab9309b16bc29a851b941b05179a5a0..fa693272fd48f06529c516b3d07ed1fcea8d2e70 100644 (file)
--- a/contrib/compiler-rt/lib/builtins/arm/aeabi_memcmp.S
+++ b/contrib/compiler-rt/lib/builtins/arm/aeabi_memcmp.S
@@ -18,3 +18,5 @@ END_COMPILERRT_FUNCTION(__aeabi_memcmp)
 
 DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memcmp4, __aeabi_memcmp)
 DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memcmp8, __aeabi_memcmp)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/contrib/compiler-rt/lib/builtins/arm/aeabi_memcpy.S b/contrib/compiler-rt/lib/builtins/arm/aeabi_memcpy.S
index cf02332490a1224c6047a6ac44b718b24e13d2b9..35b8558f997c554a4466ae4ba4d64fb9d0c7a071 100644 (file)
--- a/contrib/compiler-rt/lib/builtins/arm/aeabi_memcpy.S
+++ b/contrib/compiler-rt/lib/builtins/arm/aeabi_memcpy.S
@@ -18,3 +18,5 @@ END_COMPILERRT_FUNCTION(__aeabi_memcpy)
 
 DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memcpy4, __aeabi_memcpy)
 DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memcpy8, __aeabi_memcpy)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/contrib/compiler-rt/lib/builtins/arm/aeabi_memmove.S b/contrib/compiler-rt/lib/builtins/arm/aeabi_memmove.S
index 4dda06f75d04b559d04228f8a18d78a75eafd8b9..2f9f789ab750eb81c9036f72d0b4fe6e4170ad97 100644 (file)
--- a/contrib/compiler-rt/lib/builtins/arm/aeabi_memmove.S
+++ b/contrib/compiler-rt/lib/builtins/arm/aeabi_memmove.S
@@ -18,3 +18,5 @@ END_COMPILERRT_FUNCTION(__aeabi_memmove)
 
 DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memmove4, __aeabi_memmove)
 DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memmove8, __aeabi_memmove)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/contrib/compiler-rt/lib/builtins/arm/aeabi_memset.S b/contrib/compiler-rt/lib/builtins/arm/aeabi_memset.S
index c8b49c7809a6224246f3a3f273535b53d27995db..f2342f0772c222686041a302f9d6982c705e6869 100644 (file)
--- a/contrib/compiler-rt/lib/builtins/arm/aeabi_memset.S
+++ b/contrib/compiler-rt/lib/builtins/arm/aeabi_memset.S
@@ -32,3 +32,4 @@ END_COMPILERRT_FUNCTION(__aeabi_memclr)
 DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memclr4, __aeabi_memclr)
 DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memclr8, __aeabi_memclr)
 
+       .section .note.GNU-stack,"",%progbits

diff --git a/contrib/gcc/config/arm/crti.asm b/contrib/gcc/config/arm/crti.asm
index 166a3ce34e8cca3dde9889e927b018e2876df71b..8df00d2585ff7f029d2c0bebaa9848feeb36b108 100644 (file)
--- a/contrib/gcc/config/arm/crti.asm
+++ b/contrib/gcc/config/arm/crti.asm
@@ -60,6 +60,8 @@
                
        .file           "crti.asm"
 
+       .section .note.GNU-stack,"",%progbits
+
        .section        ".init"
        .align 2
        .global _init

diff --git a/contrib/gcc/config/arm/crtn.asm b/contrib/gcc/config/arm/crtn.asm
index 360afae9753bea152d293e9edccf106290d32f80..19479190d04bac0f6984983eb827ce0db9453ff5 100644 (file)
--- a/contrib/gcc/config/arm/crtn.asm
+++ b/contrib/gcc/config/arm/crtn.asm
@@ -68,6 +68,8 @@
        
        .file           "crtn.asm"
 
+       .section .note.GNU-stack,"",%progbits
+
        .section        ".init"
        ;;
        FUNC_END

diff --git a/contrib/gcc/config/arm/lib1funcs.asm b/contrib/gcc/config/arm/lib1funcs.asm
index 73c453d64b8e0b866e6262f9c6ab32221d6e6e2d..8a48b253e368348126ef220feb7ce595c4bf3c0b 100644 (file)
--- a/contrib/gcc/config/arm/lib1funcs.asm
+++ b/contrib/gcc/config/arm/lib1funcs.asm
@@ -1305,3 +1305,5 @@ LSYM(Lchange_\register):
 #include "ieee754-sf.S"
 #include "bpabi.S"
 #endif /* __symbian__ */
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/csu/arm/crti.S b/lib/csu/arm/crti.S
index 40e83bbf2f11f62a92f5e94aa0a4c87d757176ae..c6c37eba1b4f8109f23f4e643aff66647bae2da6 100644 (file)
--- a/lib/csu/arm/crti.S
+++ b/lib/csu/arm/crti.S
@@ -19,3 +19,4 @@ _fini:
        stmdb   sp!, {fp, ip, lr, pc}
        sub     fp, ip, #4
 
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/csu/arm/crtn.S b/lib/csu/arm/crtn.S
index 962f0edde3d6c55ac483294ff94f7aa477b3fac4..25bbd5730ae9af7f1df0315f35afeacd32604ffb 100644 (file)
--- a/lib/csu/arm/crtn.S
+++ b/lib/csu/arm/crtn.S
@@ -8,3 +8,5 @@ __FBSDID("$FreeBSD$");
        .section .fini,"ax",%progbits
        ldmea   fp, {fp, sp, pc}
        mov     pc, lr
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/aeabi/aeabi_asm_double.S b/lib/libc/arm/aeabi/aeabi_asm_double.S
index 7a5af82a642d2ddd4b0fc2c08a5039efbd2ac8b1..ced4d78b6cbf96f236fb8df382a13ea17e6e3272 100644 (file)
--- a/lib/libc/arm/aeabi/aeabi_asm_double.S
+++ b/lib/libc/arm/aeabi/aeabi_asm_double.S
@@ -117,3 +117,5 @@ ENTRY(__aeabi_cdcmpeq)
        msr     cpsr_c, ip
        RET
 END(__aeabi_cdcmpeq)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/aeabi/aeabi_asm_float.S b/lib/libc/arm/aeabi/aeabi_asm_float.S
index e05daa5c05befe778bed6bda60f6f2bbd5c6519e..de6b1c88f4f284842979bd0b1338456eea731737 100644 (file)
--- a/lib/libc/arm/aeabi/aeabi_asm_float.S
+++ b/lib/libc/arm/aeabi/aeabi_asm_float.S
@@ -108,3 +108,5 @@ ENTRY(__aeabi_cfcmpeq)
        msr     cpsr_c, ip
        RET
 END(__aeabi_cfcmpeq)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/aeabi/aeabi_vfp_double.S b/lib/libc/arm/aeabi/aeabi_vfp_double.S
index aae49f85b940518af7427ff527be470f73e6bab3..be4309dd6efcd99459fccb883be525dd1acce0aa 100644 (file)
--- a/lib/libc/arm/aeabi/aeabi_vfp_double.S
+++ b/lib/libc/arm/aeabi/aeabi_vfp_double.S
@@ -201,3 +201,4 @@ AEABI_ENTRY(dsub)
        RET
 AEABI_END(dsub)
 
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/aeabi/aeabi_vfp_float.S b/lib/libc/arm/aeabi/aeabi_vfp_float.S
index 7de8daf4f32b04b1ba23136941aec5732b068f4f..c9df41cf4b2ec86f418bb998c2345b42d2548759 100644 (file)
--- a/lib/libc/arm/aeabi/aeabi_vfp_float.S
+++ b/lib/libc/arm/aeabi/aeabi_vfp_float.S
@@ -188,3 +188,4 @@ AEABI_ENTRY(fsub)
        RET
 AEABI_END(fsub)
 
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/gen/__aeabi_read_tp.S b/lib/libc/arm/gen/__aeabi_read_tp.S
index 670d0b835f60e087baa4df52bdac51ca969116ae..224d6a632185e9fd8ac2c780af04c910e19c7110 100644 (file)
--- a/lib/libc/arm/gen/__aeabi_read_tp.S
+++ b/lib/libc/arm/gen/__aeabi_read_tp.S
@@ -45,3 +45,4 @@ END(__aeabi_read_tp)
        .word ARM_TP_ADDRESS
 #endif
 
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/gen/_ctx_start.S b/lib/libc/arm/gen/_ctx_start.S
index 41bfff9c65ec9771db10af9f18692619d520288c..faedfb5c6443c1fc6351dfdb367f051fdb3aba35 100644 (file)
--- a/lib/libc/arm/gen/_ctx_start.S
+++ b/lib/libc/arm/gen/_ctx_start.S
@@ -8,3 +8,5 @@ ENTRY(_ctx_start)
        bl      _C_LABEL(ctx_done)
        bl      _C_LABEL(abort)
 END(_ctx_start)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/gen/_setjmp.S b/lib/libc/arm/gen/_setjmp.S
index 853f61cb4525610dded08a1ac4524776c37d1554..e3c67fa7b9bb4410845f0d3b9e52fc5374bc22e0 100644 (file)
--- a/lib/libc/arm/gen/_setjmp.S
+++ b/lib/libc/arm/gen/_setjmp.S
@@ -157,3 +157,5 @@ botch:
        b       .
 #endif
 END(_longjmp)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/gen/alloca.S b/lib/libc/arm/gen/alloca.S
index e4a73d45f2adc27d0e9c6c89fdab3c1a63424312..2539b7a80c9762a097936de573b4c107e9eefc3b 100644 (file)
--- a/lib/libc/arm/gen/alloca.S
+++ b/lib/libc/arm/gen/alloca.S
@@ -44,3 +44,5 @@ ENTRY(alloca)
        mov     r0, sp                  /* r0 = base of new space */
        RET
 END(alloca)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/gen/divsi3.S b/lib/libc/arm/gen/divsi3.S
index 82de5de257eef16f2deb807d74070d7758fa272a..fac0663cdb2adc76a78da118fbb0de9700e8d72e 100644 (file)
--- a/lib/libc/arm/gen/divsi3.S
+++ b/lib/libc/arm/gen/divsi3.S
@@ -389,3 +389,5 @@ ENTRY(__divsi3)
        mov     r0, r3
        RET
 END(__divsi3)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/gen/setjmp.S b/lib/libc/arm/gen/setjmp.S
index c9ae3294f53b2de7568c5463aa0b37229455f704..4e3850d136c230b877eb3eb1bdbf58d4b0534114 100644 (file)
--- a/lib/libc/arm/gen/setjmp.S
+++ b/lib/libc/arm/gen/setjmp.S
@@ -158,3 +158,5 @@ ENTRY(__longjmp)
        bl      PIC_SYM(_C_LABEL(abort), PLT)
 1:     b       1b              /* Cannot get here */
 END(__longjmp)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/gen/sigsetjmp.S b/lib/libc/arm/gen/sigsetjmp.S
index 3743e8934738fcecf5d5d379fb1acd89453ef4bc..236f5310a7f3b7b97c86373a7ccd4a69dfc91e7e 100644 (file)
--- a/lib/libc/arm/gen/sigsetjmp.S
+++ b/lib/libc/arm/gen/sigsetjmp.S
@@ -66,3 +66,5 @@ ENTRY(siglongjmp)
        beq     PIC_SYM(_C_LABEL(_longjmp), PLT)
        b       PIC_SYM(_C_LABEL(longjmp), PLT)
 END(siglongjmp)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/string/ffs.S b/lib/libc/arm/string/ffs.S
index cc7f396a61dd31aca305b840fbea757dac3ac870..0ed8152447552b7b2a84c8310732e770fe3ea766 100644 (file)
--- a/lib/libc/arm/string/ffs.S
+++ b/lib/libc/arm/string/ffs.S
@@ -84,3 +84,5 @@ ENTRY(ffs)
        RET
 #endif
 END(ffs)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/string/memcmp.S b/lib/libc/arm/string/memcmp.S
index 6fd8130f79b0825241444d3cc8a79d9bd847a6d3..33a11b7c4c497bf2ab5c5af0bd414902123cfbbc 100644 (file)
--- a/lib/libc/arm/string/memcmp.S
+++ b/lib/libc/arm/string/memcmp.S
@@ -181,3 +181,5 @@ ENTRY(memcmp)
        RET
 #endif
 END(memcmp)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/string/memcpy_arm.S b/lib/libc/arm/string/memcpy_arm.S
index 56fb70314d1168bdc2cae25f148df2f17b2e516d..57b0449e50995d7ed6828b29cfd72aa50ae216ca 100644 (file)
--- a/lib/libc/arm/string/memcpy_arm.S
+++ b/lib/libc/arm/string/memcpy_arm.S
@@ -334,3 +334,5 @@ ENTRY(memcpy)
        sub     r1, r1, #1
        b       .Lmemcpy_l4
 END(memcpy)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/string/memcpy_xscale.S b/lib/libc/arm/string/memcpy_xscale.S
index a451de46bc44330891fb0c9425b9a9b4f3af60a2..ab01544fc176c9e162f61abe858101014dbe02d0 100644 (file)
--- a/lib/libc/arm/string/memcpy_xscale.S
+++ b/lib/libc/arm/string/memcpy_xscale.S
@@ -1784,3 +1784,5 @@ ENTRY(memcpy)
        bx      lr
 #endif /* !_STANDALONE */
 END(memcpy)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/string/memmove.S b/lib/libc/arm/string/memmove.S
index 2cd5a5e2dbebd1ee219979167bd6ec59398eda47..8f961470076cfe6cc260d9a8ac0699f00d2ebc32 100644 (file)
--- a/lib/libc/arm/string/memmove.S
+++ b/lib/libc/arm/string/memmove.S
@@ -609,3 +609,5 @@ END(memmove)
 #else
 END(bcopy)
 #endif
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/string/memset.S b/lib/libc/arm/string/memset.S
index 6d7690182f3a2f0da2f86b42609fc32494fd6590..96d2f93183c49d6615c12980bc73f27e74983cb3 100644 (file)
--- a/lib/libc/arm/string/memset.S
+++ b/lib/libc/arm/string/memset.S
@@ -263,3 +263,5 @@ END(bzero)
 #else
 END(memset)
 #endif
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/string/strcmp.S b/lib/libc/arm/string/strcmp.S
index d610fea1f29840e204322985afaedb2468938bb7..1cdce8bcbab9dbfed69002efd14b42910de4fe8b 100644 (file)
--- a/lib/libc/arm/string/strcmp.S
+++ b/lib/libc/arm/string/strcmp.S
@@ -43,3 +43,5 @@ ENTRY(strcmp)
        sub     r0, r2, r3
        RET
 END(strcmp)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/string/strlen.S b/lib/libc/arm/string/strlen.S
index c9334f9c08cef4a5c85e465f572bb933b5175107..240fa7d9e85fe52a635bcd37953937daf332f939 100644 (file)
--- a/lib/libc/arm/string/strlen.S
+++ b/lib/libc/arm/string/strlen.S
@@ -83,3 +83,5 @@ ENTRY(strlen)
        mov     r0, r1
        RET
 END(strlen)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/string/strncmp.S b/lib/libc/arm/string/strncmp.S
index a5c0320ee3963ff252758e1fc189e2814ef1c9a8..affcaa0537b279eed02f4160612193f3d9f4f3e1 100644 (file)
--- a/lib/libc/arm/string/strncmp.S
+++ b/lib/libc/arm/string/strncmp.S
@@ -56,3 +56,5 @@ ENTRY(strncmp)
        sub     r0, r2, r3
        RET
 END(strncmp)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/sys/Ovfork.S b/lib/libc/arm/sys/Ovfork.S
index 4520e02b4029144c9de1c6b8855d00721138e960..73c619e3609d238279dd44d8c0a15c550cb82c3a 100644 (file)
--- a/lib/libc/arm/sys/Ovfork.S
+++ b/lib/libc/arm/sys/Ovfork.S
@@ -53,3 +53,5 @@ ENTRY(vfork)
        and     r0, r0, r1      /* r0 == 0 if child, else unchanged */
        mov     r15, r2
 END(vfork)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/sys/brk.S b/lib/libc/arm/sys/brk.S
index e5f833637d09545307c4480ec4fd99b8be9b1cde..bf1b4fb61d7bab978721bbdbe641700495344d02 100644 (file)
--- a/lib/libc/arm/sys/brk.S
+++ b/lib/libc/arm/sys/brk.S
@@ -91,3 +91,5 @@ ENTRY(_brk)
 .Lcurbrk:
        .word   PIC_SYM(CURBRK, GOT)
 END(_brk)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/sys/cerror.S b/lib/libc/arm/sys/cerror.S
index 26f52113f97544668cd17fd90e81ee619c4e7ad8..5fad698caf116c75a0884cd3db385ad970fb69c4 100644 (file)
--- a/lib/libc/arm/sys/cerror.S
+++ b/lib/libc/arm/sys/cerror.S
@@ -47,3 +47,5 @@ ASENTRY(CERROR)
        mvn     r1, #0x00000000
        ldmfd   sp!, {r4, pc}
 END(CERROR)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/sys/pipe.S b/lib/libc/arm/sys/pipe.S
index 77ce0fcca13b30dca1d4fe68895de28bc34ffdcc..778e92314376340cb3d3bcc0f77a5d2a6ed3cea7 100644 (file)
--- a/lib/libc/arm/sys/pipe.S
+++ b/lib/libc/arm/sys/pipe.S
@@ -49,3 +49,5 @@ ENTRY(_pipe)
        mov     r0, #0x00000000
        RET
 END(_pipe)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/sys/ptrace.S b/lib/libc/arm/sys/ptrace.S
index 876da32caf8715fc70a30ba60147d7fef77141d8..dade22374d5e474d7c8d0b1b889295392254b716 100644 (file)
--- a/lib/libc/arm/sys/ptrace.S
+++ b/lib/libc/arm/sys/ptrace.S
@@ -47,3 +47,5 @@ ENTRY(ptrace)
        bcs     PIC_SYM(CERROR, PLT)
        RET
 END(ptrace)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/sys/sbrk.S b/lib/libc/arm/sys/sbrk.S
index 5cd9a03e3a805925a93f69773ab6ec8c6baffe03..25622c4a809ba6451efbd531959f2ffa2eb813a3 100644 (file)
--- a/lib/libc/arm/sys/sbrk.S
+++ b/lib/libc/arm/sys/sbrk.S
@@ -78,3 +78,5 @@ ENTRY(_sbrk)
 .Lcurbrk:
        .word   PIC_SYM(CURBRK, GOT)
 END(_sbrk)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/sys/shmat.S b/lib/libc/arm/sys/shmat.S
index 3fc3d02c6e47c5dab8c371062642ad532c2d5c78..3574b1d4f4e4b85b2f18c18857f8f839d7d268fe 100644 (file)
--- a/lib/libc/arm/sys/shmat.S
+++ b/lib/libc/arm/sys/shmat.S
@@ -5,3 +5,5 @@ __FBSDID("$FreeBSD$");
 #include "SYS.h"
 
 RSYSCALL(shmat)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/sys/sigreturn.S b/lib/libc/arm/sys/sigreturn.S
index 1e0f245a5efced3be0fdad603fcbea14c75f4435..c377e4a296e44e0edf1be6c67d25c166ff188608 100644 (file)
--- a/lib/libc/arm/sys/sigreturn.S
+++ b/lib/libc/arm/sys/sigreturn.S
@@ -40,3 +40,5 @@ __FBSDID("$FreeBSD$");
  */
 
 RSYSCALL(sigreturn)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/arm/sys/syscall.S b/lib/libc/arm/sys/syscall.S
index 73e6b83181828a2d2160cf4a1a68ccec334dc4e1..c88d1aeb4b6534441da1fd1dcba91a3d7f9d986b 100644 (file)
--- a/lib/libc/arm/sys/syscall.S
+++ b/lib/libc/arm/sys/syscall.S
@@ -36,3 +36,5 @@ __FBSDID("$FreeBSD$");
 #include "SYS.h"
 
 RSYSCALL(syscall)
+
+       .section .note.GNU-stack,"",%progbits

diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index a4414fa8e61a8f6febf9ee923d10a374a7aa07d5..e4fe1b20f8a329d43059f3220a37e23a37fd5dc0 100644 (file)
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -102,7 +102,7 @@ SYM_MAPS+=  ${LIBC_SRCTOP}/sys/Symbol.map
 CLEANFILES+=   ${SASM} ${SPSEUDO}
 
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \
-    ${MACHINE_CPUARCH} == "powerpc"
+    ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_ARCH:Marmv6*}
 NOTE_GNU_STACK='\t.section .note.GNU-stack,"",%%progbits\n'
 .else
 NOTE_GNU_STACK=''

diff --git a/lib/libcompiler_rt/Makefile b/lib/libcompiler_rt/Makefile
index 5e21883d9e8fb3c7edcf5896f4b7e227e568e551..22c9f89ae40feacbaba87d800d2678e66e3c261f 100644 (file)
--- a/lib/libcompiler_rt/Makefile
+++ b/lib/libcompiler_rt/Makefile
@@ -230,7 +230,7 @@ SYMLINKS+=libcompiler_rt_p.a ${LIBDIR}/libgcc_p.a
 .endif
 
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \
-    ${MACHINE_CPUARCH} == "powerpc"
+    ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_ARCH:Marmv6*}
 AFLAGS+=--noexecstack
 ACFLAGS+=-Wa,--noexecstack
 .endif

diff --git a/libexec/rtld-elf/arm/rtld_start.S b/libexec/rtld-elf/arm/rtld_start.S
index c48280815c337a3d17d5a89ef448f7990987d8a7..431ea4801b7ea1cef1a423d97d725a2cc639b79f 100644 (file)
--- a/libexec/rtld-elf/arm/rtld_start.S
+++ b/libexec/rtld-elf/arm/rtld_start.S
@@ -97,3 +97,4 @@ _rtld_bind_start:
        ldmia   sp!,{r0-r5,sl,fp,lr}    /* restore the stack */
        mov     pc, ip                  /* jump to the new address */
 
+       .section .note.GNU-stack,"",%progbits