Merge pull request #3 from RajUmadas/master

Patch for noexecstack and file extension rename
simonjhall · Aug 3, 2012 · 7313fbe · 7313fbe
2 parents bf34dde + 5076cd6
commit 7313fbe
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/Makefile b/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
diff --git a/memcpy.s → memcpy.S b/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
diff --git a/memset.s → memset.S b/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
+