提交 ac9888e5 编写于 作者: R Richard Levitte

Unified - adapt the generation of rc5 assembler to use GENERATE

This gets rid of the BEGINRAW..ENDRAW sections in crypto/rc5/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>
上级 fe7f8263
...@@ -40,7 +40,7 @@ lib: $(LIBOBJ) ...@@ -40,7 +40,7 @@ lib: $(LIBOBJ)
@touch lib @touch lib
rc5-586.s: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl rc5-586.s: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
$(PERL) asm/rc5-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@ $(PERL) asm/rc5-586.pl $(PERLASM_SCHEME) $(CFLAGS) $@
files: files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
......
...@@ -5,6 +5,9 @@ push(@INC,"${dir}","${dir}../../perlasm"); ...@@ -5,6 +5,9 @@ push(@INC,"${dir}","${dir}../../perlasm");
require "x86asm.pl"; require "x86asm.pl";
require "cbc.pl"; require "cbc.pl";
$output = pop;
open STDOUT,">$output";
&asm_init($ARGV[0],"rc5-586.pl"); &asm_init($ARGV[0],"rc5-586.pl");
$RC5_MAX_ROUNDS=16; $RC5_MAX_ROUNDS=16;
...@@ -22,6 +25,8 @@ $tmp4="edx"; ...@@ -22,6 +25,8 @@ $tmp4="edx";
&cbc("RC5_32_cbc_encrypt","RC5_32_encrypt","RC5_32_decrypt",0,4,5,3,-1,-1); &cbc("RC5_32_cbc_encrypt","RC5_32_encrypt","RC5_32_decrypt",0,4,5,3,-1,-1);
&asm_finish(); &asm_finish();
close STDOUT;
sub RC5_32_encrypt sub RC5_32_encrypt
{ {
local($name,$enc)=@_; local($name,$enc)=@_;
......
...@@ -2,9 +2,5 @@ LIBS=../../libcrypto ...@@ -2,9 +2,5 @@ LIBS=../../libcrypto
SOURCE[../../libcrypto]=\ SOURCE[../../libcrypto]=\
rc5_skey.c rc5_ecb.c {- $target{rc5_asm_src} -} rc5cfb64.c rc5ofb64.c rc5_skey.c rc5_ecb.c {- $target{rc5_asm_src} -} rc5cfb64.c rc5ofb64.c
BEGINRAW[Makefile] GENERATE[rc5-586.s]=asm/rc5-586.pl $(PERLASM_SCHEME) $(CFLAGS)
##### RC5 assembler implementations DEPEND[rc5-586.s]=../perlasm/x86asm.pl ../perlasm/cbc.pl
{- $builddir -}/rc5-586.s: {- $sourcedir -}/asm/rc5-586.pl {- $sourcetop -}/crypto/perlasm/x86asm.pl {- $sourcetop -}/crypto/perlasm/cbc.pl
CC="$(CC)" $(PERL) {- $sourcedir -}/asm/rc5-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@
ENDRAW[Makefile]
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册