提交 81e61d7c 编写于 作者: R Richard Levitte

Unified - adapt the generation of whirlpool assembler to use GENERATE

This gets rid of the BEGINRAW..ENDRAW sections in crypto/whrlpool/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: NAndy Polyakov <appro@openssl.org>
上级 e87e380a
...@@ -40,10 +40,10 @@ lib: $(LIBOBJ) ...@@ -40,10 +40,10 @@ lib: $(LIBOBJ)
@touch lib @touch lib
wp-mmx.s: asm/wp-mmx.pl ../perlasm/x86asm.pl wp-mmx.s: asm/wp-mmx.pl ../perlasm/x86asm.pl
$(PERL) asm/wp-mmx.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ $(PERL) asm/wp-mmx.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) $@
wp-x86_64.s: asm/wp-x86_64.pl wp-x86_64.s: asm/wp-x86_64.pl
$(PERL) asm/wp-x86_64.pl $(PERLASM_SCHEME) > $@ $(PERL) asm/wp-x86_64.pl $(PERLASM_SCHEME) $@
$(LIBOBJ): $(LIBSRC) $(LIBOBJ): $(LIBSRC)
......
...@@ -49,6 +49,9 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; ...@@ -49,6 +49,9 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
push(@INC,"${dir}","${dir}../../perlasm"); push(@INC,"${dir}","${dir}../../perlasm");
require "x86asm.pl"; require "x86asm.pl";
$output=pop;
open STDOUT,">$output";
&asm_init($ARGV[0],"wp-mmx.pl"); &asm_init($ARGV[0],"wp-mmx.pl");
sub L() { &data_byte(@_); } sub L() { &data_byte(@_); }
...@@ -493,3 +496,5 @@ for($i=0;$i<8;$i++) { ...@@ -493,3 +496,5 @@ for($i=0;$i<8;$i++) {
&function_end_B("whirlpool_block_mmx"); &function_end_B("whirlpool_block_mmx");
&asm_finish(); &asm_finish();
close STDOUT;
LIBS=../../libcrypto LIBS=../../libcrypto
SOURCE[../../libcrypto]=wp_dgst.c {- $target{wp_asm_src} -} SOURCE[../../libcrypto]=wp_dgst.c {- $target{wp_asm_src} -}
BEGINRAW[Makefile] GENERATE[wp-mmx.s]=asm/wp-mmx.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR)
{- $builddir -}/wp-mmx.s: {- $sourcedir -}/asm/wp-mmx.pl {- $sourcetop -}/crypto/perlasm/x86asm.pl DEPEND[wp-mmx.s]=../perlasm/x86asm.pl
CC="$(CC)" $(PERL) {- $sourcedir -}/asm/wp-mmx.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
{- $builddir -}/wp-x86_64.s: {- $sourcedir -}/asm/wp-x86_64.pl GENERATE[wp-x86_64.s]=asm/wp-x86_64.pl $(PERLASM_SCHEME)
CC="$(CC)" $(PERL) {- $sourcedir -}/asm/wp-x86_64.pl $(PERLASM_SCHEME) > $@
ENDRAW[Makefile]
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册