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

Unified - adapt the generation of cast assembler to use GENERATE

This gets rid of the BEGINRAW..ENDRAW sections in crypto/cast/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>
上级 df0cb57c
...@@ -40,7 +40,7 @@ lib: $(LIBOBJ) ...@@ -40,7 +40,7 @@ lib: $(LIBOBJ)
@touch lib @touch lib
cast-586.s: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl cast-586.s: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
$(PERL) asm/cast-586.pl $(PERLASM_SCHEME) $(CLAGS) $(PROCESSOR) > $@ $(PERL) asm/cast-586.pl $(PERLASM_SCHEME) $(CLAGS) $(PROCESSOR) $@
files: files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
......
...@@ -11,6 +11,9 @@ push(@INC,"${dir}","${dir}../../perlasm"); ...@@ -11,6 +11,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],"cast-586.pl",$ARGV[$#ARGV] eq "386"); &asm_init($ARGV[0],"cast-586.pl",$ARGV[$#ARGV] eq "386");
$CAST_ROUNDS=16; $CAST_ROUNDS=16;
...@@ -36,6 +39,8 @@ $S4="CAST_S_table3"; ...@@ -36,6 +39,8 @@ $S4="CAST_S_table3";
&asm_finish(); &asm_finish();
close STDOUT;
sub CAST_encrypt { sub CAST_encrypt {
local($name,$enc)=@_; local($name,$enc)=@_;
......
...@@ -2,9 +2,5 @@ LIBS=../../libcrypto ...@@ -2,9 +2,5 @@ LIBS=../../libcrypto
SOURCE[../../libcrypto]=\ SOURCE[../../libcrypto]=\
c_skey.c c_ecb.c {- $target{cast_asm_src} -} c_cfb64.c c_ofb64.c c_skey.c c_ecb.c {- $target{cast_asm_src} -} c_cfb64.c c_ofb64.c
BEGINRAW[Makefile] GENERATE[cast-586.s]=asm/cast-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR)
##### CAST assembler implementations DEPEND[cast-586.s]=../perlasm/x86asm.pl ../perlasm/cbc.pl
{- $builddir -}/cast-586.s: {- $sourcedir -}/asm/cast-586.pl {- $sourcetop -}/crypto/perlasm/x86asm.pl {- $sourcetop -}/crypto/perlasm/cbc.pl
CC="$(CC)" $(PERL) {- $sourcedir -}/asm/cast-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
ENDRAW[Makefile]
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册