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

* commit 'fabeb736e91d4f4f79a1cbbed696cffb50a860a9': crtend*: Add GNU_STACK note
2012-08-10 14:46:56 -07:00
parent d71ada630d fabeb736e9
commit 73d99958bb
2 changed files with 6 additions and 0 deletions
--- 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
--- 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