diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-03-07 15:43:26 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-09 11:09:26 +0100 |
| commit | 5384d1e4ebd58f31a06b2f5d1f6c4b28f63d72ed (patch) | |
| tree | e03ea87bd6f7c9843e630e55f6985b3d0fb9162d /crypto/camellia | |
| parent | db1983980b1a8978f65ce631aae48b5769a803c6 (diff) | |
Unified - adapt the generation of camellia assembler to use GENERATE
This gets rid of the BEGINRAW..ENDRAW sections in crypto/camellia/build.info.
This also moves the assembler generating perl scripts to take the
output file name as last command line argument, where necessary.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'crypto/camellia')
| -rw-r--r-- | crypto/camellia/Makefile.in | 4 | ||||
| -rw-r--r-- | crypto/camellia/asm/cmll-x86.pl | 5 | ||||
| -rw-r--r-- | crypto/camellia/build.info | 13 |
3 files changed, 12 insertions, 10 deletions
diff --git a/crypto/camellia/Makefile.in b/crypto/camellia/Makefile.in index e32a73be64..e809152490 100644 --- a/crypto/camellia/Makefile.in +++ b/crypto/camellia/Makefile.in @@ -42,9 +42,9 @@ lib: $(LIBOBJ) @touch lib cmll-x86.s: asm/cmll-x86.pl ../perlasm/x86asm.pl - $(PERL) asm/cmll-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ + $(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) > $@ + $(PERL) asm/cmll-x86_64.pl $(PERLASM_SCHEME) $@ cmllt4-sparcv9.S: asm/cmllt4-sparcv9.pl ../perlasm/sparcv9_modes.pl $(PERL) asm/cmllt4-sparcv9.pl $(PERLASM_SCHEME) $@ diff --git a/crypto/camellia/asm/cmll-x86.pl b/crypto/camellia/asm/cmll-x86.pl index 027302ac86..de354aa2e5 100644 --- a/crypto/camellia/asm/cmll-x86.pl +++ b/crypto/camellia/asm/cmll-x86.pl @@ -42,6 +42,9 @@ require "x86asm.pl"; $OPENSSL=1; +$output = pop; +open STDOUT,">$output"; + &asm_init($ARGV[0],"cmll-586.pl",$ARGV[$#ARGV] eq "386"); @T=("eax","ebx","ecx","edx"); @@ -1136,3 +1139,5 @@ my ($s0,$s1,$s2,$s3) = @T; &asciz("Camellia for x86 by <appro\@openssl.org>"); &asm_finish(); + +close STDOUT; diff --git a/crypto/camellia/build.info b/crypto/camellia/build.info index b5c1114bac..6f50b24186 100644 --- a/crypto/camellia/build.info +++ b/crypto/camellia/build.info @@ -3,11 +3,8 @@ SOURCE[../../libcrypto]=\ cmll_ecb.c cmll_ofb.c cmll_cfb.c cmll_ctr.c \ {- $target{cmll_asm_src} -} -BEGINRAW[Makefile] -{- $builddir -}/cmll-x86.s: {- $sourcedir -}/asm/cmll-x86.pl {- $sourcetop -}/crypto/perlasm/x86asm.pl - 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 $(PERLASM_SCHEME) $@ -ENDRAW[Makefile] +GENERATE[cmll-x86.s]=asm/cmll-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) +DEPEND[cmll-x86.s]=../perlasm/x86asm.pl +GENERATE[cmll-x86_64.s]=asm/cmll-x86_64.pl $(PERLASM_SCHEME) +GENERATE[cmllt4-sparcv9.S]=asm/cmllt4-sparcv9.pl $(PERLASM_SCHEME) +DEPEND[cmllt4-sparcv9.S]=../perlasm/sparcv9-modes.pl |