From 97124d674264c5bc2b0a7754452aabed399b85cf Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Thu, 9 Feb 2023 18:45:55 +0100 Subject: autoconf: update for bn on amd64-elf --- crypto/Makefile.am | 33 +++++++++++++++++++++++++++++++-- crypto/Makefile.am.elf-x86_64 | 15 +++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/crypto/Makefile.am b/crypto/Makefile.am index c7e651d..960b50f 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am @@ -411,12 +411,10 @@ noinst_HEADERS += bio/bio_local.h # bn libcrypto_la_SOURCES += bn/bn_add.c -libcrypto_la_SOURCES += bn/bn_asm.c libcrypto_la_SOURCES += bn/bn_blind.c libcrypto_la_SOURCES += bn/bn_bpsw.c libcrypto_la_SOURCES += bn/bn_const.c libcrypto_la_SOURCES += bn/bn_ctx.c -libcrypto_la_SOURCES += bn/bn_depr.c libcrypto_la_SOURCES += bn/bn_div.c libcrypto_la_SOURCES += bn/bn_err.c libcrypto_la_SOURCES += bn/bn_exp.c @@ -441,8 +439,39 @@ libcrypto_la_SOURCES += bn/bn_sqr.c libcrypto_la_SOURCES += bn/bn_sqrt.c libcrypto_la_SOURCES += bn/bn_word.c libcrypto_la_SOURCES += bn/bn_x931p.c +noinst_HEADERS += bn/bn_internal.h noinst_HEADERS += bn/bn_local.h noinst_HEADERS += bn/bn_prime.h +noinst_HEADERS += bn/s2n_bignum.h +noinst_HEADERS += bn/s2n_bignum_internal.h + +# bn/arch +noinst_HEADERS += bn/arch/aarch64/bn_arch.h +noinst_HEADERS += bn/arch/alpha/bn_arch.h +noinst_HEADERS += bn/arch/amd64/bn_arch.h +noinst_HEADERS += bn/arch/arm/bn_arch.h +noinst_HEADERS += bn/arch/hppa/bn_arch.h +noinst_HEADERS += bn/arch/i386/bn_arch.h +noinst_HEADERS += bn/arch/m88k/bn_arch.h +noinst_HEADERS += bn/arch/mips64/bn_arch.h +noinst_HEADERS += bn/arch/powerpc/bn_arch.h +noinst_HEADERS += bn/arch/powerpc64/bn_arch.h +noinst_HEADERS += bn/arch/riscv64/bn_arch.h +noinst_HEADERS += bn/arch/sh/bn_arch.h +noinst_HEADERS += bn/arch/sparc64/bn_arch.h + +# bn/arch/amd64 +EXTRA_libcrypto_la_SOURCES += ./bn/arch/amd64/bignum_add.S +EXTRA_libcrypto_la_SOURCES += ./bn/arch/amd64/bignum_cmadd.S +EXTRA_libcrypto_la_SOURCES += ./bn/arch/amd64/bignum_cmul.S +EXTRA_libcrypto_la_SOURCES += ./bn/arch/amd64/bignum_mul.S +EXTRA_libcrypto_la_SOURCES += ./bn/arch/amd64/bignum_mul_4_8_alt.S +EXTRA_libcrypto_la_SOURCES += ./bn/arch/amd64/bignum_mul_8_16_alt.S +EXTRA_libcrypto_la_SOURCES += ./bn/arch/amd64/bignum_sqr.S +EXTRA_libcrypto_la_SOURCES += ./bn/arch/amd64/bignum_sqr_4_8_alt.S +EXTRA_libcrypto_la_SOURCES += ./bn/arch/amd64/bignum_sqr_8_16_alt.S +EXTRA_libcrypto_la_SOURCES += ./bn/arch/amd64/bignum_sub.S +EXTRA_libcrypto_la_SOURCES += ./bn/arch/amd64/bn_arch.c # buffer libcrypto_la_SOURCES += buffer/buf_err.c diff --git a/crypto/Makefile.am.elf-x86_64 b/crypto/Makefile.am.elf-x86_64 index 4cd34e2..f03d424 100644 --- a/crypto/Makefile.am.elf-x86_64 +++ b/crypto/Makefile.am.elf-x86_64 @@ -19,6 +19,18 @@ ASM_X86_64_ELF += sha/sha512-elf-x86_64.S ASM_X86_64_ELF += whrlpool/wp-elf-x86_64.S ASM_X86_64_ELF += cpuid-elf-x86_64.S +ASM_X86_64_ELF += bn/arch/amd64/bignum_add.S +ASM_X86_64_ELF += bn/arch/amd64/bignum_cmadd.S +ASM_X86_64_ELF += bn/arch/amd64/bignum_cmul.S +ASM_X86_64_ELF += bn/arch/amd64/bignum_mul.S +ASM_X86_64_ELF += bn/arch/amd64/bignum_mul_4_8_alt.S +ASM_X86_64_ELF += bn/arch/amd64/bignum_mul_8_16_alt.S +ASM_X86_64_ELF += bn/arch/amd64/bignum_sqr.S +ASM_X86_64_ELF += bn/arch/amd64/bignum_sqr_4_8_alt.S +ASM_X86_64_ELF += bn/arch/amd64/bignum_sqr_8_16_alt.S +ASM_X86_64_ELF += bn/arch/amd64/bignum_sub.S +ASM_X86_64_ELF += bn/arch/amd64/bn_arch.c + EXTRA_DIST += $(ASM_X86_64_ELF) if HOST_ASM_ELF_X86_64 @@ -38,4 +50,7 @@ libcrypto_la_CPPFLAGS += -DSHA512_ASM libcrypto_la_CPPFLAGS += -DWHIRLPOOL_ASM libcrypto_la_CPPFLAGS += -DOPENSSL_CPUID_OBJ libcrypto_la_SOURCES += $(ASM_X86_64_ELF) + +# XXX - not the right place for this. It should be done depending on CPU. +libcrypto_la_CPPFLAGS += -I$(top_srcdir)/crypto/bn/arch/amd64/ endif -- cgit v1.2.3-55-g6feb