commit 73d99958bb8bb4cd8f8a7632aeb7e6afaa1e38f1
author Nick Kralevich <nnk@google.com> Fri Aug 10 14:46:56 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 10 14:46:56 2012 -0700
tree 4c9214b154555eea9651fcea3af50727dc25edcb
parent d71ada630d5390b7fb6838cb48cb79a1581df1b1
parent fabeb736e91d4f4f79a1cbbed696cffb50a860a9

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

* commit 'fabeb736e91d4f4f79a1cbbed696cffb50a860a9':
  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