From db1983980b1a8978f65ce631aae48b5769a803c6 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 7 Mar 2016 15:45:39 +0100 Subject: [PATCH] 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: Andy Polyakov --- crypto/cast/Makefile.in | 2 +- crypto/cast/asm/cast-586.pl | 5 +++++ crypto/cast/build.info | 8 ++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/crypto/cast/Makefile.in b/crypto/cast/Makefile.in index 06f65e21aa..c43eecb5e5 100644 --- a/crypto/cast/Makefile.in +++ b/crypto/cast/Makefile.in @@ -40,7 +40,7 @@ lib: $(LIBOBJ) @touch lib 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: $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO diff --git a/crypto/cast/asm/cast-586.pl b/crypto/cast/asm/cast-586.pl index ec2eab179d..267d69976d 100644 --- a/crypto/cast/asm/cast-586.pl +++ b/crypto/cast/asm/cast-586.pl @@ -11,6 +11,9 @@ push(@INC,"${dir}","${dir}../../perlasm"); require "x86asm.pl"; require "cbc.pl"; +$output=pop; +open STDOUT,">$output"; + &asm_init($ARGV[0],"cast-586.pl",$ARGV[$#ARGV] eq "386"); $CAST_ROUNDS=16; @@ -36,6 +39,8 @@ $S4="CAST_S_table3"; &asm_finish(); +close STDOUT; + sub CAST_encrypt { local($name,$enc)=@_; diff --git a/crypto/cast/build.info b/crypto/cast/build.info index 84c100e1d3..20b6f6c9f4 100644 --- a/crypto/cast/build.info +++ b/crypto/cast/build.info @@ -2,9 +2,5 @@ LIBS=../../libcrypto SOURCE[../../libcrypto]=\ c_skey.c c_ecb.c {- $target{cast_asm_src} -} c_cfb64.c c_ofb64.c -BEGINRAW[Makefile] -##### CAST assembler implementations - -{- $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] +GENERATE[cast-586.s]=asm/cast-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) +DEPEND[cast-586.s]=../perlasm/x86asm.pl ../perlasm/cbc.pl -- 2.25.1