From d62d17b9c0d8f40beaf4e168c08f18cd8bcda79b Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 7 Mar 2016 15:50:52 +0100 Subject: 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 --- engines/Makefile.in | 4 ++-- engines/build.info | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/engines/Makefile.in b/engines/Makefile.in index 1645ad5..cc61427 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 b401ab0..c8fba26 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) -- cgit v1.1