Better usage of X86 conditionals to simplify and avoid an undefined warning in x86-32.

diff --git a/configure.ac b/configure.ac
index e5797f588fdf5edd8c0ab7957002422300976c8b..b3b6fb36d13257d5bdd8652d4dc8591084b0dbc9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -96,6 +96,7 @@ fi
 
 AM_CONDITIONAL(ASM_X86_64, test x"$hw_accel" = x"x86-64")
 AM_CONDITIONAL(ASM_X86_32, test x"$hw_accel" = x"x86")
+AM_CONDITIONAL(ASM_X86, test x"$hw_accel" = x"x86" -o x"$hw_accel" = x"x86-64")
 AM_CONDITIONAL(HAVE_GCC_GNU89_INLINE_OPTION, test "$gnu89_inline" = "yes"])
 AM_CONDITIONAL(HAVE_GCC, test "$GCC" = "yes")
 

diff --git a/lib/accelerated/Makefile.am b/lib/accelerated/Makefile.am
index e9426d0be64fad9bb58ae09cca2b13cc8fa29b3f..440a73bd7bf94ec5b4bb2bea53cf05d0974fe290 100644 (file)
--- a/lib/accelerated/Makefile.am
+++ b/lib/accelerated/Makefile.am
@@ -32,18 +32,12 @@ endif
 
 noinst_LTLIBRARIES = libaccelerated.la
 
-EXTRA_DIST = x86.h accelerated.h cryptodev.h
+EXTRA_DIST = accelerated.h cryptodev.h
 libaccelerated_la_SOURCES = accelerated.c cryptodev.c
 libaccelerated_la_LIBADD =
 
-if ASM_X86_64
+if ASM_X86
 SUBDIRS += intel
-AM_CFLAGS += -DASM_X86_64
-libaccelerated_la_LIBADD += intel/libintel.la
-endif
-
-if ASM_X86_32
-SUBDIRS += intel
-AM_CFLAGS += -DASM_X86_32
+AM_CFLAGS += -DASM_X86
 libaccelerated_la_LIBADD += intel/libintel.la
 endif

diff --git a/lib/accelerated/accelerated.c b/lib/accelerated/accelerated.c
index 8a89e3dc96b721df2740f80ac75c5c73348daafd..50f48c9ab9e6e38df968549d1be67de3a833717c 100644 (file)
--- a/lib/accelerated/accelerated.c
+++ b/lib/accelerated/accelerated.c
@@ -23,7 +23,7 @@
 #include <accelerated.h>
 #if defined(ASM_X86_32) || defined(ASM_X86_64)
 # include <intel/aes-x86.h>
-# include <x86.h>
+# include <intel/x86.h>
 #endif
 
 void _gnutls_register_accel_crypto(void)

diff --git a/lib/accelerated/intel/Makefile.am b/lib/accelerated/intel/Makefile.am
index 0882929c9affbd7c1d80fd2cf2cdfab0b6099a44..cbb00e95c82ca5df1660ce0179fc7c767cf90449 100644 (file)
--- a/lib/accelerated/intel/Makefile.am
+++ b/lib/accelerated/intel/Makefile.am
@@ -34,12 +34,13 @@ EXTRA_DIST = README license.txt
 
 noinst_LTLIBRARIES = libintel.la
 
-libintel_la_SOURCES = aes-x86.c aes-padlock.c aes-gcm-padlock.c aes-padlock.h aes-x86.h
+libintel_la_SOURCES = aes-x86.c aes-padlock.c aes-gcm-padlock.c aes-padlock.h aes-x86.h x86.h
 
 if ASM_X86_64
 AM_CPPFLAGS += -DASM_X86_64
 libintel_la_SOURCES += asm/appro-aes-x86-64.s asm/appro-aes-gcm-x86-64.s aes-gcm-x86.c asm/padlock-x86-64.s asm/cpuid-x86-64.s
 else
+AM_CPPFLAGS += -DASM_X86_32
 libintel_la_SOURCES += asm/appro-aes-x86.s asm/padlock-x86.s asm/cpuid-x86.s
 endif
 

diff --git a/lib/accelerated/x86.h b/lib/accelerated/intel/x86.h
similarity index 100%
rename from lib/accelerated/x86.h
rename to lib/accelerated/intel/x86.h