Commit fe7f8263 authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarAndy Polyakov <appro@openssl.org>
parent 57c83b3c

crypto/ripemd/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -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

crypto/ripemd/asm/rmd-586.pl

+5 −0
Original line number Diff line number Diff line
@@ -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)=@_;

crypto/ripemd/build.info

+2 −6
Original line number Diff line number Diff line
@@ -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