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/des | |
| 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/des')
| -rw-r--r-- | crypto/des/Makefile.in | 4 | ||||
| -rw-r--r-- | crypto/des/asm/dest4-sparcv9.pl | 11 | ||||
| -rw-r--r-- | crypto/des/build.info | 4 |
3 files changed, 11 insertions, 8 deletions
diff --git a/crypto/des/Makefile.in b/crypto/des/Makefile.in index 248b53d700..c056804d35 100644 --- a/crypto/des/Makefile.in +++ b/crypto/des/Makefile.in @@ -55,8 +55,8 @@ lib: $(LIBOBJ) des_enc-sparc.S: asm/des_enc.m4 m4 -B 8192 asm/des_enc.m4 > des_enc-sparc.S -dest4-sparcv9.s: asm/dest4-sparcv9.pl - $(PERL) asm/dest4-sparcv9.pl $(CFLAGS) > $@ +dest4-sparcv9.S: asm/dest4-sparcv9.pl + $(PERL) asm/dest4-sparcv9.pl $(PERLASM_SCHEME) $@ des-586.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl $(PERL) asm/des-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@ diff --git a/crypto/des/asm/dest4-sparcv9.pl b/crypto/des/asm/dest4-sparcv9.pl index 1dc60243d4..858df0ba84 100644 --- a/crypto/des/asm/dest4-sparcv9.pl +++ b/crypto/des/asm/dest4-sparcv9.pl @@ -27,14 +27,17 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; push(@INC,"${dir}","${dir}../../perlasm"); require "sparcv9_modes.pl"; -&asm_init(@ARGV); +$output=pop; +open STDOUT,">$output"; -$code.=<<___ if ($::abibits==64); +$code.=<<___; +#include "sparc_arch.h" + +#ifdef __arch64__ .register %g2,#scratch .register %g3,#scratch -___ +#endif -$code.=<<___; .text ___ diff --git a/crypto/des/build.info b/crypto/des/build.info index a0ac1de148..d3c5c1f64c 100644 --- a/crypto/des/build.info +++ b/crypto/des/build.info @@ -13,8 +13,8 @@ BEGINRAW[Makefile] {- $builddir -}/des_enc-sparc.S: {- $sourcedir -}/asm/des_enc.m4 m4 -B 8192 {- $sourcedir -}/asm/des_enc.m4 > $@ -{- $builddir -}/dest4-sparcv9.s: {- $sourcedir -}/asm/dest4-sparcv9.pl - CC="$(CC)" $(PERL) {- $sourcedir -}/asm/dest4-sparcv9.pl $(CFLAGS) > $@ +{- $builddir -}/dest4-sparcv9.S: {- $sourcedir -}/asm/dest4-sparcv9.pl + CC="$(CC)" $(PERL) {- $sourcedir -}/asm/dest4-sparcv9.pl $(PERLASM_SCHEME) $@ {- $builddir -}/des-586.s: {- $sourcedir -}/asm/des-586.pl {- $sourcetop -}/crypto/perlasm/x86asm.pl {- $sourcetop -}/crypto/perlasm/cbc.pl CC="$(CC)" $(PERL) {- $sourcedir -}/asm/des-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@ |