Author: kib
Date: Tue Sep 29 16:09:58 2015
New Revision: 288373
URL: https://svnweb.freebsd.org/changeset/base/288373

Log:
  Annotate arm userspace assembler sources stating their tolerance to
  the non-executable stack.
  
  Reviewed by:  andrew
  Sponsored by: The FreeBSD Foundation

Modified:
  head/contrib/compiler-rt/lib/builtins/arm/aeabi_memcmp.S
  head/contrib/compiler-rt/lib/builtins/arm/aeabi_memcpy.S
  head/contrib/compiler-rt/lib/builtins/arm/aeabi_memmove.S
  head/contrib/compiler-rt/lib/builtins/arm/aeabi_memset.S
  head/contrib/gcc/config/arm/crti.asm
  head/contrib/gcc/config/arm/crtn.asm
  head/contrib/gcc/config/arm/lib1funcs.asm
  head/lib/csu/arm/crti.S
  head/lib/csu/arm/crtn.S
  head/lib/libc/arm/aeabi/aeabi_asm_double.S
  head/lib/libc/arm/aeabi/aeabi_asm_float.S
  head/lib/libc/arm/aeabi/aeabi_vfp_double.S
  head/lib/libc/arm/aeabi/aeabi_vfp_float.S
  head/lib/libc/arm/gen/__aeabi_read_tp.S
  head/lib/libc/arm/gen/_ctx_start.S
  head/lib/libc/arm/gen/_setjmp.S
  head/lib/libc/arm/gen/alloca.S
  head/lib/libc/arm/gen/divsi3.S
  head/lib/libc/arm/gen/setjmp.S
  head/lib/libc/arm/gen/sigsetjmp.S
  head/lib/libc/arm/string/ffs.S
  head/lib/libc/arm/string/memcmp.S
  head/lib/libc/arm/string/memcpy_arm.S
  head/lib/libc/arm/string/memcpy_xscale.S
  head/lib/libc/arm/string/memmove.S
  head/lib/libc/arm/string/memset.S
  head/lib/libc/arm/string/strcmp.S
  head/lib/libc/arm/string/strlen.S
  head/lib/libc/arm/string/strncmp.S
  head/lib/libc/arm/sys/Ovfork.S
  head/lib/libc/arm/sys/brk.S
  head/lib/libc/arm/sys/cerror.S
  head/lib/libc/arm/sys/pipe.S
  head/lib/libc/arm/sys/ptrace.S
  head/lib/libc/arm/sys/sbrk.S
  head/lib/libc/arm/sys/shmat.S
  head/lib/libc/arm/sys/sigreturn.S
  head/lib/libc/arm/sys/syscall.S
  head/lib/libc/sys/Makefile.inc
  head/lib/libcompiler_rt/Makefile
  head/libexec/rtld-elf/arm/rtld_start.S

Modified: head/contrib/compiler-rt/lib/builtins/arm/aeabi_memcmp.S
==============================================================================
--- head/contrib/compiler-rt/lib/builtins/arm/aeabi_memcmp.S    Tue Sep 29 
15:49:53 2015        (r288372)
+++ head/contrib/compiler-rt/lib/builtins/arm/aeabi_memcmp.S    Tue Sep 29 
16:09:58 2015        (r288373)
@@ -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

Modified: head/contrib/compiler-rt/lib/builtins/arm/aeabi_memcpy.S
==============================================================================
--- head/contrib/compiler-rt/lib/builtins/arm/aeabi_memcpy.S    Tue Sep 29 
15:49:53 2015        (r288372)
+++ head/contrib/compiler-rt/lib/builtins/arm/aeabi_memcpy.S    Tue Sep 29 
16:09:58 2015        (r288373)
@@ -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

Modified: head/contrib/compiler-rt/lib/builtins/arm/aeabi_memmove.S
==============================================================================
--- head/contrib/compiler-rt/lib/builtins/arm/aeabi_memmove.S   Tue Sep 29 
15:49:53 2015        (r288372)
+++ head/contrib/compiler-rt/lib/builtins/arm/aeabi_memmove.S   Tue Sep 29 
16:09:58 2015        (r288373)
@@ -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

Modified: head/contrib/compiler-rt/lib/builtins/arm/aeabi_memset.S
==============================================================================
--- head/contrib/compiler-rt/lib/builtins/arm/aeabi_memset.S    Tue Sep 29 
15:49:53 2015        (r288372)
+++ head/contrib/compiler-rt/lib/builtins/arm/aeabi_memset.S    Tue Sep 29 
16:09:58 2015        (r288373)
@@ -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

Modified: head/contrib/gcc/config/arm/crti.asm
==============================================================================
--- head/contrib/gcc/config/arm/crti.asm        Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/contrib/gcc/config/arm/crti.asm        Tue Sep 29 16:09:58 2015        
(r288373)
@@ -60,6 +60,8 @@
                
        .file           "crti.asm"
 
+       .section .note.GNU-stack,"",%progbits
+
        .section        ".init"
        .align 2
        .global _init

Modified: head/contrib/gcc/config/arm/crtn.asm
==============================================================================
--- head/contrib/gcc/config/arm/crtn.asm        Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/contrib/gcc/config/arm/crtn.asm        Tue Sep 29 16:09:58 2015        
(r288373)
@@ -68,6 +68,8 @@
        
        .file           "crtn.asm"
 
+       .section .note.GNU-stack,"",%progbits
+
        .section        ".init"
        ;;
        FUNC_END

Modified: head/contrib/gcc/config/arm/lib1funcs.asm
==============================================================================
--- head/contrib/gcc/config/arm/lib1funcs.asm   Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/contrib/gcc/config/arm/lib1funcs.asm   Tue Sep 29 16:09:58 2015        
(r288373)
@@ -1305,3 +1305,5 @@ LSYM(Lchange_\register):
 #include "ieee754-sf.S"
 #include "bpabi.S"
 #endif /* __symbian__ */
+
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/csu/arm/crti.S
==============================================================================
--- head/lib/csu/arm/crti.S     Tue Sep 29 15:49:53 2015        (r288372)
+++ head/lib/csu/arm/crti.S     Tue Sep 29 16:09:58 2015        (r288373)
@@ -19,3 +19,4 @@ _fini:
        stmdb   sp!, {fp, ip, lr, pc}
        sub     fp, ip, #4
 
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/csu/arm/crtn.S
==============================================================================
--- head/lib/csu/arm/crtn.S     Tue Sep 29 15:49:53 2015        (r288372)
+++ head/lib/csu/arm/crtn.S     Tue Sep 29 16:09:58 2015        (r288373)
@@ -8,3 +8,5 @@ __FBSDID("$FreeBSD$");
        .section .fini,"ax",%progbits
        ldmea   fp, {fp, sp, pc}
        mov     pc, lr
+
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/arm/aeabi/aeabi_asm_double.S
==============================================================================
--- head/lib/libc/arm/aeabi/aeabi_asm_double.S  Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/aeabi/aeabi_asm_double.S  Tue Sep 29 16:09:58 2015        
(r288373)
@@ -117,3 +117,5 @@ ENTRY(__aeabi_cdcmpeq)
        msr     cpsr_c, ip
        RET
 END(__aeabi_cdcmpeq)
+
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/arm/aeabi/aeabi_asm_float.S
==============================================================================
--- head/lib/libc/arm/aeabi/aeabi_asm_float.S   Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/aeabi/aeabi_asm_float.S   Tue Sep 29 16:09:58 2015        
(r288373)
@@ -108,3 +108,5 @@ ENTRY(__aeabi_cfcmpeq)
        msr     cpsr_c, ip
        RET
 END(__aeabi_cfcmpeq)
+
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/arm/aeabi/aeabi_vfp_double.S
==============================================================================
--- head/lib/libc/arm/aeabi/aeabi_vfp_double.S  Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/aeabi/aeabi_vfp_double.S  Tue Sep 29 16:09:58 2015        
(r288373)
@@ -201,3 +201,4 @@ AEABI_ENTRY(dsub)
        RET
 AEABI_END(dsub)
 
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/arm/aeabi/aeabi_vfp_float.S
==============================================================================
--- head/lib/libc/arm/aeabi/aeabi_vfp_float.S   Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/aeabi/aeabi_vfp_float.S   Tue Sep 29 16:09:58 2015        
(r288373)
@@ -188,3 +188,4 @@ AEABI_ENTRY(fsub)
        RET
 AEABI_END(fsub)
 
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/arm/gen/__aeabi_read_tp.S
==============================================================================
--- head/lib/libc/arm/gen/__aeabi_read_tp.S     Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/gen/__aeabi_read_tp.S     Tue Sep 29 16:09:58 2015        
(r288373)
@@ -45,3 +45,4 @@ END(__aeabi_read_tp)
        .word ARM_TP_ADDRESS
 #endif
 
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/arm/gen/_ctx_start.S
==============================================================================
--- head/lib/libc/arm/gen/_ctx_start.S  Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/gen/_ctx_start.S  Tue Sep 29 16:09:58 2015        
(r288373)
@@ -8,3 +8,5 @@ ENTRY(_ctx_start)
        bl      _C_LABEL(ctx_done)
        bl      _C_LABEL(abort)
 END(_ctx_start)
+
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/arm/gen/_setjmp.S
==============================================================================
--- head/lib/libc/arm/gen/_setjmp.S     Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/gen/_setjmp.S     Tue Sep 29 16:09:58 2015        
(r288373)
@@ -157,3 +157,5 @@ botch:
        b       .
 #endif
 END(_longjmp)
+
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/arm/gen/alloca.S
==============================================================================
--- head/lib/libc/arm/gen/alloca.S      Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/gen/alloca.S      Tue Sep 29 16:09:58 2015        
(r288373)
@@ -44,3 +44,5 @@ ENTRY(alloca)
        mov     r0, sp                  /* r0 = base of new space */
        RET
 END(alloca)
+
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/arm/gen/divsi3.S
==============================================================================
--- head/lib/libc/arm/gen/divsi3.S      Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/gen/divsi3.S      Tue Sep 29 16:09:58 2015        
(r288373)
@@ -389,3 +389,5 @@ ENTRY(__divsi3)
        mov     r0, r3
        RET
 END(__divsi3)
+
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/arm/gen/setjmp.S
==============================================================================
--- head/lib/libc/arm/gen/setjmp.S      Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/gen/setjmp.S      Tue Sep 29 16:09:58 2015        
(r288373)
@@ -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

Modified: head/lib/libc/arm/gen/sigsetjmp.S
==============================================================================
--- head/lib/libc/arm/gen/sigsetjmp.S   Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/gen/sigsetjmp.S   Tue Sep 29 16:09:58 2015        
(r288373)
@@ -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

Modified: head/lib/libc/arm/string/ffs.S
==============================================================================
--- head/lib/libc/arm/string/ffs.S      Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/string/ffs.S      Tue Sep 29 16:09:58 2015        
(r288373)
@@ -84,3 +84,5 @@ ENTRY(ffs)
        RET
 #endif
 END(ffs)
+
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/arm/string/memcmp.S
==============================================================================
--- head/lib/libc/arm/string/memcmp.S   Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/string/memcmp.S   Tue Sep 29 16:09:58 2015        
(r288373)
@@ -181,3 +181,5 @@ ENTRY(memcmp)
        RET
 #endif
 END(memcmp)
+
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/arm/string/memcpy_arm.S
==============================================================================
--- head/lib/libc/arm/string/memcpy_arm.S       Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/string/memcpy_arm.S       Tue Sep 29 16:09:58 2015        
(r288373)
@@ -334,3 +334,5 @@ ENTRY(memcpy)
        sub     r1, r1, #1
        b       .Lmemcpy_l4
 END(memcpy)
+
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/arm/string/memcpy_xscale.S
==============================================================================
--- head/lib/libc/arm/string/memcpy_xscale.S    Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/string/memcpy_xscale.S    Tue Sep 29 16:09:58 2015        
(r288373)
@@ -1784,3 +1784,5 @@ ENTRY(memcpy)
        bx      lr
 #endif /* !_STANDALONE */
 END(memcpy)
+
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/arm/string/memmove.S
==============================================================================
--- head/lib/libc/arm/string/memmove.S  Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/string/memmove.S  Tue Sep 29 16:09:58 2015        
(r288373)
@@ -609,3 +609,5 @@ END(memmove)
 #else
 END(bcopy)
 #endif
+
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/arm/string/memset.S
==============================================================================
--- head/lib/libc/arm/string/memset.S   Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/string/memset.S   Tue Sep 29 16:09:58 2015        
(r288373)
@@ -263,3 +263,5 @@ END(bzero)
 #else
 END(memset)
 #endif
+
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/arm/string/strcmp.S
==============================================================================
--- head/lib/libc/arm/string/strcmp.S   Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/string/strcmp.S   Tue Sep 29 16:09:58 2015        
(r288373)
@@ -43,3 +43,5 @@ ENTRY(strcmp)
        sub     r0, r2, r3
        RET
 END(strcmp)
+
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/arm/string/strlen.S
==============================================================================
--- head/lib/libc/arm/string/strlen.S   Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/string/strlen.S   Tue Sep 29 16:09:58 2015        
(r288373)
@@ -83,3 +83,5 @@ ENTRY(strlen)
        mov     r0, r1
        RET
 END(strlen)
+
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/arm/string/strncmp.S
==============================================================================
--- head/lib/libc/arm/string/strncmp.S  Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/string/strncmp.S  Tue Sep 29 16:09:58 2015        
(r288373)
@@ -56,3 +56,5 @@ ENTRY(strncmp)
        sub     r0, r2, r3
        RET
 END(strncmp)
+
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/arm/sys/Ovfork.S
==============================================================================
--- head/lib/libc/arm/sys/Ovfork.S      Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/sys/Ovfork.S      Tue Sep 29 16:09:58 2015        
(r288373)
@@ -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

Modified: head/lib/libc/arm/sys/brk.S
==============================================================================
--- head/lib/libc/arm/sys/brk.S Tue Sep 29 15:49:53 2015        (r288372)
+++ head/lib/libc/arm/sys/brk.S Tue Sep 29 16:09:58 2015        (r288373)
@@ -91,3 +91,5 @@ ENTRY(_brk)
 .Lcurbrk:
        .word   PIC_SYM(CURBRK, GOT)
 END(_brk)
+
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/arm/sys/cerror.S
==============================================================================
--- head/lib/libc/arm/sys/cerror.S      Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/sys/cerror.S      Tue Sep 29 16:09:58 2015        
(r288373)
@@ -47,3 +47,5 @@ ASENTRY(CERROR)
        mvn     r1, #0x00000000
        ldmfd   sp!, {r4, pc}
 END(CERROR)
+
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/arm/sys/pipe.S
==============================================================================
--- head/lib/libc/arm/sys/pipe.S        Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/sys/pipe.S        Tue Sep 29 16:09:58 2015        
(r288373)
@@ -49,3 +49,5 @@ ENTRY(_pipe)
        mov     r0, #0x00000000
        RET
 END(_pipe)
+
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/arm/sys/ptrace.S
==============================================================================
--- head/lib/libc/arm/sys/ptrace.S      Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/sys/ptrace.S      Tue Sep 29 16:09:58 2015        
(r288373)
@@ -47,3 +47,5 @@ ENTRY(ptrace)
        bcs     PIC_SYM(CERROR, PLT)
        RET
 END(ptrace)
+
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/arm/sys/sbrk.S
==============================================================================
--- head/lib/libc/arm/sys/sbrk.S        Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/sys/sbrk.S        Tue Sep 29 16:09:58 2015        
(r288373)
@@ -78,3 +78,5 @@ ENTRY(_sbrk)
 .Lcurbrk:
        .word   PIC_SYM(CURBRK, GOT)
 END(_sbrk)
+
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/arm/sys/shmat.S
==============================================================================
--- head/lib/libc/arm/sys/shmat.S       Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/sys/shmat.S       Tue Sep 29 16:09:58 2015        
(r288373)
@@ -5,3 +5,5 @@ __FBSDID("$FreeBSD$");
 #include "SYS.h"
 
 RSYSCALL(shmat)
+
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/arm/sys/sigreturn.S
==============================================================================
--- head/lib/libc/arm/sys/sigreturn.S   Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/sys/sigreturn.S   Tue Sep 29 16:09:58 2015        
(r288373)
@@ -40,3 +40,5 @@ __FBSDID("$FreeBSD$");
  */
 
 RSYSCALL(sigreturn)
+
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/arm/sys/syscall.S
==============================================================================
--- head/lib/libc/arm/sys/syscall.S     Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/arm/sys/syscall.S     Tue Sep 29 16:09:58 2015        
(r288373)
@@ -36,3 +36,5 @@ __FBSDID("$FreeBSD$");
 #include "SYS.h"
 
 RSYSCALL(syscall)
+
+       .section .note.GNU-stack,"",%progbits

Modified: head/lib/libc/sys/Makefile.inc
==============================================================================
--- head/lib/libc/sys/Makefile.inc      Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libc/sys/Makefile.inc      Tue Sep 29 16:09:58 2015        
(r288373)
@@ -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=''

Modified: head/lib/libcompiler_rt/Makefile
==============================================================================
--- head/lib/libcompiler_rt/Makefile    Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/lib/libcompiler_rt/Makefile    Tue Sep 29 16:09:58 2015        
(r288373)
@@ -230,7 +230,7 @@ SYMLINKS+=libcompiler_rt_p.a ${LIBDIR}/l
 .endif
 
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \
-    ${MACHINE_CPUARCH} == "powerpc"
+    ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_ARCH:Marmv6*}
 AFLAGS+=--noexecstack
 ACFLAGS+=-Wa,--noexecstack
 .endif

Modified: head/libexec/rtld-elf/arm/rtld_start.S
==============================================================================
--- head/libexec/rtld-elf/arm/rtld_start.S      Tue Sep 29 15:49:53 2015        
(r288372)
+++ head/libexec/rtld-elf/arm/rtld_start.S      Tue Sep 29 16:09:58 2015        
(r288373)
@@ -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
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to