commit fabeb736e91d4f4f79a1cbbed696cffb50a860a9
author Nick Kralevich <nnk@google.com> Fri Aug 10 14:42:11 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 10 14:42:11 2012 -0700
tree 59f41bd4f862043c07d4584753882dd269706c69
parent 535477ca5e29f3c14dff11ac362423156b5971ec
parent 38a02b4b80f50aa1b3e2ee39e9e98146cf42be3d

am 38a02b4b: Merge "crtend*: Add GNU_STACK note"

* commit '38a02b4b80f50aa1b3e2ee39e9e98146cf42be3d':
  crtend*: Add GNU_STACK note

libc/arch-arm/bionic/crtend.S

diff --git a/libc/arch-arm/bionic/crtend.S b/libc/arch-arm/bionic/crtend.S
index 2f3b1ed..7196fc1 100644
--- a/libc/arch-arm/bionic/crtend.S
+++ b/libc/arch-arm/bionic/crtend.S
@@ -38,3 +38,6 @@
 	.section .ctors, "aw"
 	.long 0
 
+#if defined(__linux__) && defined(__ELF__)
+	.section .note.GNU-stack,"",%progbits
+#endif

libc/arch-arm/bionic/crtend_so.S

diff --git a/libc/arch-arm/bionic/crtend_so.S b/libc/arch-arm/bionic/crtend_so.S
index a1281c4..0cb9947 100644
--- a/libc/arch-arm/bionic/crtend_so.S
+++ b/libc/arch-arm/bionic/crtend_so.S
@@ -36,3 +36,6 @@
 	.section .fini_array, "aw"
 	.long 0
 
+#if defined(__linux__) && defined(__ELF__)
+	.section .note.GNU-stack,"",%progbits
+#endif