Commit 9dfaebc1 authored by Niels Möller's avatar Niels Möller

Move x86_64/fat/fat.c -> fat-x86_64.c. Fix asm_path setup.

parent 44f2687d
2015-01-16 Niels Möller <nisse@lysator.liu.se>
* configure.ac (OPT_NETTLE_SOURCES): New substituted variable.
(asm_path): Fixed x86_64 fat setup. Include only x86_64 and
x86_64/fat in the asm_path. Put fat-x86_64.c in
OPT_NETTLE_SOURCES, with no symlinking.
* fat-x86_64.c: Renamed,...
* x86_64/fat/fat.c: ... from old name.
2015-01-13 Niels Möller <nisse@lysator.liu.se> 2015-01-13 Niels Möller <nisse@lysator.liu.se>
* x86_64/fat/fat.c: For constructor hack, check * x86_64/fat/fat.c: For constructor hack, check
......
...@@ -15,6 +15,7 @@ MKDIR_P = @MKDIR_P@ ...@@ -15,6 +15,7 @@ MKDIR_P = @MKDIR_P@
OPT_NETTLE_OBJS = @OPT_NETTLE_OBJS@ OPT_NETTLE_OBJS = @OPT_NETTLE_OBJS@
OPT_HOGWEED_OBJS = @OPT_HOGWEED_OBJS@ OPT_HOGWEED_OBJS = @OPT_HOGWEED_OBJS@
OPT_NETTLE_SOURCES = @OPT_NETTLE_SOURCES@
OPT_HOGWEED_SOURCES = @IF_MINI_GMP@ mini-gmp.c OPT_HOGWEED_SOURCES = @IF_MINI_GMP@ mini-gmp.c
SUBDIRS = tools testsuite examples SUBDIRS = tools testsuite examples
...@@ -134,7 +135,8 @@ nettle_SOURCES = aes-decrypt-internal.c aes-decrypt.c \ ...@@ -134,7 +135,8 @@ nettle_SOURCES = aes-decrypt-internal.c aes-decrypt.c \
umac-poly64.c umac-poly128.c umac-set-key.c \ umac-poly64.c umac-poly128.c umac-set-key.c \
umac32.c umac64.c umac96.c umac128.c \ umac32.c umac64.c umac96.c umac128.c \
write-be32.c write-le32.c write-le64.c \ write-be32.c write-le32.c write-le64.c \
yarrow256.c yarrow_key_event.c yarrow256.c yarrow_key_event.c \
$(OPT_NETTLE_SOURCES)
hogweed_SOURCES = sexp.c sexp-format.c \ hogweed_SOURCES = sexp.c sexp-format.c \
sexp-transport.c sexp-transport-format.c \ sexp-transport.c sexp-transport-format.c \
......
...@@ -238,6 +238,8 @@ if test "x$ABI" != xstandard ; then ...@@ -238,6 +238,8 @@ if test "x$ABI" != xstandard ; then
fi fi
fi fi
OPT_NETTLE_SOURCES=""
# Select assembler code # Select assembler code
asm_path= asm_path=
if test "x$enable_assembler" = xyes ; then if test "x$enable_assembler" = xyes ; then
...@@ -248,11 +250,11 @@ if test "x$enable_assembler" = xyes ; then ...@@ -248,11 +250,11 @@ if test "x$enable_assembler" = xyes ; then
[x86_64 | amd64]) [x86_64 | amd64])
if test "$ABI" = 64 ; then if test "$ABI" = 64 ; then
asm_path=x86_64 asm_path=x86_64
if test "x$enable_x86_aesni" = xyes ; then
asm_path="x86_64/aesni $asm_path"
fi
if test "x$enable_fat" = xyes ; then if test "x$enable_fat" = xyes ; then
asm_path="x86_64/fat $asm_path" asm_path="x86_64/fat $asm_path"
OPT_NETTLE_SOURCES="fat-x86_64.c $OPT_NETTLE_SOURCES"
elif test "x$enable_x86_aesni" = xyes ; then
asm_path="x86_64/aesni $asm_path"
fi fi
else else
asm_path=x86 asm_path=x86
...@@ -296,7 +298,7 @@ asm_replace_list="aes-encrypt-internal.asm aes-decrypt-internal.asm \ ...@@ -296,7 +298,7 @@ asm_replace_list="aes-encrypt-internal.asm aes-decrypt-internal.asm \
sha3-permute.asm umac-nh.asm umac-nh-n.asm machine.m4" sha3-permute.asm umac-nh.asm umac-nh-n.asm machine.m4"
# Assembler files which generate additional object files if they are used. # Assembler files which generate additional object files if they are used.
asm_nettle_optional_list="gcm-hash8.asm cpuid.asm fat.c \ asm_nettle_optional_list="gcm-hash8.asm cpuid.asm \
aes-encrypt-internal-2.asm aes-decrypt-internal-2.asm" aes-encrypt-internal-2.asm aes-decrypt-internal-2.asm"
asm_hogweed_optional_list="" asm_hogweed_optional_list=""
if test "x$enable_public_key" = "xyes" ; then if test "x$enable_public_key" = "xyes" ; then
...@@ -376,6 +378,7 @@ fi ...@@ -376,6 +378,7 @@ fi
AC_SUBST([OPT_NETTLE_OBJS]) AC_SUBST([OPT_NETTLE_OBJS])
AC_SUBST([OPT_HOGWEED_OBJS]) AC_SUBST([OPT_HOGWEED_OBJS])
AC_SUBST([OPT_NETTLE_SOURCES])
AC_SUBST([ASM_RODATA]) AC_SUBST([ASM_RODATA])
if test "x$enable_assembler" = xyes ; then if test "x$enable_assembler" = xyes ; then
IF_ASM='' IF_ASM=''
......
/* fat.c /* fat-x86_64.c
Copyright (C) 2015 Niels Möller Copyright (C) 2015 Niels Möller
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment