Merge pull request #7 from cmonyoupick/master

fixes scrypt-*.S for grsecurity-enabled kernels, noexecstack

diff --git a/src/leveldb/Makefile b/src/leveldb/Makefile
index 96af776..f43180a 100644 (file)
--- a/src/leveldb/Makefile
+++ b/src/leveldb/Makefile
@@ -13,7 +13,7 @@ OPT ?= -O2 -DNDEBUG       # (A) Production use (optimized mode)
 
 # detect what platform we're building on
 $(shell CC="$(CC)" CXX="$(CXX)" TARGET_OS="$(TARGET_OS)" \
-    ./build_detect_platform build_config.mk ./)
+    sh ./build_detect_platform build_config.mk ./)
 # this file is generated by the previous line to set build flags and sources
 include build_config.mk
 

diff --git a/src/scrypt-arm.S b/src/scrypt-arm.S
index 06097a6..14f2a7e 100644 (file)
--- a/src/scrypt-arm.S
+++ b/src/scrypt-arm.S
@@ -7,6 +7,10 @@
  * any later version.  See COPYING for more details.
  */
 
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
+
 #if defined(__arm__) && defined(__APCS_32__)
 
 #if defined(__ARM_ARCH_5E__) || defined(__ARM_ARCH_5TE__) || \

diff --git a/src/scrypt-x86.S b/src/scrypt-x86.S
index 33b6cd1..0e97e36 100644 (file)
--- a/src/scrypt-x86.S
+++ b/src/scrypt-x86.S
@@ -24,6 +24,10 @@
 
 #if defined(__i386__)
 
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
+
 #define gen_salsa8_core_quadround() \
        movl    52(%esp), %ecx; \
        movl    4(%esp), %edx; \