summaryrefslogtreecommitdiff
path: root/cfg.mk
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2014-08-29 12:00:33 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2014-08-29 12:00:35 +0200
commitec70c214d2f714f03c42926df7935f4dda41194c (patch)
treeac9fb350b4ca52a51a3d4699aec3473695f63b2a /cfg.mk
parent5d8a9cb2f6f795165eabbee20a1ee015695e22ac (diff)
downloadgnutls-ec70c214d2f714f03c42926df7935f4dda41194c.tar.gz
added configuration option --disable-padlock
That allows keeping hardware acceleration in x86 but without support for padlock.
Diffstat (limited to 'cfg.mk')
-rw-r--r--cfg.mk20
1 files changed, 18 insertions, 2 deletions
diff --git a/cfg.mk b/cfg.mk
index 527e5f876d..b145b6167c 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -193,12 +193,15 @@ asm-sources: $(ASM_SOURCES_ELF) $(ASM_SOURCES_COFF) $(ASM_SOURCES_MACOSX) lib/ac
asm-sources-clean:
rm -f $(ASM_SOURCES_ELF) $(ASM_SOURCES_COFF) $(ASM_SOURCES_MACOSX) lib/accelerated/x86/files.mk
-X86_FILES=XXX/aesni-x86.s XXX/cpuid-x86.s XXX/e_padlock-x86.s XXX/sha1-ssse3-x86.s \
+X86_FILES=XXX/aesni-x86.s XXX/cpuid-x86.s XXX/sha1-ssse3-x86.s \
XXX/sha256-ssse3-x86.s XXX/sha512-ssse3-x86.s XXX/aes-ssse3-x86.s
-X86_64_FILES=XXX/aesni-x86_64.s XXX/cpuid-x86_64.s XXX/e_padlock-x86_64.s XXX/ghash-x86_64.s \
+X86_64_FILES=XXX/aesni-x86_64.s XXX/cpuid-x86_64.s XXX/ghash-x86_64.s \
XXX/sha1-ssse3-x86_64.s XXX/sha512-ssse3-x86_64.s XXX/aes-ssse3-x86_64.s
+X86_PADLOCK_FILES=XXX/e_padlock-x86.s
+X86_64_PADLOCK_FILES=XXX/e_padlock-x86_64.s
+
X86_FILES_ELF := $(subst XXX,elf,$(X86_FILES))
X86_FILES_COFF := $(subst XXX,coff,$(X86_FILES))
X86_FILES_MACOSX := $(subst XXX,macosx,$(X86_FILES))
@@ -206,6 +209,13 @@ X86_64_FILES_ELF := $(subst XXX,elf,$(X86_64_FILES))
X86_64_FILES_COFF := $(subst XXX,coff,$(X86_64_FILES))
X86_64_FILES_MACOSX := $(subst XXX,macosx,$(X86_64_FILES))
+X86_PADLOCK_FILES_ELF := $(subst XXX,elf,$(X86_PADLOCK_FILES))
+X86_PADLOCK_FILES_COFF := $(subst XXX,coff,$(X86_PADLOCK_FILES))
+X86_PADLOCK_FILES_MACOSX := $(subst XXX,macosx,$(X86_PADLOCK_FILES))
+X86_64_PADLOCK_FILES_ELF := $(subst XXX,elf,$(X86_64_PADLOCK_FILES))
+X86_64_PADLOCK_FILES_COFF := $(subst XXX,coff,$(X86_64_PADLOCK_FILES))
+X86_64_PADLOCK_FILES_MACOSX := $(subst XXX,macosx,$(X86_64_PADLOCK_FILES))
+
lib/accelerated/x86/files.mk: $(ASM_SOURCES_ELF)
echo X86_FILES_ELF=$(X86_FILES_ELF) > $@.tmp
echo X86_FILES_COFF=$(X86_FILES_COFF) >> $@.tmp
@@ -213,6 +223,12 @@ lib/accelerated/x86/files.mk: $(ASM_SOURCES_ELF)
echo X86_64_FILES_ELF=$(X86_64_FILES_ELF) >> $@.tmp
echo X86_64_FILES_COFF=$(X86_64_FILES_COFF) >> $@.tmp
echo X86_64_FILES_MACOSX=$(X86_64_FILES_MACOSX) >> $@.tmp
+ echo X86_PADLOCK_FILES_ELF=$(X86_PADLOCK_FILES_ELF) > $@.tmp
+ echo X86_PADLOCK_FILES_COFF=$(X86_PADLOCK_FILES_COFF) >> $@.tmp
+ echo X86_PADLOCK_FILES_MACOSX=$(X86_PADLOCK_FILES_MACOSX) >> $@.tmp
+ echo X86_64_PADLOCK_FILES_ELF=$(X86_64_PADLOCK_FILES_ELF) >> $@.tmp
+ echo X86_64_PADLOCK_FILES_COFF=$(X86_64_PADLOCK_FILES_COFF) >> $@.tmp
+ echo X86_64_PADLOCK_FILES_MACOSX=$(X86_64_PADLOCK_FILES_MACOSX) >> $@.tmp
mv $@.tmp $@
# Appro's code