wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move cast_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:46:38 +02:00
parent edc7851a2c
commit e698cfe445
4 changed files with 14 additions and 9 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 => [],
cast_asm_src => "c_enc.c",
rc4_asm_src => "rc4_enc.c rc4_skey.c", rc4_asm_src => "rc4_enc.c rc4_skey.c",
rmd160_asm_src => "", rmd160_asm_src => "",
rc5_asm_src => "rc5_enc.c", rc5_asm_src => "rc5_enc.c",
@ -161,7 +160,6 @@ my %targets=(
x86_asm => { x86_asm => {
template => 1, template => 1,
cast_asm_src => "cast-586.s",
rc4_asm_src => "rc4-586.s", rc4_asm_src => "rc4-586.s",
rmd160_asm_src => "rmd-586.s", rmd160_asm_src => "rmd-586.s",
rc5_asm_src => "rc5-586.s", rc5_asm_src => "rc5-586.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.
cast_asm_src => Assembler implementation of core CAST
functions.
Defaults to 'c_enc.c'
rc4_asm_src => Assembler implementation of core RC4 rc4_asm_src => Assembler implementation of core RC4
functions. functions.
Defaults to 'rc4_enc.c rc4_skey.c' Defaults to 'rc4_enc.c rc4_skey.c'

2
Configure
View file

@ -1410,7 +1410,6 @@ unless ($disabled{asm}) {
if ($target{rc4_asm_src} ne $table{DEFAULTS}->{rc4_asm_src}) { if ($target{rc4_asm_src} ne $table{DEFAULTS}->{rc4_asm_src}) {
push @{$config{lib_defines}}, "RC4_ASM"; push @{$config{lib_defines}}, "RC4_ASM";
} }
$target{cast_asm_src}=$table{DEFAULTS}->{cast_asm_src} unless $disabled{pic}; # CAST assembler is not PIC
if ($target{rmd160_asm_src}) { if ($target{rmd160_asm_src}) {
push @{$config{lib_defines}}, "RMD160_ASM"; push @{$config{lib_defines}}, "RMD160_ASM";
} }
@ -3358,7 +3357,6 @@ sub print_table_entry
"loutflag", "loutflag",
"ex_libs", "ex_libs",
"bn_ops", "bn_ops",
"cast_asm_src",
"rc4_asm_src", "rc4_asm_src",
"rmd160_asm_src", "rmd160_asm_src",
"rc5_asm_src", "rc5_asm_src",

16
crypto/cast/build.info
View file

@ -1,6 +1,18 @@
LIBS=../../libcrypto LIBS=../../libcrypto
SOURCE[../../libcrypto]=\
c_skey.c c_ecb.c {- $target{cast_asm_src} -} c_cfb64.c c_ofb64.c $CASTASM=c_enc.c
# CAST assembly source is not PIC
IF[{- !$disabled{asm} && !$disabled{pic} -}]
$CASTASM_x86=cast-586.s
# Now that we have defined all the arch specific variables, use the
# appropriate one
IF[$CASTASM_{- $target{asm_arch} -}]
$CASTASM=$CASTASM_{- $target{asm_arch} -}
ENDIF
ENDIF
SOURCE[../../libcrypto]=c_skey.c c_ecb.c $CASTASM c_cfb64.c c_ofb64.c
GENERATE[cast-586.s]=asm/cast-586.pl \ GENERATE[cast-586.s]=asm/cast-586.pl \
$(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR)