diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-06-16 22:03:00 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-06-17 16:08:52 +0200 |
| commit | 681c7e905dcc16ed8a0253580a303df4b60c3440 (patch) | |
| tree | 2c9d1152418b123f44ec1b5dee373a2a6216a0cf | |
| parent | 6fe56d84702cbaccf758c4faf6af28f2797ff1d8 (diff) | |
Move wp_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 | 3 | ||||
| -rw-r--r-- | Configurations/README | 2 | ||||
| -rwxr-xr-x | Configure | 8 | ||||
| -rw-r--r-- | crypto/whrlpool/build.info | 21 |
4 files changed, 20 insertions, 14 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index 1621cd3443..1cb6049045 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 => [], - wp_asm_src => "wp_block.c", cmll_asm_src => "camellia.c cmll_misc.c cmll_cbc.c", modes_asm_src => "", padlock_asm_src => "", @@ -157,7 +156,6 @@ my %targets=( x86_asm => { template => 1, - wp_asm_src => "wp_block.c wp-mmx.s", cmll_asm_src => "cmll-x86.s", modes_asm_src => "ghash-x86.s", padlock_asm_src => "e_padlock-x86.s", @@ -170,7 +168,6 @@ my %targets=( }, x86_64_asm => { template => 1, - wp_asm_src => "wp-x86_64.s", cmll_asm_src => "cmll-x86_64.s cmll_misc.c", modes_asm_src => "ghash-x86_64.s aesni-gcm-x86_64.s", padlock_asm_src => "e_padlock-x86_64.s", diff --git a/Configurations/README b/Configurations/README index ad219876ba..3c47d4676d 100644 --- a/Configurations/README +++ b/Configurations/README @@ -240,8 +240,6 @@ In each table entry, the following keys are significant: export vars as accessor functions. - wp_asm_src => Assembler implementation of core WHIRLPOOL - functions. cmll_asm_src => Assembler implementation of core CAMELLIA functions. Defaults to 'camellia.c cmll_misc.c cmll_cbc.c' @@ -1407,13 +1407,6 @@ unless ($disabled{asm}) { if ($target{keccak1600_asm_src} ne $table{DEFAULTS}->{keccak1600_asm_src}) { push @{$config{lib_defines}}, "KECCAK1600_ASM"; } - if ($target{wp_asm_src} =~ /mmx/) { - if ($config{processor} eq "386") { - $target{wp_asm_src}=$table{DEFAULTS}->{wp_asm_src}; - } elsif (!$disabled{"whirlpool"}) { - push @{$config{lib_defines}}, "WHIRLPOOL_ASM"; - } - } if ($target{modes_asm_src} =~ /ghash-/) { push @{$config{lib_defines}}, "GHASH_ASM"; } @@ -3351,7 +3344,6 @@ sub print_table_entry "loutflag", "ex_libs", "bn_ops", - "wp_asm_src", "cmll_asm_src", "modes_asm_src", "padlock_asm_src", diff --git a/crypto/whrlpool/build.info b/crypto/whrlpool/build.info index 4b167b504e..f67bf41b5e 100644 --- a/crypto/whrlpool/build.info +++ b/crypto/whrlpool/build.info @@ -1,5 +1,24 @@ LIBS=../../libcrypto -SOURCE[../../libcrypto]=wp_dgst.c {- $target{wp_asm_src} -} + +$WPASM=wp_block.c +IF[{- !$disabled{asm} -}] + IF[{- $config{processor} ne "386" -}] + $WPASM_x86=wp_block.c wp-mmx.s + $WPDEF_x86=WHIRLPOOL_ASM + ENDIF + $WPASM_x86_64=wp-x86_64.s + $WPDEF_x86_64=WHIRLPOOL_ASM + + # Now that we have defined all the arch specific variables, use the + # appropriate one, and define the appropriate macros + IF[$WPASM_{- $target{asm_arch} -}] + $WPASM=$WPASM_{- $target{asm_arch} -} + $WPDEF=$WPDEF_{- $target{asm_arch} -} + ENDIF +ENDIF + +SOURCE[../../libcrypto]=wp_dgst.c $WPASM +DEFINE[../../libcrypto]=$WPDEF GENERATE[wp-mmx.s]=asm/wp-mmx.pl \ $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) |