diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-03-07 15:47:57 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-09 11:09:26 +0100 |
| commit | 4f0d5f1849fba056ae2e626dbce976efc4586383 (patch) | |
| tree | bfb94e591bb44cd693b58ea3376f9abdd8d9f836 /crypto/modes/build.info | |
| parent | Unified - adapt the generation of poly1305 assembler to use GENERATE (diff) | |
| download | openssl-4f0d5f1849fba056ae2e626dbce976efc4586383.tar.xz openssl-4f0d5f1849fba056ae2e626dbce976efc4586383.zip | |
Unified - adapt the generation of modes assembler to use GENERATE
This gets rid of the BEGINRAW..ENDRAW sections in crypto/modes/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/modes/build.info')
| -rw-r--r-- | crypto/modes/build.info | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/crypto/modes/build.info b/crypto/modes/build.info index dfce733cd3..b59780f8d8 100644 --- a/crypto/modes/build.info +++ b/crypto/modes/build.info @@ -4,28 +4,17 @@ SOURCE[../../libcrypto]=\ ccm128.c xts128.c wrap128.c ocb128.c \ {- $target{modes_asm_src} -} -BEGINRAW[Makefile] -{- $builddir -}/ghash-ia64.s: {- $sourcedir -}/asm/ghash-ia64.pl - CC="$(CC)" $(PERL) {- $sourcedir -}/asm/ghash-ia64.pl $@ $(CFLAGS) -{- $builddir -}/ghash-x86.s: {- $sourcedir -}/asm/ghash-x86.pl - CC="$(CC)" $(PERL) {- $sourcedir -}/asm/ghash-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ -{- $builddir -}/ghash-x86_64.s: {- $sourcedir -}/asm/ghash-x86_64.pl - CC="$(CC)" $(PERL) {- $sourcedir -}/asm/ghash-x86_64.pl $(PERLASM_SCHEME) > $@ -{- $builddir -}/aesni-gcm-x86_64.s: {- $sourcedir -}/asm/aesni-gcm-x86_64.pl - CC="$(CC)" $(PERL) {- $sourcedir -}/asm/aesni-gcm-x86_64.pl $(PERLASM_SCHEME) > $@ -{- $builddir -}/ghash-sparcv9.S: {- $sourcedir -}/asm/ghash-sparcv9.pl - CC="$(CC)" $(PERL) {- $sourcedir -}/asm/ghash-sparcv9.pl $(PERLASM_SCHEME) $@ -{- $builddir -}/ghash-alpha.s: {- $sourcedir -}/asm/ghash-alpha.pl - (preproc=$$$$.$@.S; trap "rm $$preproc" INT; \ - CC="$(CC)" $(PERL) {- $sourcedir -}/asm/ghash-alpha.pl > $$preproc && \ - $(CC) -E -P $$preproc > $@ && rm $$preproc) -{- $builddir -}/ghash-parisc.s: {- $sourcedir -}/asm/ghash-parisc.pl - CC="$(CC)" $(PERL) {- $sourcedir -}/asm/ghash-parisc.pl $(PERLASM_SCHEME) $@ -{- $builddir -}/ghashv8-armx.S: {- $sourcedir -}/asm/ghashv8-armx.pl - CC="$(CC)" $(PERL) {- $sourcedir -}/asm/ghashv8-armx.pl $(PERLASM_SCHEME) $@ -{- $builddir -}/ghashp8-ppc.s: {- $sourcedir -}/asm/ghashp8-ppc.pl - CC="$(CC)" $(PERL) {- $sourcedir -}/asm/ghashp8-ppc.pl $(PERLASM_SCHEME) $@ +GENERATE[ghash-ia64.s]=asm/ghash-ia64.pl $(CFLAGS) +GENERATE[ghash-x86.s]=asm/ghash-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) +GENERATE[ghash-x86_64.s]=asm/ghash-x86_64.pl $(PERLASM_SCHEME) +GENERATE[aesni-gcm-x86_64.s]=asm/aesni-gcm-x86_64.pl $(PERLASM_SCHEME) +GENERATE[ghash-sparcv9.S]=asm/ghash-sparcv9.pl $(PERLASM_SCHEME) +GENERATE[ghash-alpha.s]=asm/ghash-alpha.pl +GENERATE[ghash-parisc.s]=asm/ghash-parisc.pl $(PERLASM_SCHEME) +GENERATE[ghashv8-armx.S]=asm/ghashv8-armx.pl $(PERLASM_SCHEME) +GENERATE[ghashp8-ppc.s]=asm/ghashp8-ppc.pl $(PERLASM_SCHEME) +BEGINRAW[Makefile] # GNU make "catch all" {- $builddir -}/ghash-%.S: {- $sourcedir -}/asm/ghash-%.pl CC="$(CC)" $(PERL) $< $(PERLASM_SCHEME) $@ |