diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-03-07 15:48:49 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-09 11:09:26 +0100 |
| commit | 3c9d51ce8ba51a8ef7b58f1f07c8d9c9df2ca665 (patch) | |
| tree | beeff003f5b078938999746e13f1d6eb7015c8a0 /crypto/rc4 | |
| parent | ac9888e5a9cc7b581323614c615b669f655512a1 (diff) | |
Unified - adapt the generation of rc4 assembler to use GENERATE
This gets rid of the BEGINRAW..ENDRAW sections in crypto/rc4/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/rc4')
| -rw-r--r-- | crypto/rc4/Makefile.in | 8 | ||||
| -rw-r--r-- | crypto/rc4/asm/rc4-586.pl | 4 | ||||
| -rw-r--r-- | crypto/rc4/asm/rc4-ia64.pl | 5 | ||||
| -rw-r--r-- | crypto/rc4/build.info | 18 |
4 files changed, 20 insertions, 15 deletions
diff --git a/crypto/rc4/Makefile.in b/crypto/rc4/Makefile.in index fe2ef7d6c5..00e39ecb36 100644 --- a/crypto/rc4/Makefile.in +++ b/crypto/rc4/Makefile.in @@ -39,15 +39,15 @@ lib: $(LIBOBJ) @touch lib rc4-586.s: asm/rc4-586.pl ../perlasm/x86asm.pl - $(PERL) asm/rc4-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ + $(PERL) asm/rc4-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) $@ rc4-x86_64.s: asm/rc4-x86_64.pl - $(PERL) asm/rc4-x86_64.pl $(PERLASM_SCHEME) > $@ + $(PERL) asm/rc4-x86_64.pl $(PERLASM_SCHEME) $@ rc4-md5-x86_64.s: asm/rc4-md5-x86_64.pl - $(PERL) asm/rc4-md5-x86_64.pl $(PERLASM_SCHEME) > $@ + $(PERL) asm/rc4-md5-x86_64.pl $(PERLASM_SCHEME) $@ rc4-ia64.S: asm/rc4-ia64.pl - $(PERL) asm/rc4-ia64.pl $(CFLAGS) > $@ + $(PERL) asm/rc4-ia64.pl $(CFLAGS) $@ rc4-parisc.s: asm/rc4-parisc.pl $(PERL) asm/rc4-parisc.pl $(PERLASM_SCHEME) $@ diff --git a/crypto/rc4/asm/rc4-586.pl b/crypto/rc4/asm/rc4-586.pl index d04e1771f6..a517adb735 100644 --- a/crypto/rc4/asm/rc4-586.pl +++ b/crypto/rc4/asm/rc4-586.pl @@ -63,6 +63,9 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; push(@INC,"${dir}","${dir}../../perlasm"); require "x86asm.pl"; +$output=pop; +open STDOUT,">$output"; + &asm_init($ARGV[0],"rc4-586.pl",$x86only = $ARGV[$#ARGV] eq "386"); $xx="eax"; @@ -415,3 +418,4 @@ $idx="edx"; &asm_finish(); +close STDOUT; diff --git a/crypto/rc4/asm/rc4-ia64.pl b/crypto/rc4/asm/rc4-ia64.pl index 49cd5b5e69..b83e53a605 100644 --- a/crypto/rc4/asm/rc4-ia64.pl +++ b/crypto/rc4/asm/rc4-ia64.pl @@ -164,6 +164,9 @@ # random input data). # +$output = pop; +open STDOUT,">$output"; + $phases = 4; # number of stages/phases in the pipelined-loop $unroll_count = 6; # number of times we unrolled it $pComI = (1 << 0); @@ -753,3 +756,5 @@ $code.=<<___; ___ print $code; + +close STDOUT; diff --git a/crypto/rc4/build.info b/crypto/rc4/build.info index 8d63bab70c..b682903aa3 100644 --- a/crypto/rc4/build.info +++ b/crypto/rc4/build.info @@ -2,21 +2,17 @@ LIBS=../../libcrypto SOURCE[../../libcrypto]=\ {- $target{rc4_asm_src} -} -BEGINRAW[Makefile] -{- $builddir -}/rc4-586.s: {- $sourcedir -}/asm/rc4-586.pl {- $sourcetop -}/crypto/perlasm/x86asm.pl - CC="$(CC)" $(PERL) {- $sourcedir -}/asm/rc4-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ +GENERATE[rc4-586.s]=asm/rc4-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) +DEPEND[rc4-586.s]=../perlasm/x86asm.pl -{- $builddir -}/rc4-x86_64.s: {- $sourcedir -}/asm/rc4-x86_64.pl - CC="$(CC)" $(PERL) {- $sourcedir -}/asm/rc4-x86_64.pl $(PERLASM_SCHEME) > $@ -{- $builddir -}/rc4-md5-x86_64.s: {- $sourcedir -}/asm/rc4-md5-x86_64.pl - CC="$(CC)" $(PERL) {- $sourcedir -}/asm/rc4-md5-x86_64.pl $(PERLASM_SCHEME) > $@ +GENERATE[rc4-x86_64.s]=asm/rc4-x86_64.pl $(PERLASM_SCHEME) +GENERATE[rc4-md5-x86_64.s]=asm/rc4-md5-x86_64.pl $(PERLASM_SCHEME) -{- $builddir -}/rc4-ia64.S: {- $sourcedir -}/asm/rc4-ia64.pl - CC="$(CC)" $(PERL) {- $sourcedir -}/asm/rc4-ia64.pl $(CFLAGS) > $@ +GENERATE[rc4-ia64.S]=asm/rc4-ia64.pl $(CFLAGS) -{- $builddir -}/rc4-parisc.s: {- $sourcedir -}/asm/rc4-parisc.pl - CC="$(CC)" $(PERL) {- $sourcedir -}/asm/rc4-parisc.pl $(PERLASM_SCHEME) $@ +GENERATE[rc4-parisc.s]=asm/rc4-parisc.pl $(PERLASM_SCHEME) +BEGINRAW[Makefile] {- $builddir -}/rc4-ia64.s: rc4-ia64.S @case `awk '/^#define RC4_INT/{print$$NF}' $(SRCDIR)/include/openssl/opensslconf.h` in \ int) set -x; $(CC) $(CFLAGS) -DSZ=4 -E rc4-ia64.S > $@ ;; \ |