diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-06-16 21:57:13 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-06-17 16:08:52 +0200 |
| commit | 6fe56d84702cbaccf758c4faf6af28f2797ff1d8 (patch) | |
| tree | d4702090672929879831a25ac879f57dd1dd0b5d | |
| parent | 2ffea443223a943efff0f642c37824b63b7e3e30 (diff) | |
Move rc5_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/rc5/build.info | 15 |
4 files changed, 14 insertions, 7 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index 6e6e14ea10..1621cd3443 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 => [], - rc5_asm_src => "rc5_enc.c", wp_asm_src => "wp_block.c", cmll_asm_src => "camellia.c cmll_misc.c cmll_cbc.c", modes_asm_src => "", @@ -158,7 +157,6 @@ my %targets=( x86_asm => { template => 1, - rc5_asm_src => "rc5-586.s", wp_asm_src => "wp_block.c wp-mmx.s", cmll_asm_src => "cmll-x86.s", modes_asm_src => "ghash-x86.s", diff --git a/Configurations/README b/Configurations/README index 6c4066358d..ad219876ba 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. - rc5_asm_src => Assembler implementation of core RC5 - functions. - Defaults to 'rc5_enc.c' wp_asm_src => Assembler implementation of core WHIRLPOOL functions. cmll_asm_src => Assembler implementation of core CAMELLIA @@ -3351,7 +3351,6 @@ sub print_table_entry "loutflag", "ex_libs", "bn_ops", - "rc5_asm_src", "wp_asm_src", "cmll_asm_src", "modes_asm_src", diff --git a/crypto/rc5/build.info b/crypto/rc5/build.info index 928a62cd85..5780f3c5f9 100644 --- a/crypto/rc5/build.info +++ b/crypto/rc5/build.info @@ -1,6 +1,19 @@ LIBS=../../libcrypto + +$RC5ASM=rc5_enc.c +IF[{- !$disabled{asm} -}] + $RC5ASM_x86=rc5-586.s + + # Now that we have defined all the arch specific variables, use the + # appropriate one, and define the appropriate macros + IF[$RC5ASM_{- $target{asm_arch} -}] + $RC5ASM=$RC5ASM_{- $target{asm_arch} -} + $RC5DEF=RC5_ASM + ENDIF +ENDIF + SOURCE[../../libcrypto]=\ - rc5_skey.c rc5_ecb.c {- $target{rc5_asm_src} -} rc5cfb64.c rc5ofb64.c + rc5_skey.c rc5_ecb.c $RC5ASM rc5cfb64.c rc5ofb64.c GENERATE[rc5-586.s]=asm/rc5-586.pl \ $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) |