LIBS=../../libcrypto
-SOURCE[../../libcrypto]=\
- bn_add.c bn_div.c bn_exp.c bn_lib.c bn_ctx.c bn_mul.c bn_mod.c \
- bn_print.c bn_rand.c bn_shift.c bn_word.c bn_blind.c \
- bn_kron.c bn_sqrt.c bn_gcd.c bn_prime.c bn_err.c bn_sqr.c \
- {- $target{bn_asm_src} -} \
+
+$BNASM=bn_asm.c
+IF[{- !$disabled{asm} -}]
+ # Define source files and macros per asm architecture
+ # Known macros are:
+ #
+ # OPENSSL_BN_ASM_PART_WORDS For any collection with /-586/ file names
+ # OPENSSL_BN_ASM_MONT For any collection with /-mont/ file names
+ # OPENSSL_BN_ASM_MONT5 For any collection with /-mont5/ file names
+ # OPENSSL_BN_ASM_GF2m For any collection with /-gf2m/ file names
+ # OPENSSL_IA32_SSE2 For any collection with /86/ file names
+ # when sse2 is enabled
+ # BN_DIV3W For any collection with /-div3w/ file names
+ #
+ # All variables are named in such a way that they can be "indexed" with
+ # $target{asm_arch}
+
+ $BNASM_x86=bn-586.s co-586.s x86-mont.s x86-gf2m.s
+ # bn-586 is the only one implementing bn_*_part_words
+ # => OPENSSL_BN_ASM_PART_WORDS
+ $BNDEF_x86=OPENSSL_BN_ASM_PART_WORDS OPENSSL_BN_ASM_MONT OPENSSL_BN_ASM_GF2m
+ $BNDEF_x86_sse2=OPENSSL_IA32_SSE2
+
+ $BNASM_x86_64=\
+ x86_64-mont.s x86_64-mont5.s x86_64-gf2m.s rsaz_exp.c rsaz-x86_64.s \
+ rsaz-avx2.s
+ IF[{- $config{target} !~ /^VC/ -}]
+ $BNASM_x86_64=asm/x86_64-gcc.c $BNASM_x86_64
+ ELSE
+ $BNASM_x86_64=bn_asm.c $BNASM_x86_64
+ ENDIF
+ $BNDEF_x86_64=OPENSSL_BN_ASM_MONT OPENSSL_BN_ASM_MONT5 OPENSSL_BN_ASM_GF2m
+ $BNDEF_x86_64_sse2=OPENSSL_IA32_SSE2
+
+ IF[{- $config{target} !~ /^VC/ -}]
+ $BNASM_ia64=bn-ia64.s ia64-mont.s
+ ELSE
+ $BNASM_ia64=bn_asm.c ia64-mont.s
+ ENDIF
+
+ $BNASM_sparcv9=asm/sparcv8plus.S sparcv9-mont.S sparcv9a-mont.S vis3-mont.S \
+ sparct4-mont.S
+ $BNDEF_sparcv9=OPENSSL_BN_ASM_MONT
+ $BNASM_sparcv9_ec2m=sparcv9-gf2m.S
+ $BNDEF_sparcv9_ec2m=OPENSSL_BN_ASM_GF2m
+
+ $BNASM_sparcv8=asm/sparcv8.S
+
+ $BNASM_alpha=bn_asm.c alpha-mont.S
+ $BNDEF_alpha=OPENSSL_BN_ASM_MONT
+
+ $BNASM_mips32=bn-mips.S mips-mont.S
+ $BNDEF_mips32=OPENSSL_BN_ASM_MONT
+ $BNASM_mips64=$BNASM_mips32
+ $BNDEF_mips64=$BNDEF_mips32
+
+ IF[{- ($target{perlasm_scheme} // '') eq '31' -}]
+ $BNASM_s390x=bn_asm.c s390x-mont.S
+ ELSE
+ $BNASM_s390x=asm/s390x.S s390x-mont.S
+ ENDIF
+ $BNDEF_s390x=OPENSSL_BN_ASM_MONT
+ $BNASM_s390x_ec2m=s390x-gf2m.s
+ $BNDEF_s390x_ec2m=OPENSSL_BN_ASM_GF2m
+
+ $BNASM_armv4=bn_asm.c armv4-mont.S
+ $BNDEF_armv4=OPENSSL_BN_ASM_MONT
+ $BNASM_armv4_ec2m=armv4-gf2m.S
+ $BNDEF_armv4_ec2m=OPENSSL_BN_ASM_GF2m
+
+ $BNASM_aarch64=bn_asm.c armv8-mont.S
+ $BNDEF_aarch64=OPENSSL_BN_ASM_MONT
+
+ $BNASM_parisc11=bn_asm.c parisc-mont.s
+ $BNDEF_parisc11=OPENSSL_BN_ASM_MONT
+ $BNASM_parisc20_64=$BNASM_parisc11
+ $BNDEF_parisc20_64=$BNDEF_parisc11
+
+ $BNASM_ppc32=bn-ppc.s ppc-mont.s
+ $BNDEF_ppc32=OPENSSL_BN_ASM_MONT
+ $BNASM_ppc64=$BNASM_ppc32
+ $BNDEF_ppc64=$BNDEF_ppc32
+
+ $BNASM_c64xplus=asm/bn-c64xplus.asm
+ $BNASM_c64xplus_ec2m=c64xplus-gf2m.s
+ $BNDEF_c64xplus_ec2m=OPENSSL_BN_ASM_GF2m
+
+ # Now that we have defined all the arch specific variables, use the
+ # appropriate ones, and define the appropriate macros
+ IF[$BNASM_{- $target{asm_arch} -}]
+ $BNASM=$BNASM_{- $target{asm_arch} -}
+ $BNDEF=$BNDEF_{- $target{asm_arch} -}
+ IF[{- !$disabled{ec2m} -}]
+ $BNASM=$BNASM $BNASM_{- $target{asm_arch} -}_ec2m
+ $BNDEF=$BNDEF $BNDEF_{- $target{asm_arch} -}_ec2m
+ ENDIF
+ IF[{- !$disabled{sse2} -}]
+ $BNDEF=$BNDEF $BNDEF_{- $target{asm_arch} -}_sse2
+ ENDIF
+ ENDIF
+ENDIF
+
+IF[{- !$disabled{dh} -}]
+ $BNDH=bn_const.c
+ELSE
+ $BNDH=
+ENDIF
+
+$COMMON=bn_add.c bn_div.c bn_exp.c bn_lib.c bn_ctx.c bn_mul.c \
+ bn_mod.c bn_conv.c bn_rand.c bn_shift.c bn_word.c bn_blind.c \
+ bn_kron.c bn_sqrt.c bn_gcd.c bn_prime.c bn_sqr.c \
bn_recp.c bn_mont.c bn_mpi.c bn_exp2.c bn_gf2m.c bn_nist.c \
- bn_depr.c bn_const.c bn_x931p.c bn_intern.c bn_dh.c bn_srp.c
+ bn_x931p.c bn_intern.c bn_dh.c \
+ bn_rsa_fips186_4.c $BNDH $BNASM
+SOURCE[../../libcrypto]=$COMMON bn_print.c bn_err.c bn_depr.c bn_srp.c
+SOURCE[../../providers/libfips.a]=$COMMON
+# Implementations are now spread across several libraries, so the defines
+# need to be applied to all affected libraries and modules.
+DEFINE[../../libcrypto]=$BNDEF
+DEFINE[../../providers/libfips.a]=$BNDEF
+DEFINE[../../providers/libimplementations.a]=$BNDEF
+
INCLUDE[../../libcrypto]=../../crypto/include
INCLUDE[bn_exp.o]=..
-GENERATE[bn-586.s]=asm/bn-586.pl \
- $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(PROCESSOR)
+GENERATE[bn-586.s]=asm/bn-586.pl
DEPEND[bn-586.s]=../perlasm/x86asm.pl
-GENERATE[co-586.s]=asm/co-586.pl \
- $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(PROCESSOR)
+GENERATE[co-586.s]=asm/co-586.pl
DEPEND[co-586.s]=../perlasm/x86asm.pl
-GENERATE[x86-mont.s]=asm/x86-mont.pl \
- $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(PROCESSOR)
+GENERATE[x86-mont.s]=asm/x86-mont.pl
DEPEND[x86-mont.s]=../perlasm/x86asm.pl
-GENERATE[x86-gf2m.s]=asm/x86-gf2m.pl \
- $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(PROCESSOR)
+GENERATE[x86-gf2m.s]=asm/x86-gf2m.pl
DEPEND[x86-gf2m.s]=../perlasm/x86asm.pl
-GENERATE[sparcv9a-mont.S]=asm/sparcv9a-mont.pl $(PERLASM_SCHEME)
+GENERATE[sparcv9a-mont.S]=asm/sparcv9a-mont.pl
INCLUDE[sparcv9a-mont.o]=..
-GENERATE[sparcv9-mont.S]=asm/sparcv9-mont.pl $(PERLASM_SCHEME)
+GENERATE[sparcv9-mont.S]=asm/sparcv9-mont.pl
INCLUDE[sparcv9-mont.o]=..
-GENERATE[vis3-mont.S]=asm/vis3-mont.pl $(PERLASM_SCHEME)
+GENERATE[vis3-mont.S]=asm/vis3-mont.pl
INCLUDE[vis3-mont.o]=..
-GENERATE[sparct4-mont.S]=asm/sparct4-mont.pl $(PERLASM_SCHEME)
+GENERATE[sparct4-mont.S]=asm/sparct4-mont.pl
INCLUDE[sparct4-mont.o]=..
-GENERATE[sparcv9-gf2m.S]=asm/sparcv9-gf2m.pl $(PERLASM_SCHEME)
+GENERATE[sparcv9-gf2m.S]=asm/sparcv9-gf2m.pl
INCLUDE[sparcv9-gf2m.o]=..
-GENERATE[bn-mips.s]=asm/mips.pl $(PERLASM_SCHEME)
-GENERATE[mips-mont.s]=asm/mips-mont.pl $(PERLASM_SCHEME)
+GENERATE[bn-mips.S]=asm/mips.pl
+INCLUDE[bn-mips.o]=..
+GENERATE[mips-mont.S]=asm/mips-mont.pl
+INCLUDE[mips-mont.o]=..
-GENERATE[s390x-mont.S]=asm/s390x-mont.pl $(PERLASM_SCHEME)
-GENERATE[s390x-gf2m.s]=asm/s390x-gf2m.pl $(PERLASM_SCHEME)
+GENERATE[s390x-mont.S]=asm/s390x-mont.pl
+GENERATE[s390x-gf2m.s]=asm/s390x-gf2m.pl
-GENERATE[x86_64-mont.s]=asm/x86_64-mont.pl $(PERLASM_SCHEME)
-GENERATE[x86_64-mont5.s]=asm/x86_64-mont5.pl $(PERLASM_SCHEME)
-GENERATE[x86_64-gf2m.s]=asm/x86_64-gf2m.pl $(PERLASM_SCHEME)
-GENERATE[rsaz-x86_64.s]=asm/rsaz-x86_64.pl $(PERLASM_SCHEME)
-GENERATE[rsaz-avx2.s]=asm/rsaz-avx2.pl $(PERLASM_SCHEME)
+GENERATE[x86_64-mont.s]=asm/x86_64-mont.pl
+GENERATE[x86_64-mont5.s]=asm/x86_64-mont5.pl
+GENERATE[x86_64-gf2m.s]=asm/x86_64-gf2m.pl
+GENERATE[rsaz-x86_64.s]=asm/rsaz-x86_64.pl
+GENERATE[rsaz-avx2.s]=asm/rsaz-avx2.pl
GENERATE[bn-ia64.s]=asm/ia64.S
-GENERATE[ia64-mont.s]=asm/ia64-mont.pl $(CFLAGS) $(LIB_CFLAGS)
+GENERATE[ia64-mont.s]=asm/ia64-mont.pl
-GENERATE[parisc-mont.s]=asm/parisc-mont.pl $(PERLASM_SCHEME)
+GENERATE[parisc-mont.s]=asm/parisc-mont.pl
# ppc - AIX, Linux, MacOS X...
-GENERATE[bn-ppc.s]=asm/ppc.pl $(PERLASM_SCHEME)
-GENERATE[ppc-mont.s]=asm/ppc-mont.pl $(PERLASM_SCHEME)
-GENERATE[ppc64-mont.s]=asm/ppc64-mont.pl $(PERLASM_SCHEME)
+GENERATE[bn-ppc.s]=asm/ppc.pl
+GENERATE[ppc-mont.s]=asm/ppc-mont.pl
+GENERATE[ppc64-mont.s]=asm/ppc64-mont.pl
-GENERATE[alpha-mont.S]=asm/alpha-mont.pl $(PERLASM_SCHEME)
+GENERATE[alpha-mont.S]=asm/alpha-mont.pl
-GENERATE[armv4-mont.S]=asm/armv4-mont.pl $(PERLASM_SCHEME)
+GENERATE[armv4-mont.S]=asm/armv4-mont.pl
INCLUDE[armv4-mont.o]=..
-GENERATE[armv4-gf2m.S]=asm/armv4-gf2m.pl $(PERLASM_SCHEME)
+GENERATE[armv4-gf2m.S]=asm/armv4-gf2m.pl
INCLUDE[armv4-gf2m.o]=..
-GENERATE[armv8-mont.S]=asm/armv8-mont.pl $(PERLASM_SCHEME)
-
-OVERRIDES=bn-mips3.o pa-risc2W.o pa-risc2.c
-BEGINRAW[Makefile]
-##### BN assembler implementations
-
-{- $builddir -}/bn-mips3.o: {- $sourcedir -}/asm/mips3.s
- @if [ "$(CC)" = "gcc" ]; then \
- ABI=`expr "$(CFLAGS)" : ".*-mabi=\([n3264]*\)"` && \
- as -$$ABI -O -o $@ {- $sourcedir -}/asm/mips3.s; \
- else $(CC) -c $(CFLAGS) $(LIB_CFLAGS) -o $@ {- $sourcedir -}/asm/mips3.s; fi
-
-# GNU assembler fails to compile PA-RISC2 modules, insist on calling
-# vendor assembler...
-{- $builddir -}/pa-risc2W.o: {- $sourcedir -}/asm/pa-risc2W.s
- CC="$(CC)" $(PERL) $(SRCDIR)/util/fipsas.pl $(SRCDIR) $< /usr/ccs/bin/as -o pa-risc2W.o {- $sourcedir -}/asm/pa-risc2W.s
-{- $builddir -}/pa-risc2.o: {- $sourcedir -}/asm/pa-risc2.s
- CC="$(CC)" $(PERL) $(SRCDIR)/util/fipsas.pl $(SRCDIR) $< /usr/ccs/bin/as -o pa-risc2.o {- $sourcedir -}/asm/pa-risc2.s
-
-ENDRAW[Makefile]
+GENERATE[armv8-mont.S]=asm/armv8-mont.pl