From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 8 Apr 2015 10:02:26 +0000 (+0100)
Subject: Reorganize assembler macro sightly.
X-Git-Tag: 0.9.0~299
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95ddd51575fdfe1a855a4886e789297a17b3bbe1;p=thirdparty%2Frspamd.git

Reorganize assembler macro sightly.
---

diff --git a/src/libcryptobox/chacha20/avx.S b/src/libcryptobox/chacha20/avx.S
index 926613510e..7689b84cd2 100644
--- 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 71b333045a..efd0f54711 100644
--- 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 a896b93be7..a91d095e06 100644
--- 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 b64d4ca2d1..bf7390888f 100644
--- 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 b1ab0d61a5..5aa5851d6d 100644
--- 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 1ca4139ced..038961899c 100644
--- 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