mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-18 13:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move rc5_asm_src file information to build.info files

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9166)
This commit is contained in:
Richard Levitte 2019-06-16 21:57:13 +02:00
parent 2ffea44322
commit 6fe56d8470
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Configurations/00-base-templates.conf
View File

@ -14,7 +14,6 @@ my %targets=(
thread_scheme => "(unknown)", # Assume we don't know thread_scheme => "(unknown)", # Assume we don't know
thread_defines => [], thread_defines => [],
rc5_asm_src => "rc5_enc.c",
wp_asm_src => "wp_block.c", wp_asm_src => "wp_block.c",
cmll_asm_src => "camellia.c cmll_misc.c cmll_cbc.c", cmll_asm_src => "camellia.c cmll_misc.c cmll_cbc.c",
modes_asm_src => "", modes_asm_src => "",
@ -158,7 +157,6 @@ my %targets=(
x86_asm => { x86_asm => {
template => 1, template => 1,
rc5_asm_src => "rc5-586.s",
wp_asm_src => "wp_block.c wp-mmx.s", wp_asm_src => "wp_block.c wp-mmx.s",
cmll_asm_src => "cmll-x86.s", cmll_asm_src => "cmll-x86.s",
modes_asm_src => "ghash-x86.s", modes_asm_src => "ghash-x86.s",

3
Configurations/README
View File

@ -240,9 +240,6 @@ In each table entry, the following keys are significant:
export vars as export vars as
accessor functions. accessor functions.
rc5_asm_src => Assembler implementation of core RC5
functions.
Defaults to 'rc5_enc.c'
wp_asm_src => Assembler implementation of core WHIRLPOOL wp_asm_src => Assembler implementation of core WHIRLPOOL
functions. functions.
cmll_asm_src => Assembler implementation of core CAMELLIA cmll_asm_src => Assembler implementation of core CAMELLIA

1
Configure
View File

@ -3351,7 +3351,6 @@ sub print_table_entry
"loutflag", "loutflag",
"ex_libs", "ex_libs",
"bn_ops", "bn_ops",
"rc5_asm_src",
"wp_asm_src", "wp_asm_src",
"cmll_asm_src", "cmll_asm_src",
"modes_asm_src", "modes_asm_src",

15
crypto/rc5/build.info
View File

@ -1,6 +1,19 @@
LIBS=../../libcrypto 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]=\ 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 \ GENERATE[rc5-586.s]=asm/rc5-586.pl \
$(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS)