From: Balthazar <balthazar@yandex.ru>
Date: Sun, 12 Jan 2014 01:15:19 +0000 (+0000)
Subject: Add check for OPTIMIZED_SALSA flag
X-Git-Tag: v0.4.4.6-nvc-update1~5^2
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=46bff72d302449b24746f9e23227fc077c7bc90c

Add check for OPTIMIZED_SALSA flag
---

diff --git a/src/scrypt-arm.S b/src/scrypt-arm.S
index 12d94b0..143eb3a 100644
--- 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
--- 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
--- 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