Unified - adapt the generation of ripemd assembler to use GENERATE

This gets rid of the BEGINRAW..ENDRAW sections in crypto/ripemd/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>
This commit is contained in:
Richard Levitte 2016-03-07 15:49:34 +01:00
parent 57c83b3c3a
commit fe7f8263af
3 changed files with 8 additions and 7 deletions

View File

@ -40,7 +40,7 @@ lib: $(LIBOBJ)
@touch lib
rmd-586.s: asm/rmd-586.pl ../perlasm/x86asm.pl
$(PERL) asm/rmd-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@
$(PERL) asm/rmd-586.pl $(PERLASM_SCHEME) $(CFLAGS) $@
files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO

View File

@ -9,6 +9,9 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
push(@INC,"${dir}","${dir}../../perlasm");
require "x86asm.pl";
$output=pop;
open STDOUT,">$output";
&asm_init($ARGV[0],$0);
$A="ecx";
@ -60,6 +63,8 @@ $KR3=0x7A6D76E9;
&ripemd160_block("ripemd160_block_asm_data_order");
&asm_finish();
close STDOUT;
sub Xv
{
local($n)=@_;

View File

@ -2,9 +2,5 @@ LIBS=../../libcrypto
SOURCE[../../libcrypto]=\
rmd_dgst.c rmd_one.c {- $target{rmd160_asm_src} -}
BEGINRAW[Makefile]
##### RMD160 assembler implementations
{- $builddir -}/rmd-586.s: {- $sourcedir -}/asm/rmd-586.pl {- $sourcetop -}/crypto/perlasm/x86asm.pl
CC="$(CC)" $(PERL) {- $sourcedir -}/asm/rmd-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@
ENDRAW[Makefile]
GENERATE[rmd-586.s]=asm/rmd-586.pl $(PERLASM_SCHEME) $(CFLAGS)
DEPEND[rmd-586.s]=../perlasm/x86asm.pl