diff options
| author | Andy Polyakov <appro@openssl.org> | 2016-03-08 09:46:19 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2016-03-08 15:51:06 +0100 |
| commit | eb77e8886df84526f42f566632be71d4ed373308 (patch) | |
| tree | 1b00377caae997512838c8e532e7a6c662847162 /crypto/camellia | |
| parent | b76998b86c3f63bea7f8b85c8b62fda91fb8f4b7 (diff) | |
SPARCv9 assembly pack: unify build rules and argument handling.
Make all scripts produce .S, make interpretation of $(CFLAGS)
pre-processor's responsibility, start accepting $(PERLASM_SCHEME).
[$(PERLASM_SCHEME) is redundant in this case, because there are
no deviataions between Solaris and Linux assemblers. This is
purely to unify .pl->.S handling across all targets.]
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/camellia')
| -rw-r--r-- | crypto/camellia/Makefile.in | 4 | ||||
| -rw-r--r-- | crypto/camellia/asm/cmllt4-sparcv9.pl | 5 | ||||
| -rw-r--r-- | crypto/camellia/build.info | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/crypto/camellia/Makefile.in b/crypto/camellia/Makefile.in index 10c5a75341..e32a73be64 100644 --- a/crypto/camellia/Makefile.in +++ b/crypto/camellia/Makefile.in @@ -45,8 +45,8 @@ cmll-x86.s: asm/cmll-x86.pl ../perlasm/x86asm.pl $(PERL) asm/cmll-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ cmll-x86_64.s: asm/cmll-x86_64.pl $(PERL) asm/cmll-x86_64.pl $(PERLASM_SCHEME) > $@ -cmllt4-sparcv9.s: asm/cmllt4-sparcv9.pl ../perlasm/sparcv9_modes.pl - $(PERL) asm/cmllt4-sparcv9.pl $(CFLAGS) > $@ +cmllt4-sparcv9.S: asm/cmllt4-sparcv9.pl ../perlasm/sparcv9_modes.pl + $(PERL) asm/cmllt4-sparcv9.pl $(PERLASM_SCHEME) $@ files: $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO diff --git a/crypto/camellia/asm/cmllt4-sparcv9.pl b/crypto/camellia/asm/cmllt4-sparcv9.pl index a813168b42..fac53623a7 100644 --- a/crypto/camellia/asm/cmllt4-sparcv9.pl +++ b/crypto/camellia/asm/cmllt4-sparcv9.pl @@ -46,7 +46,8 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; push(@INC,"${dir}","${dir}../../perlasm"); require "sparcv9_modes.pl"; -&asm_init(@ARGV); +$output = pop; +open STDOUT,">$output"; $::evp=1; # if $evp is set to 0, script generates module with # Camellia_[en|de]crypt, Camellia_set_key and Camellia_cbc_encrypt @@ -59,6 +60,8 @@ $::evp=1; # if $evp is set to 0, script generates module with my ($inp,$out,$key,$rounds,$tmp,$mask)=map("%o$_",(0..5)); $code=<<___; +#include "sparc_arch.h" + .text .globl cmll_t4_encrypt diff --git a/crypto/camellia/build.info b/crypto/camellia/build.info index d212d5441d..b5c1114bac 100644 --- a/crypto/camellia/build.info +++ b/crypto/camellia/build.info @@ -8,6 +8,6 @@ BEGINRAW[Makefile] CC="$(CC)" $(PERL) {- $sourcedir -}/asm/cmll-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ {- $builddir -}/cmll-x86_64.s: {- $sourcedir -}/asm/cmll-x86_64.pl CC="$(CC)" $(PERL) {- $sourcedir -}/asm/cmll-x86_64.pl $(PERLASM_SCHEME) > $@ -{- $builddir -}/cmllt4-sparcv9.s: {- $sourcedir -}/asm/cmllt4-sparcv9.pl {- $sourcetop -}/crypto/perlasm/sparcv9_modes.pl - CC="$(CC)" $(PERL) {- $sourcedir -}/asm/cmllt4-sparcv9.pl $(CFLAGS) > $@ +{- $builddir -}/cmllt4-sparcv9.S: {- $sourcedir -}/asm/cmllt4-sparcv9.pl {- $sourcetop -}/crypto/perlasm/sparcv9_modes.pl + CC="$(CC)" $(PERL) {- $sourcedir -}/asm/cmllt4-sparcv9.pl $(PERLASM_SCHEME) $@ ENDRAW[Makefile] |