diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-06-16 21:20:43 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-06-17 16:08:52 +0200 |
| commit | 053d0b2226c224b8833d7d651428453ac65ee7ca (patch) | |
| tree | a8a33b52ee98a1b6234665f8372cf13a31afd04f | |
| parent | cd42b9e9c275ab88515259da4eb3802ecda7fa7b (diff) | |
Move bf_asm_src file information to build.info files
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9166)
| -rw-r--r-- | Configurations/00-base-templates.conf | 2 | ||||
| -rw-r--r-- | Configurations/README | 3 | ||||
| -rwxr-xr-x | Configure | 1 | ||||
| -rw-r--r-- | crypto/bf/build.info | 15 |
4 files changed, 13 insertions, 8 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index 0c7334ee4d..b4eb7e9419 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -14,7 +14,6 @@ my %targets=( thread_scheme => "(unknown)", # Assume we don't know thread_defines => [], - bf_asm_src => "bf_enc.c", md5_asm_src => "", cast_asm_src => "c_enc.c", rc4_asm_src => "rc4_enc.c rc4_skey.c", @@ -163,7 +162,6 @@ my %targets=( x86_asm => { template => 1, - bf_asm_src => "bf-586.s", md5_asm_src => "md5-586.s", cast_asm_src => "cast-586.s", sha1_asm_src => "sha1-586.s sha256-586.s sha512-586.s", diff --git a/Configurations/README b/Configurations/README index 36e71eedda..e8be7ffd7f 100644 --- a/Configurations/README +++ b/Configurations/README @@ -240,9 +240,6 @@ In each table entry, the following keys are significant: export vars as accessor functions. - bf_asm_src => Assembler implementation of core BlowFish - functions. - Defaults to 'bf_enc.c' md5_asm_src => Assembler implementation of core MD5 functions. sha1_asm_src => Assembler implementation of core SHA1, @@ -3366,7 +3366,6 @@ sub print_table_entry "loutflag", "ex_libs", "bn_ops", - "bf_asm_src", "md5_asm_src", "cast_asm_src", "sha1_asm_src", diff --git a/crypto/bf/build.info b/crypto/bf/build.info index 29adc8ce50..cc06212dfc 100644 --- a/crypto/bf/build.info +++ b/crypto/bf/build.info @@ -1,6 +1,17 @@ LIBS=../../libcrypto -SOURCE[../../libcrypto]=bf_skey.c bf_ecb.c bf_cfb64.c bf_ofb64.c \ - {- $target{bf_asm_src} -} + +$BFASM=bf_enc.c +IF[{- !$disabled{asm} -}] + $BFASM_x86=bf-586.s + + # Now that we have defined all the arch specific variables, use the + # appropriate one + IF[$BFASM_{- $target{asm_arch} -}] + $BFASM=$BFASM_{- $target{asm_arch} -} + ENDIF +ENDIF + +SOURCE[../../libcrypto]=bf_skey.c bf_ecb.c bf_cfb64.c bf_ofb64.c $BFASM GENERATE[bf-586.s]=asm/bf-586.pl \ $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) |