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: Andy Polyakov <appro@openssl.org>

diff --git a/crypto/rc5/Makefile.in b/crypto/rc5/Makefile.in
index bd7a1c66135b2cae77442f2f230cfa926e1d3d82..501b118f7228631306800ddaeee3b285c1c1cf71 100644 (file)
--- a/crypto/rc5/Makefile.in
+++ b/crypto/rc5/Makefile.in
@@ -40,7 +40,7 @@ lib:  $(LIBOBJ)
        @touch lib
 
 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:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO

diff --git a/crypto/rc5/asm/rc5-586.pl b/crypto/rc5/asm/rc5-586.pl
index 61ac6effc69c01e73debe7667ce644e044c81469..a0d85f2ba95388c7288671838e56ee6b7951a9a6 100644 (file)
--- a/crypto/rc5/asm/rc5-586.pl
+++ b/crypto/rc5/asm/rc5-586.pl
@@ -5,6 +5,9 @@ push(@INC,"${dir}","${dir}../../perlasm");
 require "x86asm.pl";
 require "cbc.pl";
 
+$output = pop;
+open STDOUT,">$output";
+
 &asm_init($ARGV[0],"rc5-586.pl");
 
 $RC5_MAX_ROUNDS=16;
@@ -22,6 +25,8 @@ $tmp4="edx";
 &cbc("RC5_32_cbc_encrypt","RC5_32_encrypt","RC5_32_decrypt",0,4,5,3,-1,-1);
 &asm_finish();
 
+close STDOUT;
+
 sub RC5_32_encrypt
        {
        local($name,$enc)=@_;

diff --git a/crypto/rc5/build.info b/crypto/rc5/build.info
index 0cf704b856c85204624ec27066a4afd35b4627ac..bb6e5a5b2a7559f50ee12443fe0c3c210fe64551 100644 (file)
--- a/crypto/rc5/build.info
+++ b/crypto/rc5/build.info
@@ -2,9 +2,5 @@ LIBS=../../libcrypto
 SOURCE[../../libcrypto]=\
         rc5_skey.c rc5_ecb.c {- $target{rc5_asm_src} -} rc5cfb64.c rc5ofb64.c
 
-BEGINRAW[Makefile]
-##### RC5 assembler implementations
-
-{- $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]
+GENERATE[rc5-586.s]=asm/rc5-586.pl $(PERLASM_SCHEME) $(CFLAGS)
+DEPEND[rc5-586.s]=../perlasm/x86asm.pl ../perlasm/cbc.pl