diff options
| -rw-r--r-- | Configurations/00-base-templates.conf | 4 | ||||
| -rw-r--r-- | Configurations/README | 5 | ||||
| -rwxr-xr-x | Configure | 4 | ||||
| -rw-r--r-- | engines/build.info | 20 |
4 files changed, 17 insertions, 16 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index 14b7608ca5..46de732676 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -14,8 +14,6 @@ my %targets=( thread_scheme => "(unknown)", # Assume we don't know thread_defines => [], - padlock_asm_src => "", - unistd => "<unistd.h>", shared_target => "", shared_cflag => "", @@ -151,7 +149,6 @@ my %targets=( x86_asm => { template => 1, - padlock_asm_src => "e_padlock-x86.s", }, x86_elf_asm => { template => 1, @@ -159,7 +156,6 @@ my %targets=( }, x86_64_asm => { template => 1, - padlock_asm_src => "e_padlock-x86_64.s", }, ia64_asm => { template => 1, diff --git a/Configurations/README b/Configurations/README index 84e7b20c7d..fa99539050 100644 --- a/Configurations/README +++ b/Configurations/README @@ -240,11 +240,6 @@ In each table entry, the following keys are significant: export vars as accessor functions. - padlock_asm_src => Assembler implementation of core parts of - the padlock engine. This is mandatory on - any platform where the padlock engine might - actually be built. - [1] as part of the target configuration, one can have a key called 'inherit_from' that indicate what other configurations to inherit @@ -1404,9 +1404,6 @@ if ($target{sys_id} ne "") } unless ($disabled{asm}) { - if ($target{padlock_asm_src} ne $table{DEFAULTS}->{padlock_asm_src}) { - push @{$config{dso_defines}}, "PADLOCK_ASM"; - } } my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC}); @@ -3335,7 +3332,6 @@ sub print_table_entry "loutflag", "ex_libs", "bn_ops", - "padlock_asm_src", "poly1035_asm_src", "thread_scheme", "perlasm_scheme", diff --git a/engines/build.info b/engines/build.info index 3189f9f343..77aab6d525 100644 --- a/engines/build.info +++ b/engines/build.info @@ -1,9 +1,22 @@ IF[{- !$disabled{"engine"} -}] + $PADLOCKASM= + IF[{- !$disabled{asm} -}] + $PADLOCKASM_x86=e_padlock-x86.s + $PADLOCKASM_x86_64=e_padlock-x86_64.s + + # Now that we have defined all the arch specific variables, use the + # appropriate one, and define the appropriate macros + IF[$PADLOCKASM_{- $target{asm_arch} -}] + $PADLOCKASM=$PADLOCKASM_{- $target{asm_arch} -} + $PADLOCKDEF=PADLOCK_ASM + ENDIF + ENDIF + IF[{- $disabled{"dynamic-engine"} -}] LIBS=../libcrypto IF[{- !$disabled{padlockeng} -}] - SOURCE[../libcrypto]=\ - e_padlock.c {- $target{padlock_asm_src} -} + SOURCE[../libcrypto]=e_padlock.c $PADLOCKASM + DEFINE[../libcrypto]=$PADLOCKDEF ENDIF IF[{- !$disabled{capieng} -}] SOURCE[../libcrypto]=e_capi.c @@ -17,7 +30,8 @@ IF[{- !$disabled{"engine"} -}] ELSE IF[{- !$disabled{padlockeng} -}] MODULES{engine}=padlock - SOURCE[padlock]=e_padlock.c {- $target{padlock_asm_src} -} + SOURCE[padlock]=e_padlock.c $PADLOCKASM + DEFINE[padlock]=$PADLOCKDEF DEPEND[padlock]=../libcrypto INCLUDE[padlock]=../include IF[{- defined $target{shared_defflag} -}] |