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

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

crypto/cast/Makefile.in

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

crypto/cast/asm/cast-586.pl

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

crypto/cast/build.info

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