diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-03-07 15:00:45 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-09 11:09:26 +0100 |
| commit | 0a4edb931b883b9973721ae012e60c028387dd50 (patch) | |
| tree | 730cc054212d09f0de3637da7c800650b96bed04 /crypto/build.info | |
| parent | 184bc45f683c76531d7e065b6553ca9086564576 (diff) | |
| download | openssl-0a4edb931b883b9973721ae012e60c028387dd50.zip openssl-0a4edb931b883b9973721ae012e60c028387dd50.tar.gz openssl-0a4edb931b883b9973721ae012e60c028387dd50.tar.bz2 | |
Unified - adapt the generation of cpuid, uplink and buildinf to use GENERATE
This gets rid of the BEGINRAW..ENDRAW sections in crypto/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>
Diffstat (limited to 'crypto/build.info')
| -rw-r--r-- | crypto/build.info | 43 |
1 files changed, 12 insertions, 31 deletions
diff --git a/crypto/build.info b/crypto/build.info index 471a9fd..01d3766 100644 --- a/crypto/build.info +++ b/crypto/build.info @@ -11,38 +11,19 @@ EXTRA= ../ms/uplink-x86.pl ../ms/uplink.c ../ms/applink.c \ ppccpuid.pl pariscid.pl alphacpuid.pl arm64cpuid.pl armv4cpuid.pl DEPEND[cversion.o]=buildinf.h +GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(CFLAGS_Q)" "$(PLATFORM)" +DEPEND[buildinf.h]=configdata.pm -BEGINRAW[descrip.mms] -[.crypto]buildinf.h : configdata.pm - $(PERL) {- catfile(catdir($sourcedir, "[-]"), "util", "mkbuildinf.pl") -} "$(CC) $(CFLAGS)" "$(PLATFORM)" > [.crypto]buildinf.h -ENDRAW[descrip.mms] +GENERATE[uplink-x86.s]=../ms/uplink-x86.pl $(PERLASM_SCHEME) -BEGINRAW[Makefile] -crypto/buildinf.h : configdata.pm - $(PERL) $(SRCDIR)/util/mkbuildinf.pl "$(CC) $(CFLAGS_Q)" "$(PLATFORM)" > crypto/buildinf.h +GENERATE[x86cpuid.s]=x86cpuid.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) +DEPEND[x86cpuid.s]=perlasm/x86asm.pl -##### APPLINK, UPLINK and CPUID assembler implementations +GENERATE[x86_64cpuid.s]=x86_64cpuid.pl $(PERLASM_SCHEME) -{- $builddir -}/uplink-x86.s: $(SRCDIR)/ms/uplink-x86.pl - CC="$(CC)" $(PERL) $(SRCDIR)/ms/uplink-x86.pl $(PERLASM_SCHEME) > $@ - -{- $builddir -}/x86cpuid.s: {- $sourcedir -}/x86cpuid.pl {- $sourcedir -}/perlasm/x86asm.pl - CC="$(CC)" $(PERL) {- $sourcedir -}/x86cpuid.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ - -{- $builddir -}/x86_64cpuid.s: {- $sourcedir -}/x86_64cpuid.pl - CC="$(CC)" $(PERL) {- $sourcedir -}/x86_64cpuid.pl $(PERLASM_SCHEME) > $@ -{- $builddir -}/ia64cpuid.s: {- $sourcedir -}/ia64cpuid.S - $(CC) $(CFLAGS) -E {- $sourcedir -}/ia64cpuid.S > $@ -{- $builddir -}/ppccpuid.s: {- $sourcedir -}/ppccpuid.pl - CC="$(CC)" $(PERL) {- $sourcedir -}/ppccpuid.pl $(PERLASM_SCHEME) $@ -{- $builddir -}/pariscid.s: {- $sourcedir -}/pariscid.pl - CC="$(CC)" $(PERL) {- $sourcedir -}/pariscid.pl $(PERLASM_SCHEME) $@ -{- $builddir -}/alphacpuid.s: {- $sourcedir -}/alphacpuid.pl - (preproc=$$$$.$@.S; trap "rm $$preproc" INT; \ - CC="$(CC)" $(PERL) {- $sourcedir -}/alphacpuid.pl > $$preproc && \ - $(CC) -E -P $$preproc > $@ && rm $$preproc) -{- $builddir -}/arm64cpuid.S: {- $sourcedir -}/arm64cpuid.pl - CC="$(CC)" $(PERL) {- $sourcedir -}/arm64cpuid.pl $(PERLASM_SCHEME) > $@ -{- $builddir -}/armv4cpuid.S: {- $sourcedir -}/armv4cpuid.pl - CC="$(CC)" $(PERL) {- $sourcedir -}/armv4cpuid.pl $(PERLASM_SCHEME) > $@ -ENDRAW[Makefile] +GENERATE[ia64cpuid.s]=ia64cpuid.S +GENERATE[ppccpuid.s]=ppccpuid.pl $(PERLASM_SCHEM +GENERATE[pariscid.s]=pariscid.pl $(PERLASM_SCHEM +GENERATE[alphacpuid.s]=alphacpuid.pl +GENERATE[arm64cpuid.S]=arm64cpuid.pl $(PERLASM_SCHEME) +GENERATE[armv4cpuid.S]=armv4cpuid.pl $(PERLASM_SCHEME) |