Merge branch 'master' of https://github.com/CryptoManiac/novacoin

diff --git a/src/scrypt-arm.S b/src/scrypt-arm.S
index 12d94b0..143eb3a 100644 (file)
--- a/src/scrypt-arm.S
+++ b/src/scrypt-arm.S
@@ -8,7 +8,7 @@
  */
 
 
-#if defined(__arm__) && defined(__APCS_32__)
+#if defined(OPTIMIZED_SALSA) &&  defined(__arm__) && defined(__APCS_32__)
 
 #if defined(__linux__) && defined(__ELF__)
 .section .note.GNU-stack,"",%progbits

diff --git a/src/scrypt-x86.S b/src/scrypt-x86.S
index 0e97e36..c1d2cef 100644 (file)
--- a/src/scrypt-x86.S
+++ b/src/scrypt-x86.S
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-#if defined(__i386__)
+#if defined(OPTIMIZED_SALSA) &&  defined(__i386__)
 
 #if defined(__linux__) && defined(__ELF__)
 .section .note.GNU-stack,"",%progbits

diff --git a/src/scrypt-x86_64.S b/src/scrypt-x86_64.S
index 9d894f2..3036d03 100644 (file)
--- a/src/scrypt-x86_64.S
+++ b/src/scrypt-x86_64.S
@@ -23,7 +23,7 @@
 # SUCH DAMAGE.
 
 
-#if defined(__x86_64__)
+#if defined(OPTIMIZED_SALSA) && defined(__x86_64__)
 
 #if defined(__linux__) && defined(__ELF__)
        .section .note.GNU-stack,"",%progbits