summaryrefslogtreecommitdiffstats
path: root/contrib/compiler-rt/lib
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2015-10-01 19:02:45 +0000
committerdim <dim@FreeBSD.org>2015-10-01 19:02:45 +0000
commitc88ca1c4064bdfc5aa9a040453a2bedcab5563cf (patch)
tree65e063ba4063b01c208d44deddda2fe59ac5f224 /contrib/compiler-rt/lib
parentd3edc9664e05776279ed8ad8a20ad14cdd579030 (diff)
parente6448d3ce04113fa55305f4d9b53a92f11189be6 (diff)
downloadFreeBSD-src-c88ca1c4064bdfc5aa9a040453a2bedcab5563cf.zip
FreeBSD-src-c88ca1c4064bdfc5aa9a040453a2bedcab5563cf.tar.gz
Merge ^/head r288197 through r288456.
Diffstat (limited to 'contrib/compiler-rt/lib')
-rw-r--r--contrib/compiler-rt/lib/builtins/arm/aeabi_memcmp.S2
-rw-r--r--contrib/compiler-rt/lib/builtins/arm/aeabi_memcpy.S2
-rw-r--r--contrib/compiler-rt/lib/builtins/arm/aeabi_memmove.S2
-rw-r--r--contrib/compiler-rt/lib/builtins/arm/aeabi_memset.S1
4 files changed, 7 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 051ce43..fa69327 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 cf02332..35b8558 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 4dda06f..2f9f789 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 c8b49c7..f2342f0 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
OpenPOWER on IntegriCloud