diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-03-07 15:47:35 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-09 11:09:26 +0100 |
| commit | 57c83b3c3a61796ecd0e2e87109176ac9f8eae30 (patch) | |
| tree | 9416f821092d1112bfe62202f94d6366f0b82084 /crypto/md5 | |
| parent | 4f0d5f1849fba056ae2e626dbce976efc4586383 (diff) | |
Unified - adapt the generation of md5 assembler to use GENERATE
This gets rid of the BEGINRAW..ENDRAW sections in crypto/md5/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/md5')
| -rw-r--r-- | crypto/md5/Makefile.in | 4 | ||||
| -rw-r--r-- | crypto/md5/asm/md5-586.pl | 5 | ||||
| -rw-r--r-- | crypto/md5/build.info | 12 |
3 files changed, 12 insertions, 9 deletions
diff --git a/crypto/md5/Makefile.in b/crypto/md5/Makefile.in index 625bdc8a10..7e13a0467d 100644 --- a/crypto/md5/Makefile.in +++ b/crypto/md5/Makefile.in @@ -40,10 +40,10 @@ lib: $(LIBOBJ) @touch lib md5-586.s: asm/md5-586.pl ../perlasm/x86asm.pl - $(PERL) asm/md5-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@ + $(PERL) asm/md5-586.pl $(PERLASM_SCHEME) $(CFLAGS) $@ md5-x86_64.s: asm/md5-x86_64.pl - $(PERL) asm/md5-x86_64.pl $(PERLASM_SCHEME) > $@ + $(PERL) asm/md5-x86_64.pl $(PERLASM_SCHEME) $@ md5-ia64.s: asm/md5-ia64.S $(CC) $(CFLAGS) -E asm/md5-ia64.S | \ diff --git a/crypto/md5/asm/md5-586.pl b/crypto/md5/asm/md5-586.pl index 4971357173..b3b756cf7d 100644 --- a/crypto/md5/asm/md5-586.pl +++ b/crypto/md5/asm/md5-586.pl @@ -11,6 +11,9 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; push(@INC,"${dir}","${dir}../../perlasm"); require "x86asm.pl"; +$output=pop; +open STDOUT,">$output"; + &asm_init($ARGV[0],$0); $A="eax"; @@ -33,6 +36,8 @@ $X="esi"; &md5_block("md5_block_asm_data_order"); &asm_finish(); +close STDOUT; + sub Np { local($p)=@_; diff --git a/crypto/md5/build.info b/crypto/md5/build.info index 6a04f37cfc..a10d582d1f 100644 --- a/crypto/md5/build.info +++ b/crypto/md5/build.info @@ -2,17 +2,15 @@ LIBS=../../libcrypto SOURCE[../../libcrypto]=\ md5_dgst.c md5_one.c {- $target{md5_asm_src} -} -BEGINRAW[Makefile] -{- $builddir -}/md5-586.s: {- $sourcedir -}/asm/md5-586.pl {- $sourcetop -}/crypto/perlasm/x86asm.pl - CC="$(CC)" $(PERL) {- $sourcedir -}/asm/md5-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@ +GENERATE[md5-586.s]=asm/md5-586.pl $(PERLASM_SCHEME) $(CFLAGS) + +GENERATE[md5-x86_64.s]=asm/md5-x86_64.pl $(PERLASM_SCHEME) -{- $builddir -}/md5-x86_64.s: {- $sourcedir -}/asm/md5-x86_64.pl - CC="$(CC)" $(PERL) {- $sourcedir -}/asm/md5-x86_64.pl $(PERLASM_SCHEME) > $@ +GENERATE[md5-sparcv9.S]=asm/md5-sparcv9.pl $(PERLASM_SCHEME) +BEGINRAW[Makefile] {- $builddir -}/md5-ia64.s: {- $sourcedir -}/asm/md5-ia64.S $(CC) $(CFLAGS) -E {- $sourcedir -}/asm/md5-ia64.S | \ $(PERL) -ne 's/;\s+/;\n/g; print;' > $@ -{- $builddir -}/md5-sparcv9.S: {- $sourcedir -}/asm/md5-sparcv9.pl - CC="$(CC)" $(PERL) {- $sourcedir -}/asm/md5-sparcv9.pl $(PERLASM_SCHEME) $@ ENDRAW[Makefile] |