Browse files

Merge pull request #3 from RajUmadas/master

Patch for noexecstack and file extension rename
  • Loading branch information...
2 parents bf34dde + 5076cd6 commit 7313fbe12b0593034d0a1b606bf33c7cf4ababce @simonjhall committed Aug 3, 2012
Showing with 12 additions and 2 deletions.
  1. +2 −2 Makefile
  2. +5 −0 memcpy.s → memcpy.S
  3. +5 −0 memset.s → memset.S
View
4 Makefile
@@ -1,6 +1,6 @@
libcofi_rpi.so: memcpy.o memset.o
$(CC) -o libcofi_rpi.so -shared memcpy.o memset.o -g
memset.o: memset.s
- $(AS) memset.s -o memset.o -g
+ $(AS) memset.S -o memset.o -g
memcpy.o: memcpy.s
- $(AS) memcpy.s -o memcpy.o -g
+ $(AS) memcpy.S -o memcpy.o -g
View
5 memcpy.s → memcpy.S
@@ -330,3 +330,8 @@ post_misalignment_3_loop:
b full_out
.endfunc
+
+/* Raj: Added this to enable no exec stack */
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
View
5 memset.s → memset.S
@@ -98,3 +98,8 @@ stray_bytes:
pop {r0, pc}
.endfunc
+/* Raj: Added this to enable no exec stack */
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
+

0 comments on commit 7313fbe

Please sign in to comment.