diff options
| -rw-r--r-- | Configurations/00-base-templates.conf | 2 | ||||
| -rw-r--r-- | Configurations/README | 2 | ||||
| -rwxr-xr-x | Configure | 4 | ||||
| -rw-r--r-- | crypto/ripemd/build.info | 17 |
4 files changed, 15 insertions, 10 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index 337ee223db..6e6e14ea10 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 => [], - rmd160_asm_src => "", rc5_asm_src => "rc5_enc.c", wp_asm_src => "wp_block.c", cmll_asm_src => "camellia.c cmll_misc.c cmll_cbc.c", @@ -159,7 +158,6 @@ my %targets=( x86_asm => { template => 1, - rmd160_asm_src => "rmd-586.s", rc5_asm_src => "rc5-586.s", wp_asm_src => "wp_block.c wp-mmx.s", cmll_asm_src => "cmll-x86.s", diff --git a/Configurations/README b/Configurations/README index b19e852ec5..6c4066358d 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. - rmd160_asm_src => Assembler implementation of core RMD160 - functions. rc5_asm_src => Assembler implementation of core RC5 functions. Defaults to 'rc5_enc.c' @@ -1407,9 +1407,6 @@ unless ($disabled{asm}) { if ($target{keccak1600_asm_src} ne $table{DEFAULTS}->{keccak1600_asm_src}) { push @{$config{lib_defines}}, "KECCAK1600_ASM"; } - if ($target{rmd160_asm_src}) { - push @{$config{lib_defines}}, "RMD160_ASM"; - } if ($target{wp_asm_src} =~ /mmx/) { if ($config{processor} eq "386") { $target{wp_asm_src}=$table{DEFAULTS}->{wp_asm_src}; @@ -3354,7 +3351,6 @@ sub print_table_entry "loutflag", "ex_libs", "bn_ops", - "rmd160_asm_src", "rc5_asm_src", "wp_asm_src", "cmll_asm_src", diff --git a/crypto/ripemd/build.info b/crypto/ripemd/build.info index a4a894e2d1..e2db293228 100644 --- a/crypto/ripemd/build.info +++ b/crypto/ripemd/build.info @@ -1,6 +1,19 @@ LIBS=../../libcrypto -SOURCE[../../libcrypto]=\ - rmd_dgst.c rmd_one.c {- $target{rmd160_asm_src} -} + +$RMD160ASM= +IF[{- !$disabled{asm} -}] + $RMD160ASM_x86=rmd-586.s + + # Now that we have defined all the arch specific variables, use the + # appropriate one, and define the appropriate macros + IF[$RMD160ASM_{- $target{asm_arch} -}] + $RMD160ASM=$RMD160ASM_{- $target{asm_arch} -} + $RMD160DEF=RMD160_ASM + ENDIF +ENDIF + +SOURCE[../../libcrypto]=rmd_dgst.c rmd_one.c $RMD160ASM +DEFINE[../../libcrypto]=$RMD160DEF GENERATE[rmd-586.s]=asm/rmd-586.pl \ $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) |