root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Richard Levitte 2016-03-07 15:50:52 +01:00
parent 6bd7a4d96c
commit d62d17b9c0
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/Makefile.in
View File

@ -72,9 +72,9 @@ lib: $(LIBOBJ) $(TESTLIBOBJ)
touch lib touch lib
e_padlock-x86.s: asm/e_padlock-x86.pl 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 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: subdirs:
@target=all; $(RECURSIVE_MAKE) @target=all; $(RECURSIVE_MAKE)

8
engines/build.info
View File

@ -21,9 +21,5 @@ ELSE
INCLUDE[ossltest]={- rel2abs(catdir($builddir,"../include")) -} ../include INCLUDE[ossltest]={- rel2abs(catdir($builddir,"../include")) -} ../include
ENDIF ENDIF
BEGINRAW[Makefile] GENERATE[e_padlock-x86.s]=asm/e_padlock-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR)
{- $builddir -}/e_padlock-x86.s: {- $sourcedir -}/asm/e_padlock-x86.pl GENERATE[e_padlock-x86_64.s]=asm/e_padlock-x86_64.pl $(PERLASM_SCHEME)
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]