summaryrefslogtreecommitdiff
path: root/cfg.mk
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2019-04-26 14:43:19 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2019-06-27 06:45:15 +0200
commitbc36db1ebad82ec3da8cc30259bc293093c0aaab (patch)
treeb74bf4c5328a983dfef9b77b791e09d4fb2c1c39 /cfg.mk
parente1eaba41da82b2588b48bebc6ec5cb13cc46f717 (diff)
downloadgnutls-bc36db1ebad82ec3da8cc30259bc293093c0aaab.tar.gz
Updated asm files to latest version under cryptogams license
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
Diffstat (limited to 'cfg.mk')
-rw-r--r--cfg.mk19
1 files changed, 10 insertions, 9 deletions
diff --git a/cfg.mk b/cfg.mk
index 3837d9619e..f7ae6408fd 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -138,6 +138,7 @@ ASM_SOURCES_XXX := \
lib/accelerated/x86/XXX/sha1-ssse3-x86.s \
lib/accelerated/x86/XXX/sha1-ssse3-x86_64.s \
lib/accelerated/x86/XXX/sha256-ssse3-x86.s \
+ lib/accelerated/x86/XXX/sha256-ssse3-x86_64.s \
lib/accelerated/x86/XXX/sha512-ssse3-x86.s \
lib/accelerated/x86/XXX/sha512-ssse3-x86_64.s \
lib/accelerated/x86/XXX/aesni-gcm-x86_64.s \
@@ -158,7 +159,7 @@ X86_FILES=XXX/aesni-x86.s XXX/cpuid-x86.s XXX/sha1-ssse3-x86.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 \
- XXX/aesni-gcm-x86_64.s
+ XXX/aesni-gcm-x86_64.s XXX/sha256-ssse3-x86_64.s
X86_PADLOCK_FILES=XXX/e_padlock-x86.s
X86_64_PADLOCK_FILES=XXX/e_padlock-x86_64.s
@@ -194,27 +195,27 @@ lib/accelerated/x86/files.mk: $(ASM_SOURCES_ELF)
# Appro's code
lib/accelerated/x86/elf/%.s: devel/perlasm/%.pl .submodule.stamp
- cat $<.license > $@
- CC=gcc perl $< elf >> $@
+ CC=gcc perl $< elf $@.tmp
+ cat $<.license $@.tmp > $@ && rm -f $@.tmp
echo "" >> $@
echo ".section .note.GNU-stack,\"\",%progbits" >> $@
sed -i 's/OPENSSL_ia32cap_P/_gnutls_x86_cpuid_s/g' $@
lib/accelerated/x86/coff/%-x86.s: devel/perlasm/%-x86.pl .submodule.stamp
- cat $<.license > $@
- CC=gcc perl $< coff >> $@
+ CC=gcc perl $< coff $@.tmp
+ cat $<.license $@.tmp > $@ && rm -f $@.tmp
echo "" >> $@
sed -i 's/OPENSSL_ia32cap_P/_gnutls_x86_cpuid_s/g' $@
lib/accelerated/x86/coff/%-x86_64.s: devel/perlasm/%-x86_64.pl .submodule.stamp
- cat $<.license > $@
- CC=gcc perl $< mingw64 >> $@
+ CC=gcc perl $< mingw64 $@.tmp
+ cat $<.license $@.tmp > $@ && rm -f $@.tmp
echo "" >> $@
sed -i 's/OPENSSL_ia32cap_P/_gnutls_x86_cpuid_s/g' $@
lib/accelerated/x86/macosx/%.s: devel/perlasm/%.pl .submodule.stamp
- cat $<.license > $@
- CC=gcc perl $< macosx >> $@
+ CC=gcc perl $< macosx $@.tmp
+ cat $<.license $@.tmp > $@ && rm -f $@.tmp
echo "" >> $@
sed -i 's/OPENSSL_ia32cap_P/_gnutls_x86_cpuid_s/g' $@