From: Richard Levitte <levitte@openssl.org>
Date: Mon, 7 Mar 2016 14:50:52 +0000 (+0100)
Subject: Unified - adapt the generation of padlock assembler to use GENERATE
X-Git-Tag: OpenSSL_1_1_0-pre4~313
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d62d17b9c0d8f40beaf4e168c08f18cd8bcda79b;p=oweals%2Fopenssl.git

Unified - adapt the generation of padlock assembler to use GENERATE

This gets rid of the BEGINRAW..ENDRAW sections in engines/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: Rich Salz <rsalz@openssl.org>
---

diff --git a/engines/Makefile.in b/engines/Makefile.in
index 1645ad5216..cc614278fc 100644
--- a/engines/Makefile.in
+++ b/engines/Makefile.in
@@ -72,9 +72,9 @@ lib:	$(LIBOBJ) $(TESTLIBOBJ)
 	touch lib
 
 e_padlock-x86.s:	asm/e_padlock-x86.pl
-	$(PERL) asm/e_padlock-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
+	$(PERL) asm/e_padlock-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) $@
 e_padlock-x86_64.s:	asm/e_padlock-x86_64.pl
-	$(PERL) asm/e_padlock-x86_64.pl $(PERLASM_SCHEME) > $@
+	$(PERL) asm/e_padlock-x86_64.pl $(PERLASM_SCHEME) $@
 
 subdirs:
 	@target=all; $(RECURSIVE_MAKE)
diff --git a/engines/build.info b/engines/build.info
index b401ab0e93..c8fba26296 100644
--- a/engines/build.info
+++ b/engines/build.info
@@ -21,9 +21,5 @@ ELSE
  INCLUDE[ossltest]={- rel2abs(catdir($builddir,"../include")) -} ../include
 ENDIF
 
-BEGINRAW[Makefile]
-{- $builddir -}/e_padlock-x86.s:	{- $sourcedir -}/asm/e_padlock-x86.pl
-	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/e_padlock-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
-{- $builddir -}/e_padlock-x86_64.s:	{- $sourcedir -}/asm/e_padlock-x86_64.pl
-	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/e_padlock-x86_64.pl $(PERLASM_SCHEME) > $@
-ENDRAW[Makefile]
+GENERATE[e_padlock-x86.s]=asm/e_padlock-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR)
+GENERATE[e_padlock-x86_64.s]=asm/e_padlock-x86_64.pl $(PERLASM_SCHEME)