diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2015-09-29 16:09:58 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2015-09-29 16:09:58 +0000 |
| commit | 96cdb0ab9d6d89d47c14f239933391a1f7d465c7 (patch) | |
| tree | 6f88f0773e9f00f362b1ad72de44af830fd0278b /contrib | |
| parent | 3e10dd104940dc186fe48668029f6e74ef8b5f80 (diff) | |
| download | src-96cdb0ab9d6d89d47c14f239933391a1f7d465c7.tar.gz src-96cdb0ab9d6d89d47c14f239933391a1f7d465c7.zip | |
Annotate arm userspace assembler sources stating their tolerance to
the non-executable stack.
Reviewed by: andrew
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/head/; revision=288373
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/compiler-rt/lib/builtins/arm/aeabi_memcmp.S | 2 | ||||
| -rw-r--r-- | contrib/compiler-rt/lib/builtins/arm/aeabi_memcpy.S | 2 | ||||
| -rw-r--r-- | contrib/compiler-rt/lib/builtins/arm/aeabi_memmove.S | 2 | ||||
| -rw-r--r-- | contrib/compiler-rt/lib/builtins/arm/aeabi_memset.S | 1 | ||||
| -rw-r--r-- | contrib/gcc/config/arm/crti.asm | 2 | ||||
| -rw-r--r-- | contrib/gcc/config/arm/crtn.asm | 2 | ||||
| -rw-r--r-- | contrib/gcc/config/arm/lib1funcs.asm | 2 |
7 files changed, 13 insertions, 0 deletions
diff --git a/contrib/compiler-rt/lib/builtins/arm/aeabi_memcmp.S b/contrib/compiler-rt/lib/builtins/arm/aeabi_memcmp.S index 051ce435bab9..fa693272fd48 100644 --- 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 cf02332490a1..35b8558f997c 100644 --- 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 4dda06f75d04..2f9f789ab750 100644 --- 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 c8b49c7809a6..f2342f0772c2 100644 --- 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 166a3ce34e8c..8df00d2585ff 100644 --- 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 360afae9753b..19479190d04b 100644 --- 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 73c453d64b8e..8a48b253e368 100644 --- 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 |