From: Richard Levitte Date: Tue, 13 Feb 2018 19:32:42 +0000 (+0100) Subject: Harmonize the make variables across all known platforms families X-Git-Tag: OpenSSL_1_1_1-pre2~151 X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=722c9762f2e021a9b43774fca282c9a4146d38e6;ds=sidebyside Harmonize the make variables across all known platforms families The make variables LIB_CFLAGS, DSO_CFLAGS and so on were used in addition to CFLAGS and so on. This works without problem on Unix and Windows, where options with different purposes (such as -D and -I) can appear anywhere on the command line and get accumulated as they come. This is not necessarely so on VMS. For example, macros must all be collected and given through one /DEFINE, and the same goes for inclusion directories (/INCLUDE). So, to harmonize all platforms, we repurpose make variables starting with LIB_, DSO_ and BIN_ to be all encompassing variables that collects the corresponding values from CFLAGS, CPPFLAGS, DEFINES, INCLUDES and so on together with possible config target values specific for libraries DSOs and programs, and use them instead of the general ones everywhere. This will, for example, allow VMS to use the exact same generators for generated files that go through cpp as all other platforms, something that has been impossible to do safely before now. Reviewed-by: Andy Polyakov (Merged from https://github.com/openssl/openssl/pull/5357) --- diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 84008ee641..f095214b07 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -177,25 +177,37 @@ DEFINES={- our $defines = join(",", '__dummy', # To make comma processing easier @{$config{defines}}) -} INCLUDES={- our $includes = join(',', @{$config{includes}}) -} -CPPFLAGS={- our $cppflags = join('', @{$config{cppflags}}) -} -CPPFLAGS_Q={- (my $x = $cppflags) =~ s|"|""|g; $defines =~ s|"|""|g; - $x .= "/DEFINE=($defines)"; +CPPFLAGS='qual_includes'{- our $cppflags = join('', @{$config{cppflags}}) -} +CPPFLAGS_Q={- (my $x = $cppflags) =~ s|"|""|g; + (my $d = $defines) =~ s|"|""|g; $x .= "/INCLUDE=($includes)" if $includes; + $x .= "/DEFINE=($d)"; $x; -} CFLAGS={- join('', @{$config{cflags}}) -} LDFLAGS= {- join('', @{$config{lflags}}) -} EX_LIBS= {- join('', map { ','.$_ } @{$config{ex_libs}}) -} -LIB_DEFINES={- join("", - (map { ",$_" } - @{$target{shared_defines}}, - 'OPENSSLDIR="""$(OPENSSLDIR_C)"""', - 'ENGINESDIR="""$(ENGINESDIR_C)"""')) -} -LIB_CFLAGS={- $target{lib_cflags} // "" -} -DSO_CFLAGS={- $target{dso_cflags} // "" -} -BIN_CFLAGS={- $target{bin_cflags} // "" -} -NO_INST_LIB_CFLAGS={- $target{no_inst_lib_cflags} // '$(LIB_CFLAGS)' -} -NO_INST_DSO_CFLAGS={- $target{no_inst_dso_cflags} // '$(DSO_CFLAGS)' -} -NO_INST_BIN_CFLAGS={- $target{no_inst_bin_cflags} // '$(BIN_CFLAGS)' -} + +LIB_DEFINES=$(DEFINES){- join("", (map { ",$_" } + @{$target{shared_defines}}, + 'OPENSSLDIR="""$(OPENSSLDIR_C)"""', + 'ENGINESDIR="""$(ENGINESDIR_C)"""')) -} +LIB_CPPFLAGS=$(CPPFLAGS)/DEFINE=($(LIB_DEFINES)) +LIB_CFLAGS=$(CFLAGS){- $target{lib_cflags} // "" -} +DSO_DEFINES=$(DEFINES){- join("", (map { ",$_" } @{$target{dso_defines}})) -} +DSO_CPPFLAGS=$(CPPFLAGS)/DEFINE=($(DSO_DEFINES)) +DSO_CFLAGS=$(CFLAGS){- $target{dso_cflags} // "" -} +BIN_DEFINES=$(DEFINES){- join("", (map { ",$_" } @{$target{bin_defines}})) -} +BIN_CPPFLAGS=$(CPPFLAGS)/DEFINE=($(BIN_DEFINES)) +BIN_CFLAGS=$(CFLAGS){- $target{bin_cflags} // "" -} +NO_INST_LIB_CFLAGS=$(CFLAGS){- $target{no_inst_lib_cflags} + // $target{lib_cflags} + // "" -} +NO_INST_DSO_CFLAGS=$(CFLAGS){- $target{no_inst_dso_cflags} + // $target{dso_cflags} + // "" -} +NO_INST_BIN_CFLAGS=$(CFLAGS){- $target{no_inst_bin_cflags} + // $target{bin_cflags} + // "" -} PERL={- $config{perl} -} @@ -622,24 +634,17 @@ EOF map { abs2rel(rel2abs($_), rel2abs($forward)) } @{$args{srcs}}); my $cflags = '$(CFLAGS)'; if ($args{installed}) { - $cflags .= { lib => '$(LIB_CFLAGS)', - dso => '$(DSO_CFLAGS)', - bin => '$(BIN_CFLAGS)' } -> {$args{intent}}; + $cflags = { lib => '$(LIB_CFLAGS)', + dso => '$(DSO_CFLAGS)', + bin => '$(BIN_CFLAGS)' } -> {$args{intent}}; } else { - $cflags .= { lib => '$(NO_INST_LIB_CFLAGS)', - dso => '$(NO_INST_DSO_CFLAGS)', - bin => '$(NO_INST_BIN_CFLAGS)' } -> {$args{intent}}; + $cflags = { lib => '$(NO_INST_LIB_CFLAGS)', + dso => '$(NO_INST_DSO_CFLAGS)', + bin => '$(NO_INST_BIN_CFLAGS)' } -> {$args{intent}}; } - $cflags .= '$(CPPFLAGS)'; $cflags .= { lib => '$(LIB_CPPFLAGS)', dso => '$(DSO_CPPFLAGS)', bin => '$(BIN_CPPFLAGS)' } -> {$args{intent}}; - my $defines = '$(DEFINES)'; - $defines .= { lib => '$(LIB_DEFINES)', - dso => '$(DSO_DEFINES)', - bin => '$(BIN_DEFINES)' } -> {$args{intent}}; - $cflags .= '/DEFINE=('.$defines.')'; - $cflags .= "/INCLUDE=('tmp_includes')"; # We create a logical name TMP_INCLUDES: to hold the list of internal # includes. However, we cannot use it directly, as logical names can't @@ -682,9 +687,9 @@ EOF $obj.OBJ : $deps ${before} SET DEFAULT $forward - $incs_on + \@ $incs_on \$(CC) ${cflags}${depbuild} /OBJECT=${objd}${objn}.OBJ /REPOSITORY=$backward $srcs - $incs_off + \@ $incs_off SET DEFAULT $backward ${after} - PURGE $obj.OBJ diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index dad868b1df..1f214a2747 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -196,22 +196,23 @@ CXXFLAGS={- join(' ', @{$config{cxxflags}}) -} LDFLAGS= {- join(' ', @{$config{lflags}}) -} PLIB_LDFLAGS= {- join(' ', @{$config{plib_lflags}}) -} EX_LIBS= {- join(' ', @{$config{ex_libs}}) -} -LIB_CPPFLAGS={- join(' ', - (map { '-D'.$_ } - ('OPENSSLDIR="\"$(OPENSSLDIR)\""', - 'ENGINESDIR="\"$(ENGINESDIR)\""')), - $target{shared_cppflag}) || "" -} -LIB_CFLAGS={- $target{shared_cflag} || "" -} -LIB_CXXFLAGS={- $target{shared_cxxflag} || "" -} -LIB_LDFLAGS={- $target{shared_ldflag}." ".$config{shared_ldflag} -} -DSO_CPPFLAGS={- $target{dso_cppflags} || "" -} -DSO_CFLAGS={- $target{dso_cflags} || "" -} -DSO_CXXFLAGS={- $target{dso_cxxflags} || "" -} -DSO_LDFLAGS={- $target{dso_lflags} || "" -} -BIN_CPPFLAGS={- $target{bin_cppflags} || "" -} -BIN_CFLAGS={- $target{bin_cflags} || "" -} -BIN_CXXFLAGS={- $target{bin_cxxflags} || "" -} -BIN_LDFLAGS={- $target{bin_lflags} || "" -} + +LIB_CPPFLAGS={- join(' ', '$(CPPFLAGS)', + $target{shared_cppflag} || (), + (map { '-D'.$_ } + ('OPENSSLDIR="\"$(OPENSSLDIR)\""', + 'ENGINESDIR="\"$(ENGINESDIR)\""'))) -} +LIB_CFLAGS={- join(' ', '$(CFLAGS)', $target{shared_cflag} || ()) -} +LIB_CXXFLAGS={- join(' ', '$(CXXFLAGS)', $target{shared_cxxflag} || ()) -} +LIB_LDFLAGS={- join(' ', '$(LDFLAGS)', $target{shared_ldflag} || (), $config{shared_ldflag} || ()) -} +DSO_CPPFLAGS={- join(' ', '$(CPPFLAGS)', $target{dso_cppflags} || ()) -} +DSO_CFLAGS={- join(' ', '$(CFLAGS)', $target{dso_cflags} || ()) -} +DSO_CXXFLAGS={- join(' ', '$(CXXFLAGS)', $target{dso_cxxflags} || ()) -} +DSO_LDFLAGS={- join(' ', '$(LDFLAGS)', $target{dso_lflags} || ()) -} +BIN_CPPFLAGS={- join(' ', '$(CPPFLAGS)', $target{bin_cppflags} || ()) -} +BIN_CFLAGS={- join(' ', '$(CFLAGS)', $target{bin_cflags} || ()) -} +BIN_CXXFLAGS={- join(' ', '$(CXXFLAGS)', $target{bin_cxxflags} || ()) -} +BIN_LDFLAGS={- join(' ', '$(LDFLAGS)', $target{bin_lflags} || ()) -} PERL={- $config{perl} -} @@ -848,6 +849,11 @@ EOF die "Generator type for $args{src} unknown: $generator\n"; } + my $cppflags = { + lib => '$(LIB_CPPFLAGS)', + dso => '$(DSO_CPPFLAGS)', + bin => '$(BIN_CPPFLAGS)' + } -> {$args{intent}}; if (defined($generator)) { # If the target is named foo.S in build.info, we want to # end up generating foo.s in two steps. @@ -891,9 +897,9 @@ EOF my $srcs = join(" ", @srcs); my $deps = join(" ", @srcs, @{$args{deps}}); my $incs = join("", map { " -I".$_ } @{$args{incs}}); - my $cmd = '$(CC)'; - my $cmdflags = '$(CFLAGS)'; - my $cmdcompile = ' -c'; + my $cmd; + my $cmdflags; + my $cmdcompile; my $makedepprog = $disabled{makedepend} ? undef : $config{makedepprog}; if (grep /\.rc$/, @srcs) { $cmd = '$(RC)'; @@ -902,22 +908,20 @@ EOF $makedepprog = undef; } elsif (grep /\.(cc|cpp)$/, @srcs) { $cmd = '$(CXX)'; - $cmdflags = '$(CXXFLAGS)'; - $cmdflags .= ' ' . { lib => '$(LIB_CXXFLAGS)', - dso => '$(DSO_CXXFLAGS)', - bin => '$(BIN_CXXFLAGS)' } -> {$args{intent}}; - $cmdflags .= ' $(CPPFLAGS)'; - $cmdflags .= ' ' . { lib => '$(LIB_CPPFLAGS)', - dso => '$(DSO_CPPFLAGS)', - bin => '$(BIN_CPPFLAGS)' } -> {$args{intent}}; + $cmdcompile = ' -c'; + $cmdflags = { + lib => '$(LIB_CXXFLAGS) $(LIB_CPPFLAGS)', + dso => '$(DSO_CXXFLAGS) $(DSO_CPPFLAGS)', + bin => '$(BIN_CXXFLAGS) $(BIN_CPPFLAGS)' + } -> {$args{intent}}; } else { - $cmdflags .= ' ' . { lib => '$(LIB_CFLAGS)', - dso => '$(DSO_CFLAGS)', - bin => '$(BIN_CFLAGS)' } -> {$args{intent}}; - $cmdflags .= ' $(CPPFLAGS)'; - $cmdflags .= ' ' . { lib => '$(LIB_CPPFLAGS)', - dso => '$(DSO_CPPFLAGS)', - bin => '$(BIN_CPPFLAGS)' } -> {$args{intent}}; + $cmd = '$(CC)'; + $cmdcompile = ' -c'; + $cmdflags = { + lib => '$(LIB_CFLAGS) $(LIB_CPPFLAGS)', + dso => '$(DSO_CFLAGS) $(DSO_CPPFLAGS)', + bin => '$(BIN_CFLAGS) $(BIN_CPPFLAGS)' + } -> {$args{intent}}; } $cmdflags .= $cmdcompile; my $recipe = <<"EOF"; @@ -997,7 +1001,7 @@ EOF # simplest, {libname}\$(SHLIB_EXT_IMPORT) for Windows POSIX layers and # {libname}\$(SHLIB_EXT_SIMPLE) for the Unix platforms. $target: $deps - \$(CC) \$(CFLAGS) \$(LIB_CFLAGS) $linkflags\$(LIB_LDFLAGS)$shared_soname$shared_imp \\ + \$(CC) \$(LIB_CFLAGS) $linkflags\$(LIB_LDFLAGS)$shared_soname$shared_imp \\ -o $target_full$shared_def $objs \\ \$(PLIB_LDFLAGS) $linklibs \$(EX_LIBS) EOF @@ -1040,7 +1044,7 @@ EOF my $target = dso($dso); return <<"EOF"; $target: $objs $deps - \$(CC) \$(CFLAGS) \$(DSO_CFLAGS) $linkflags\$(DSO_LDFLAGS) \\ + \$(CC) \$(DSO_CFLAGS) $linkflags\$(DSO_LDFLAGS) \\ -o $target $objs \\ \$(PLIB_LDFLAGS) $linklibs \$(EX_LIBS) EOF @@ -1080,15 +1084,15 @@ EOF } } @{$args{deps}}); my $cmd = '$(CC)'; - my $cmdflags = '$(CFLAGS) $(BIN_CFLAGS)'; + my $cmdflags = '$(BIN_CFLAGS)'; if (grep /_cc\.o$/, @{$args{objs}}) { $cmd = '$(CXX)'; - $cmdflags = '$(CXXFLAGS) $(BIN_CXXFLAGS)'; + $cmdflags = '$(BIN_CXXFLAGS)'; } return <<"EOF"; $bin$exeext: $objs $deps rm -f $bin$exeext - \$\${LDCMD:-$cmd} $cmdflags $linkflags\$(LDFLAGS) \$(BIN_LDFLAGS) \\ + \$\${LDCMD:-$cmd} $cmdflags $linkflags\$(BIN_LDFLAGS) \\ -o $bin$exeext $objs \\ \$(PLIB_LDFLAGS) $linklibs \$(EX_LIBS) EOF diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index ab6a00d658..ab557b8a5d 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -174,19 +174,20 @@ LD={- $config{ld} -} LDFLAGS={- join(' ', @{$config{lflags}}) -} LDOUTFLAG={- $target{loutflag} || "/out:" -}$(OSSL_EMPTY) EX_LIBS={- join(' ', @{$config{ex_libs}}) -} -LIB_CPPFLAGS={- join(" ", - $target{shared_cppflag} || "", - (map { quotify_l("-D".$_) } - "OPENSSLDIR=\"$openssldir\"", - "ENGINESDIR=\"$enginesdir\"")) -} -LIB_CFLAGS={- join(" ", $target{lib_cflags}, $target{shared_cflag}) -} -LIB_LDFLAGS={- join(' ', $target{shared_ldflag}, $config{shared_ldflag}) -} -DSO_CPPFLAGS={- $target{dso_cppflags} || "" -} -DSO_CFLAGS={- $target{dso_cflags} || "" -} -DSO_LDFLAGS={- $target{dso_ldflag} || "" -} -BIN_CPPFLAGS={- $target{dso_cppflags} || "" -} -BIN_CFLAGS={- $target{bin_cflags} -} -BIN_LDFLAGS={- $target{bin_lflags} -} + +LIB_CPPFLAGS={- join(' ', '$(CPPFLAGS)', + $target{shared_cppflag} || (), + (map { quotify_l("-D".$_) } + "OPENSSLDIR=\"$openssldir\"", + "ENGINESDIR=\"$enginesdir\"")) -} +LIB_CFLAGS={- join(' ', '$(CFLAGS)', $target{lib_cflags} || (), $target{shared_cflag} || ()) -} +LIB_LDFLAGS={- join(' ', '$(LDFLAGS)', $target{shared_ldflag} || (), $config{shared_ldflag} || ()) -} +DSO_CPPFLAGS={- join(' ', '$(CPPFLAGS)', $target{dso_cppflags} || ()) -} +DSO_CFLAGS={- join(' ', '$(CFLAGS)', $target{dso_cflags} || ()) -} +DSO_LDFLAGS={- join(' ', '$(LDFLAGS)', $target{dso_ldflag} || ()) -} +BIN_CPPFLAGS={- join(' ', '$(CPPFLAGS)', $target{dso_cppflags} || ()) -} +BIN_CFLAGS={- join(' ', '$(CFLAGS)', $target{bin_cflags} || ()) -} +BIN_LDFLAGS={- join(' ', '$(LDFLAGS)', $target{bin_lflags} || ()) -} PERL={- $config{perl} -} @@ -434,6 +435,10 @@ EOF die "Generator type for $src unknown: $generator\n"; } + my $cppflags = $incs; + $cppflags .= { lib => '$(LIB_CPPFLAGS)', + dso => '$(DSO_CPPFLAGS)', + bin => '$(BIN_CPPFLAGS)' } -> {$args{intent}}; if (defined($generator)) { # If the target is named foo.S in build.info, we want to # end up generating foo.s in two steps. @@ -467,12 +472,10 @@ EOF my $srcs = '"'.join('" "', @srcs).'"'; my $deps = '"'.join('" "', @srcs, @{$args{deps}}).'"'; my $incs = join("", map { ' /I "'.$_.'"' } @{$args{incs}}); - my $cflags = '$(CFLAGS)'; - $cflags .= { lib => ' $(LIB_CFLAGS)', - dso => ' $(DSO_CFLAGS)', - bin => ' $(BIN_CFLAGS)' } -> {$args{intent}}; + my $cflags = { lib => ' $(LIB_CFLAGS)', + dso => ' $(DSO_CFLAGS)', + bin => ' $(BIN_CFLAGS)' } -> {$args{intent}}; $cflags .= $incs; - $cflags .= ' $(CPPFLAGS)'; $cflags .= { lib => ' $(LIB_CPPFLAGS)', dso => ' $(DSO_CPPFLAGS)', bin => ' $(BIN_CPPFLAGS)' } -> {$args{intent}}; diff --git a/crypto/aes/build.info b/crypto/aes/build.info index 102e863675..0f04863640 100644 --- a/crypto/aes/build.info +++ b/crypto/aes/build.info @@ -6,16 +6,13 @@ SOURCE[../../libcrypto]=\ GENERATE[aes-ia64.s]=asm/aes-ia64.S GENERATE[aes-586.s]=asm/aes-586.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) \ - $(PROCESSOR) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) DEPEND[aes-586.s]=../perlasm/x86asm.pl GENERATE[vpaes-x86.s]=asm/vpaes-x86.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) \ - $(PROCESSOR) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) DEPEND[vpaes-586.s]=../perlasm/x86asm.pl GENERATE[aesni-x86.s]=asm/aesni-x86.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) \ - $(PROCESSOR) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) DEPEND[aesni-586.s]=../perlasm/x86asm.pl GENERATE[aes-x86_64.s]=asm/aes-x86_64.pl $(PERLASM_SCHEME) diff --git a/crypto/bf/build.info b/crypto/bf/build.info index b1e9e8a172..29adc8ce50 100644 --- a/crypto/bf/build.info +++ b/crypto/bf/build.info @@ -3,6 +3,5 @@ SOURCE[../../libcrypto]=bf_skey.c bf_ecb.c bf_cfb64.c bf_ofb64.c \ {- $target{bf_asm_src} -} GENERATE[bf-586.s]=asm/bf-586.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) \ - $(PROCESSOR) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) DEPEND[bf-586.s]=../perlasm/x86asm.pl ../perlasm/cbc.pl diff --git a/crypto/bn/build.info b/crypto/bn/build.info index 950464db78..a463eddabb 100644 --- a/crypto/bn/build.info +++ b/crypto/bn/build.info @@ -11,20 +11,16 @@ INCLUDE[../../libcrypto]=../../crypto/include INCLUDE[bn_exp.o]=.. GENERATE[bn-586.s]=asm/bn-586.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) \ - $(PROCESSOR) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) DEPEND[bn-586.s]=../perlasm/x86asm.pl GENERATE[co-586.s]=asm/co-586.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) \ - $(PROCESSOR) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) DEPEND[co-586.s]=../perlasm/x86asm.pl GENERATE[x86-mont.s]=asm/x86-mont.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) \ - $(PROCESSOR) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) DEPEND[x86-mont.s]=../perlasm/x86asm.pl GENERATE[x86-gf2m.s]=asm/x86-gf2m.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) \ - $(PROCESSOR) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) DEPEND[x86-gf2m.s]=../perlasm/x86asm.pl GENERATE[sparcv9a-mont.S]=asm/sparcv9a-mont.pl $(PERLASM_SCHEME) @@ -53,8 +49,7 @@ GENERATE[rsaz-x86_64.s]=asm/rsaz-x86_64.pl $(PERLASM_SCHEME) GENERATE[rsaz-avx2.s]=asm/rsaz-avx2.pl $(PERLASM_SCHEME) GENERATE[bn-ia64.s]=asm/ia64.S -GENERATE[ia64-mont.s]=asm/ia64-mont.pl \ - $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) +GENERATE[ia64-mont.s]=asm/ia64-mont.pl $(LIB_CFLAGS) $(LIB_CPPFLAGS) GENERATE[parisc-mont.s]=asm/parisc-mont.pl $(PERLASM_SCHEME) diff --git a/crypto/build.info b/crypto/build.info index a87321949a..0a8f6e22aa 100644 --- a/crypto/build.info +++ b/crypto/build.info @@ -19,8 +19,7 @@ GENERATE[uplink-x86_64.s]=../ms/uplink-x86_64.pl $(PERLASM_SCHEME) GENERATE[uplink-ia64.s]=../ms/uplink-ia64.pl $(PERLASM_SCHEME) GENERATE[x86cpuid.s]=x86cpuid.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) \ - $(PROCESSOR) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) DEPEND[x86cpuid.s]=perlasm/x86asm.pl GENERATE[x86_64cpuid.s]=x86_64cpuid.pl $(PERLASM_SCHEME) diff --git a/crypto/camellia/build.info b/crypto/camellia/build.info index 9f8d1e689d..e36a19bd4d 100644 --- a/crypto/camellia/build.info +++ b/crypto/camellia/build.info @@ -4,7 +4,7 @@ SOURCE[../../libcrypto]=\ {- $target{cmll_asm_src} -} GENERATE[cmll-x86.s]=asm/cmll-x86.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) \ + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) \ $(PROCESSOR) DEPEND[cmll-x86.s]=../perlasm/x86asm.pl GENERATE[cmll-x86_64.s]=asm/cmll-x86_64.pl $(PERLASM_SCHEME) diff --git a/crypto/cast/build.info b/crypto/cast/build.info index 1fd0c6f80b..b0f59f3800 100644 --- a/crypto/cast/build.info +++ b/crypto/cast/build.info @@ -3,6 +3,5 @@ SOURCE[../../libcrypto]=\ c_skey.c c_ecb.c {- $target{cast_asm_src} -} c_cfb64.c c_ofb64.c GENERATE[cast-586.s]=asm/cast-586.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) \ - $(PROCESSOR) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) DEPEND[cast-586.s]=../perlasm/x86asm.pl ../perlasm/cbc.pl diff --git a/crypto/chacha/build.info b/crypto/chacha/build.info index a33386cb6f..02f8e518ae 100644 --- a/crypto/chacha/build.info +++ b/crypto/chacha/build.info @@ -2,8 +2,7 @@ LIBS=../../libcrypto SOURCE[../../libcrypto]={- $target{chacha_asm_src} -} GENERATE[chacha-x86.s]=asm/chacha-x86.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) \ - $(PROCESSOR) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) GENERATE[chacha-x86_64.s]=asm/chacha-x86_64.pl $(PERLASM_SCHEME) GENERATE[chacha-ppc.s]=asm/chacha-ppc.pl $(PERLASM_SCHEME) GENERATE[chacha-armv4.S]=asm/chacha-armv4.pl $(PERLASM_SCHEME) diff --git a/crypto/des/build.info b/crypto/des/build.info index 519db560de..05cb154cd4 100644 --- a/crypto/des/build.info +++ b/crypto/des/build.info @@ -12,8 +12,8 @@ GENERATE[dest4-sparcv9.S]=asm/dest4-sparcv9.pl $(PERLASM_SCHEME) INCLUDE[dest4-sparcv9.o]=.. GENERATE[des-586.s]=asm/des-586.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) DEPEND[des-586.s]=../perlasm/x86asm.pl ../perlasm/cbc.pl GENERATE[crypt586.s]=asm/crypt586.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) DEPEND[crypt586.s]=../perlasm/x86asm.pl ../perlasm/cbc.pl diff --git a/crypto/ec/build.info b/crypto/ec/build.info index 7e5cad40d1..4e9de4b9e7 100644 --- a/crypto/ec/build.info +++ b/crypto/ec/build.info @@ -9,8 +9,7 @@ SOURCE[../../libcrypto]=\ {- $target{ec_asm_src} -} GENERATE[ecp_nistz256-x86.s]=asm/ecp_nistz256-x86.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) \ - $(PROCESSOR) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) GENERATE[ecp_nistz256-x86_64.s]=asm/ecp_nistz256-x86_64.pl $(PERLASM_SCHEME) diff --git a/crypto/md5/build.info b/crypto/md5/build.info index d1ea9cfcd2..e641fecd0d 100644 --- a/crypto/md5/build.info +++ b/crypto/md5/build.info @@ -3,7 +3,7 @@ SOURCE[../../libcrypto]=\ md5_dgst.c md5_one.c {- $target{md5_asm_src} -} GENERATE[md5-586.s]=asm/md5-586.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) GENERATE[md5-x86_64.s]=asm/md5-x86_64.pl $(PERLASM_SCHEME) diff --git a/crypto/modes/build.info b/crypto/modes/build.info index d39b66323e..821340eb90 100644 --- a/crypto/modes/build.info +++ b/crypto/modes/build.info @@ -6,11 +6,9 @@ SOURCE[../../libcrypto]=\ INCLUDE[gcm128.o]=.. -GENERATE[ghash-ia64.s]=asm/ghash-ia64.pl \ - $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) +GENERATE[ghash-ia64.s]=asm/ghash-ia64.pl $(LIB_CFLAGS) $(LIB_CPPFLAGS) GENERATE[ghash-x86.s]=asm/ghash-x86.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) \ - $(PROCESSOR) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) GENERATE[ghash-x86_64.s]=asm/ghash-x86_64.pl $(PERLASM_SCHEME) GENERATE[aesni-gcm-x86_64.s]=asm/aesni-gcm-x86_64.pl $(PERLASM_SCHEME) GENERATE[ghash-sparcv9.S]=asm/ghash-sparcv9.pl $(PERLASM_SCHEME) diff --git a/crypto/poly1305/build.info b/crypto/poly1305/build.info index a990a91719..631b32b8e0 100644 --- a/crypto/poly1305/build.info +++ b/crypto/poly1305/build.info @@ -7,8 +7,7 @@ SOURCE[../../libcrypto]=\ GENERATE[poly1305-sparcv9.S]=asm/poly1305-sparcv9.pl $(PERLASM_SCHEME) INCLUDE[poly1305-sparcv9.o]=.. GENERATE[poly1305-x86.s]=asm/poly1305-x86.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) \ - $(PROCESSOR) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) GENERATE[poly1305-x86_64.s]=asm/poly1305-x86_64.pl $(PERLASM_SCHEME) GENERATE[poly1305-ppc.s]=asm/poly1305-ppc.pl $(PERLASM_SCHEME) GENERATE[poly1305-ppcfp.s]=asm/poly1305-ppcfp.pl $(PERLASM_SCHEME) diff --git a/crypto/rc4/build.info b/crypto/rc4/build.info index dc44c0dddc..46ee66b61c 100644 --- a/crypto/rc4/build.info +++ b/crypto/rc4/build.info @@ -3,8 +3,7 @@ SOURCE[../../libcrypto]=\ {- $target{rc4_asm_src} -} GENERATE[rc4-586.s]=asm/rc4-586.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) \ - $(PROCESSOR) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) DEPEND[rc4-586.s]=../perlasm/x86asm.pl GENERATE[rc4-x86_64.s]=asm/rc4-x86_64.pl $(PERLASM_SCHEME) diff --git a/crypto/rc5/build.info b/crypto/rc5/build.info index 6a22594c6d..928a62cd85 100644 --- a/crypto/rc5/build.info +++ b/crypto/rc5/build.info @@ -3,5 +3,5 @@ SOURCE[../../libcrypto]=\ rc5_skey.c rc5_ecb.c {- $target{rc5_asm_src} -} rc5cfb64.c rc5ofb64.c GENERATE[rc5-586.s]=asm/rc5-586.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) DEPEND[rc5-586.s]=../perlasm/x86asm.pl ../perlasm/cbc.pl diff --git a/crypto/ripemd/build.info b/crypto/ripemd/build.info index 9dc7a76fc9..a4a894e2d1 100644 --- a/crypto/ripemd/build.info +++ b/crypto/ripemd/build.info @@ -3,5 +3,5 @@ SOURCE[../../libcrypto]=\ rmd_dgst.c rmd_one.c {- $target{rmd160_asm_src} -} GENERATE[rmd-586.s]=asm/rmd-586.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) DEPEND[rmd-586.s]=../perlasm/x86asm.pl diff --git a/crypto/sha/build.info b/crypto/sha/build.info index 4044b3f3ce..9dffec3f3e 100644 --- a/crypto/sha/build.info +++ b/crypto/sha/build.info @@ -4,24 +4,18 @@ SOURCE[../../libcrypto]=\ keccak1600.c GENERATE[sha1-586.s]=asm/sha1-586.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) \ - $(PROCESSOR) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) DEPEND[sha1-586.s]=../perlasm/x86asm.pl GENERATE[sha256-586.s]=asm/sha256-586.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) \ - $(PROCESSOR) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) DEPEND[sha256-586.s]=../perlasm/x86asm.pl GENERATE[sha512-586.s]=asm/sha512-586.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) \ - $(PROCESSOR) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) DEPEND[sha512-586.s]=../perlasm/x86asm.pl -GENERATE[sha1-ia64.s]=asm/sha1-ia64.pl \ - $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) -GENERATE[sha256-ia64.s]=asm/sha512-ia64.pl \ - $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) -GENERATE[sha512-ia64.s]=asm/sha512-ia64.pl \ - $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) +GENERATE[sha1-ia64.s]=asm/sha1-ia64.pl $(LIB_CFLAGS) $(LIB_CPPFLAGS) +GENERATE[sha256-ia64.s]=asm/sha512-ia64.pl $(LIB_CFLAGS) $(LIB_CPPFLAGS) +GENERATE[sha512-ia64.s]=asm/sha512-ia64.pl $(LIB_CFLAGS) $(LIB_CPPFLAGS) GENERATE[sha1-alpha.S]=asm/sha1-alpha.pl $(PERLASM_SCHEME) diff --git a/crypto/whrlpool/build.info b/crypto/whrlpool/build.info index 6044d7ba98..4b167b504e 100644 --- a/crypto/whrlpool/build.info +++ b/crypto/whrlpool/build.info @@ -2,8 +2,7 @@ LIBS=../../libcrypto SOURCE[../../libcrypto]=wp_dgst.c {- $target{wp_asm_src} -} GENERATE[wp-mmx.s]=asm/wp-mmx.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) \ - $(PROCESSOR) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) DEPEND[wp-mmx.s]=../perlasm/x86asm.pl GENERATE[wp-x86_64.s]=asm/wp-x86_64.pl $(PERLASM_SCHEME) diff --git a/engines/build.info b/engines/build.info index ad5cc162a3..df173ea69d 100644 --- a/engines/build.info +++ b/engines/build.info @@ -38,7 +38,6 @@ IF[{- !$disabled{"engine"} -}] ENDIF GENERATE[e_padlock-x86.s]=asm/e_padlock-x86.pl \ - $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) \ - $(PROCESSOR) + $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) GENERATE[e_padlock-x86_64.s]=asm/e_padlock-x86_64.pl $(PERLASM_SCHEME) ENDIF