Reorganize assembler macro sightly.

diff --git a/src/libcryptobox/chacha20/avx.S b/src/libcryptobox/chacha20/avx.S
index 926613510e30e5a60f4f25a40628934e7f93cfe8..7689b84cd2921a93150b04ca308d213cb2cc98b0 100644 (file)
--- a/src/libcryptobox/chacha20/avx.S
+++ b/src/libcryptobox/chacha20/avx.S
@@ -1,4 +1,4 @@
-#include "macro.S"
+#include "../macro.S"
 #include "constants.S"
 SECTION_TEXT
 

diff --git a/src/libcryptobox/chacha20/avx2.S b/src/libcryptobox/chacha20/avx2.S
index 71b333045aa9e1e700753397ec901b06773d2683..efd0f54711ff15db042e6daaf5e9628cbeaafa13 100644 (file)
--- a/src/libcryptobox/chacha20/avx2.S
+++ b/src/libcryptobox/chacha20/avx2.S
@@ -1,4 +1,4 @@
-#include "macro.S"
+#include "../macro.S"
 #include "constants.S"
 SECTION_TEXT
 

diff --git a/src/libcryptobox/chacha20/sse2.S b/src/libcryptobox/chacha20/sse2.S
index a896b93be7a523c32be73ffa2d4ea62980c1e94d..a91d095e067b6772ed232763f59c2f344b6fd34b 100644 (file)
--- a/src/libcryptobox/chacha20/sse2.S
+++ b/src/libcryptobox/chacha20/sse2.S
@@ -1,4 +1,4 @@
-#include "macro.S"
+#include "../macro.S"
 #include "constants.S"
 SECTION_TEXT
 

diff --git a/src/libcryptobox/chacha20/macro.S b/src/libcryptobox/macro.S
similarity index 100%
rename from src/libcryptobox/chacha20/macro.S
rename to src/libcryptobox/macro.S

diff --git a/src/libcryptobox/poly1305/avx.S b/src/libcryptobox/poly1305/avx.S
index b64d4ca2d16f346d94425a94bc538972285431ad..bf7390888f6a0e8cd0852292406ac71b29d74b13 100644 (file)
--- a/src/libcryptobox/poly1305/avx.S
+++ b/src/libcryptobox/poly1305/avx.S
@@ -1,4 +1,4 @@
-#include "../chacha20/macro.S"
+#include "../macro.S"
 #include "constants.S"
 
 SECTION_TEXT

diff --git a/src/libcryptobox/poly1305/avx2.S b/src/libcryptobox/poly1305/avx2.S
index b1ab0d61a5f53b050ac89ff0a5830710510b03e8..5aa5851d6dfd725ea22d26c9505716cf23cb18b8 100644 (file)
--- a/src/libcryptobox/poly1305/avx2.S
+++ b/src/libcryptobox/poly1305/avx2.S
@@ -1,4 +1,4 @@
-#include "../chacha20/macro.S"
+#include "../macro.S"
 #include "constants.S"
 SECTION_TEXT
 

diff --git a/src/libcryptobox/poly1305/sse2.S b/src/libcryptobox/poly1305/sse2.S
index 1ca4139ced1c62927bbca126cde25c0cc26b65d5..038961899cece957d887d72bf984531357414fa4 100644 (file)
--- a/src/libcryptobox/poly1305/sse2.S
+++ b/src/libcryptobox/poly1305/sse2.S
@@ -1,4 +1,4 @@
-#include "../chacha20/macro.S"
+#include "../macro.S"
 #include "constants.S"
 
 SECTION_TEXT