Commit d62d17b9 authored Mar 07, 2016 by Richard Levitte

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>

parent 6bd7a4d9

engines/Makefile.in

+2 −2

Original line number	Diff line number	Diff line
		@@ -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)

engines/build.info

+2 −6

Original line number	Diff line number	Diff line
		@@ -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)