diff --git a/ChangeLog b/ChangeLog
index 79540d5b570548bb016dc9f5ae835c922f5c3b57..c5f0b5638f10eca471e5344ed6544d86e132c71f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2015-01-17 Niels Möller <nisse@lysator.liu.se>
+ * config.m4.in (SYMBOL_PREFIX): Define from from autoconf
+ ASM_SYMBOL_PREFIX.
+ (C_NAMS): move definition to...
+ * asm.m4 (C_NAME): Define here, also take fat_transform.
+ (fat_suffix): Replaced by...
+ (fat_transform): New macro, taking symbol nama as argument.
+ Updated all uses of fat_suffix.
+ * fat-x86_64.c: Updated for internal "_nettle" prefix on
+ cpu-specific memxor functions.
+
* fat-x86_64.c: Set up for sse2 vs non-sse2 memxor. Patch by Nikos
Mavrogiannopoulos.
* configure.ac (asm_nettle_optional_list): Added memxor-2.asm.
diff --git a/asm.m4 b/asm.m4
index dc59ab682d28330333cefd934aa34957abcbecfb..bbc90bd4e2d07050d3b6d19b034e8a580c49bf54 100644
--- a/asm.m4
+++ b/asm.m4
@@ -13,7 +13,8 @@ dnl Including files from the srcdir
define(<include_src>, <include(srcdir/$1)>)dnl
dnl default definition, changed in fat builds
-define(<fat_suffix>, <>)
+define(<fat_transform>, <$1>)
+define(<C_NAME>, <SYMBOL_PREFIX<>fat_transform($1)>)
dnl Pseudo ops
define(<DECLARE_FUNC>,
@@ -27,13 +28,13 @@ COFF_STYLE, yes,
<>)>)
define(<PROLOGUE>,
-<.globl C_NAME($1)<>fat_suffix
-DECLARE_FUNC(C_NAME($1)<>fat_suffix)
-C_NAME($1)<>fat_suffix:>)
+<.globl C_NAME($1)
+DECLARE_FUNC(C_NAME($1))
+C_NAME($1):>)
define(<EPILOGUE>,
<ifelse(ELF_STYLE,yes,
-<.size C_NAME($1)<>fat_suffix, . - C_NAME($1)<>fat_suffix>,<>)>)
+<.size C_NAME($1), . - C_NAME($1)>,<>)>)
define(<m4_log2>, <m4_log2_internal($1,1,0)>)
define(<m4_log2_internal>,
diff --git a/config.m4.in b/config.m4.in
index 3f7700bbed1d26f287743dd819c6475c25f2f8c1..e39c880c625af6111d3184902210a983694856c6 100644
--- a/config.m4.in
+++ b/config.m4.in
@@ -1,5 +1,5 @@
define(<srcdir>, <<@srcdir@>>)dnl
-define(<C_NAME>, <@ASM_SYMBOL_PREFIX@><$1>)dnl
+define(<SYMBOL_PREFIX>, <@ASM_SYMBOL_PREFIX@><$1>)dnl
define(<ELF_STYLE>, <@ASM_ELF_STYLE@>)dnl
define(<COFF_STYLE>, <@ASM_COFF_STYLE@>)dnl
define(<TYPE_FUNCTION>, <@ASM_TYPE_FUNCTION@>)dnl
diff --git a/fat-x86_64.c b/fat-x86_64.c
index b6c1f44278dba4d6e4956e0f86c6dd92ae8d10c3..61d622395656c648e45437d9cae476164a9e9505 100644
--- a/fat-x86_64.c
+++ b/fat-x86_64.c
@@ -105,10 +105,9 @@ aes_crypt_internal_func _nettle_aes_decrypt_aesni;
typedef void *(memxor_func)(void *dst_in, const void *src_in, size_t n);
-/* FIXME: Fix fat name-mangling to get _nettle prefix. */
memxor_func nettle_memxor IFUNC ("_memxor_resolve");
-memxor_func nettle_memxor_x86_64;
-memxor_func nettle_memxor_sse2;
+memxor_func _nettle_memxor_x86_64;
+memxor_func _nettle_memxor_sse2;
#if HAVE_LINK_IFUNC
#define _aes_encrypt_init NULL
@@ -120,7 +119,7 @@ static aes_crypt_internal_func _aes_decrypt_init;
static aes_crypt_internal_func *_aes_encrypt_vec = _aes_encrypt_init;
static aes_crypt_internal_func *_aes_decrypt_vec = _aes_decrypt_init;
-static memxor_func *_memxor_vec = nettle_memxor_x86_64;
+static memxor_func *_memxor_vec = _nettle_memxor_x86_64;
/* This function should usually be called only once, at startup. But
it is idempotent, and on x86, pointer updates are atomic, so
@@ -167,13 +166,13 @@ fat_init (void)
{
if (verbose)
fprintf (stderr, "libnettle: intel SSE2 will be used for XOR.\n");
- _memxor_vec = nettle_memxor_sse2;
+ _memxor_vec = _nettle_memxor_sse2;
}
else
{
if (verbose)
fprintf (stderr, "libnettle: intel SSE2 will not be used for XOR.\n");
- _memxor_vec = nettle_memxor_x86_64;
+ _memxor_vec = _nettle_memxor_x86_64;
}
/* The x86_64 architecture should always make stores visible in the
diff --git a/x86_64/fat/aes-decrypt-internal-2.asm b/x86_64/fat/aes-decrypt-internal-2.asm
index 16fb55988ffb8546c81487e211a519cc5389a3b8..2dd45959c43d4c6f34d2f9d550d4e4e6af845857 100644
--- a/x86_64/fat/aes-decrypt-internal-2.asm
+++ b/x86_64/fat/aes-decrypt-internal-2.asm
@@ -31,5 +31,5 @@ ifelse(<
not, see http://www.gnu.org/licenses/.
>)
-define(<fat_suffix>, <_aesni>)
+define(<fat_transform>, <$1_aesni>)
include_src(<x86_64/aesni/aes-decrypt-internal.asm>)
diff --git a/x86_64/fat/aes-decrypt-internal.asm b/x86_64/fat/aes-decrypt-internal.asm
index b05f6a1e3b70fa716d26c0d0f25d8789522c3fea..26738d66db3e355a56e36dc1fe1334a0b73143be 100644
--- a/x86_64/fat/aes-decrypt-internal.asm
+++ b/x86_64/fat/aes-decrypt-internal.asm
@@ -31,5 +31,5 @@ ifelse(<
not, see http://www.gnu.org/licenses/.
>)
-define(<fat_suffix>, <_x86_64>)
+define(<fat_transform>, <$1_x86_64>)
include_src(<x86_64/aes-decrypt-internal.asm>)
diff --git a/x86_64/fat/aes-encrypt-internal-2.asm b/x86_64/fat/aes-encrypt-internal-2.asm
index c173d0a562c0e01c96008119f457b13a8e904b6e..2a5ce7b1ea7e9c6419996bec5b3580f0bd42e705 100644
--- a/x86_64/fat/aes-encrypt-internal-2.asm
+++ b/x86_64/fat/aes-encrypt-internal-2.asm
@@ -31,5 +31,5 @@ ifelse(<
not, see http://www.gnu.org/licenses/.
>)
-define(<fat_suffix>, <_aesni>)
+define(<fat_transform>, <$1_aesni>)
include_src(<x86_64/aesni/aes-encrypt-internal.asm>)
diff --git a/x86_64/fat/aes-encrypt-internal.asm b/x86_64/fat/aes-encrypt-internal.asm
index 50a721ab784cff938270b6b2073594c30d619498..f0bdf59ed04a205b87754d1d42924264fe5ad628 100644
--- a/x86_64/fat/aes-encrypt-internal.asm
+++ b/x86_64/fat/aes-encrypt-internal.asm
@@ -31,5 +31,5 @@ ifelse(<
not, see http://www.gnu.org/licenses/.
>)
-define(<fat_suffix>, <_x86_64>)
+define(<fat_transform>, <$1_x86_64>)
include_src(<x86_64/aes-encrypt-internal.asm>)
diff --git a/x86_64/fat/memxor-2.asm b/x86_64/fat/memxor-2.asm
index ffc844401cb4b3cb1bd9ff93ba4e21d83696f873..e3bf9da8ef79eddc5f1869f6aeaf3db9a0119954 100644
--- a/x86_64/fat/memxor-2.asm
+++ b/x86_64/fat/memxor-2.asm
@@ -31,6 +31,6 @@ ifelse(<
not, see http://www.gnu.org/licenses/.
>)
-define(<fat_suffix>, <_sse2>)
+define(<fat_transform>, <_$1_sse2>)
define(<USE_SSE2>, <yes>)
include_src(<x86_64/memxor.asm>)
diff --git a/x86_64/fat/memxor.asm b/x86_64/fat/memxor.asm
index a040bb3958275b035de630e34bd1c767bf9f8d9e..be33d2737e92f6adf1d856a2f83c54876733c3fb 100644
--- a/x86_64/fat/memxor.asm
+++ b/x86_64/fat/memxor.asm
@@ -31,5 +31,5 @@ ifelse(<
not, see http://www.gnu.org/licenses/.
>)
-define(<fat_suffix>, <_x86_64>)
+define(<fat_transform>, <_$1_x86_64>)
include_src(<x86_64/memxor.asm>)