Add include directory options for assembler files that include from crypto/

Closes RT#4406

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/crypto/aes/build.info b/crypto/aes/build.info
index 3328abc25ab3076394052dec156b8d3c74da4eda..f7ab69e58d281b0dc96dde37bc80bc9b03f29940 100644 (file)
--- a/crypto/aes/build.info
+++ b/crypto/aes/build.info
@@ -21,7 +21,9 @@ GENERATE[aesni-sha256-x86_64.s]=asm/aesni-sha256-x86_64.pl $(PERLASM_SCHEME)
 GENERATE[aesni-mb-x86_64.s]=asm/aesni-mb-x86_64.pl $(PERLASM_SCHEME)
 
 GENERATE[aes-sparcv9.S]=asm/aes-sparcv9.pl $(PERLASM_SCHEME)
 GENERATE[aesni-mb-x86_64.s]=asm/aesni-mb-x86_64.pl $(PERLASM_SCHEME)
 
 GENERATE[aes-sparcv9.S]=asm/aes-sparcv9.pl $(PERLASM_SCHEME)

+INCLUDE[aes-sparcv9.o]=..

 GENERATE[aest4-sparcv9.S]=asm/aest4-sparcv9.pl $(PERLASM_SCHEME)
 GENERATE[aest4-sparcv9.S]=asm/aest4-sparcv9.pl $(PERLASM_SCHEME)

+INCLUDE[aest4-sparcv9.o]=..

 DEPEND[aest4-sparcv9.S]=../perlasm/sparcv9_modes.pl
 
 GENERATE[aes-ppc.s]=asm/aes-ppc.pl $(PERLASM_SCHEME)
 DEPEND[aest4-sparcv9.S]=../perlasm/sparcv9_modes.pl
 
 GENERATE[aes-ppc.s]=asm/aes-ppc.pl $(PERLASM_SCHEME)


@@ -33,6 +35,7 @@ GENERATE[aes-parisc.s]=asm/aes-parisc.pl $(PERLASM_SCHEME)
 GENERATE[aes-mips.S]=asm/aes-mips.pl $(PERLASM_SCHEME)
 
 GENERATE[aesv8-armx.S]=asm/aesv8-armx.pl $(PERLASM_SCHEME)
 GENERATE[aes-mips.S]=asm/aes-mips.pl $(PERLASM_SCHEME)
 
 GENERATE[aesv8-armx.S]=asm/aesv8-armx.pl $(PERLASM_SCHEME)

+INCLUDE[aesv8-armx.o]=..

 GENERATE[vpaes-armv8.S]=asm/vpaes-armv8.pl $(PERLASM_SCHEME)
 
 
 GENERATE[vpaes-armv8.S]=asm/vpaes-armv8.pl $(PERLASM_SCHEME)
 
 

diff --git a/crypto/bn/build.info b/crypto/bn/build.info
index 8e424945b9639ace3aa146cff7bba11d8f99d945..aac7ca06b5ab5153336d6a1073a6713c5beb5fa0 100644 (file)
--- a/crypto/bn/build.info
+++ b/crypto/bn/build.info
@@ -23,9 +23,13 @@ GENERATE[x86-gf2m.s]=asm/x86-gf2m.pl \
 DEPEND[x86-gf2m.s]=../perlasm/x86asm.pl
 
 GENERATE[sparcv9a-mont.S]=asm/sparcv9a-mont.pl $(PERLASM_SCHEME)
 DEPEND[x86-gf2m.s]=../perlasm/x86asm.pl
 
 GENERATE[sparcv9a-mont.S]=asm/sparcv9a-mont.pl $(PERLASM_SCHEME)

+INCLUDE[sparcv9a-mont.o]=..

 GENERATE[sparcv9-mont.S]=asm/sparcv9-mont.pl $(PERLASM_SCHEME)
 GENERATE[sparcv9-mont.S]=asm/sparcv9-mont.pl $(PERLASM_SCHEME)

+INCLUDE[sparcv9-mont.o]=..

 GENERATE[vis3-mont.S]=asm/vis3-mont.pl $(PERLASM_SCHEME)
 GENERATE[vis3-mont.S]=asm/vis3-mont.pl $(PERLASM_SCHEME)

+INCLUDE[vis3-mont.o]=..

 GENERATE[sparct4-mont.S]=asm/sparct4-mont.pl $(PERLASM_SCHEME)
 GENERATE[sparct4-mont.S]=asm/sparct4-mont.pl $(PERLASM_SCHEME)

+INCLUDE[sparct4-mont.o]=..

 GENERATE[sparcv9-gf2m.S]=asm/sparcv9-gf2m.pl $(PERLASM_SCHEME)
 
 GENERATE[bn-mips.s]=asm/mips.pl $(PERLASM_SCHEME)
 GENERATE[sparcv9-gf2m.S]=asm/sparcv9-gf2m.pl $(PERLASM_SCHEME)
 
 GENERATE[bn-mips.s]=asm/mips.pl $(PERLASM_SCHEME)


@@ -53,7 +57,9 @@ GENERATE[ppc64-mont.s]=asm/ppc64-mont.pl $(PERLASM_SCHEME)
 GENERATE[alpha-mont.s]=asm/alpha-mont.pl
 
 GENERATE[armv4-mont.S]=asm/armv4-mont.pl $(PERLASM_SCHEME)
 GENERATE[alpha-mont.s]=asm/alpha-mont.pl
 
 GENERATE[armv4-mont.S]=asm/armv4-mont.pl $(PERLASM_SCHEME)

+INCLUDE[armv4-mont.o]=..

 GENERATE[armv4-gf2m.S]=asm/armv4-gf2m.pl $(PERLASM_SCHEME)
 GENERATE[armv4-gf2m.S]=asm/armv4-gf2m.pl $(PERLASM_SCHEME)

+INCLUDE[armv4-gf2m.o]=..

 GENERATE[armv8-mont.S]=asm/armv8-mont.pl $(PERLASM_SCHEME)
 
 OVERRIDES=bn-mips3.o pa-risc2W.o pa-risc2.c
 GENERATE[armv8-mont.S]=asm/armv8-mont.pl $(PERLASM_SCHEME)
 
 OVERRIDES=bn-mips3.o pa-risc2W.o pa-risc2.c

diff --git a/crypto/camellia/build.info b/crypto/camellia/build.info
index 6f50b24186fe17f8b435c0f1ea66728325c54386..b9ad0590380461574bc0689680ea2489b1c1cce2 100644 (file)
--- a/crypto/camellia/build.info
+++ b/crypto/camellia/build.info
@@ -7,4 +7,5 @@ GENERATE[cmll-x86.s]=asm/cmll-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR)
 DEPEND[cmll-x86.s]=../perlasm/x86asm.pl
 GENERATE[cmll-x86_64.s]=asm/cmll-x86_64.pl $(PERLASM_SCHEME)
 GENERATE[cmllt4-sparcv9.S]=asm/cmllt4-sparcv9.pl $(PERLASM_SCHEME)
 DEPEND[cmll-x86.s]=../perlasm/x86asm.pl
 GENERATE[cmll-x86_64.s]=asm/cmll-x86_64.pl $(PERLASM_SCHEME)
 GENERATE[cmllt4-sparcv9.S]=asm/cmllt4-sparcv9.pl $(PERLASM_SCHEME)

+INCLUDE[cmllt4-sparcv9.o]=..

 DEPEND[cmllt4-sparcv9.S]=../perlasm/sparcv9-modes.pl
 DEPEND[cmllt4-sparcv9.S]=../perlasm/sparcv9-modes.pl

diff --git a/crypto/chacha/build.info b/crypto/chacha/build.info
index 3dd1f747a8688868236a1d7641d449fcb2d73b12..28c221f93d9e08575dc347039adb3d07c7ada209 100644 (file)
--- a/crypto/chacha/build.info
+++ b/crypto/chacha/build.info
@@ -11,3 +11,5 @@ BEGINRAW[Makefile(unix)]
 {- $builddir -}/chacha-%.S:    {- $sourcedir -}/asm/chacha-%.pl
        CC="$(CC)" $(PERL) $< $(PERLASM_SCHEME) $@
 ENDRAW[Makefile(unix)]
 {- $builddir -}/chacha-%.S:    {- $sourcedir -}/asm/chacha-%.pl
        CC="$(CC)" $(PERL) $< $(PERLASM_SCHEME) $@
 ENDRAW[Makefile(unix)]

+INCLUDE[chacha-armv4.o]=..
+INCLUDE[chacha-armv8.o]=..

diff --git a/crypto/des/build.info b/crypto/des/build.info
index ee2f67fa5248af2c056b3db134e66bf736b5891f..c422bbe5d763ff575a9db3000a4b996e43b65e06 100644 (file)
--- a/crypto/des/build.info
+++ b/crypto/des/build.info
@@ -10,9 +10,9 @@ SOURCE[../../libcrypto]=\
 
 GENERATE[des_enc-sparc.S]=asm/des_enc.m4
 GENERATE[dest4-sparcv9.S]=asm/dest4-sparcv9.pl $(PERLASM_SCHEME)
 
 GENERATE[des_enc-sparc.S]=asm/des_enc.m4
 GENERATE[dest4-sparcv9.S]=asm/dest4-sparcv9.pl $(PERLASM_SCHEME)

+INCLUDE[dest4-sparcv9.o]=..

 
 GENERATE[des-586.s]=asm/des-586.pl $(PERLASM_SCHEME) $(CFLAGS)
 DEPEND[des-586.s]=../perlasm/x86asm.pl ../perlasm/cbc.pl
 GENERATE[crypt586.s]=asm/crypt586.pl $(PERLASM_SCHEME) $(CFLAGS)
 DEPEND[crypt586.s]=../perlasm/x86asm.pl ../perlasm/cbc.pl
 
 GENERATE[des-586.s]=asm/des-586.pl $(PERLASM_SCHEME) $(CFLAGS)
 DEPEND[des-586.s]=../perlasm/x86asm.pl ../perlasm/cbc.pl
 GENERATE[crypt586.s]=asm/crypt586.pl $(PERLASM_SCHEME) $(CFLAGS)
 DEPEND[crypt586.s]=../perlasm/x86asm.pl ../perlasm/cbc.pl

-

diff --git a/crypto/ec/build.info b/crypto/ec/build.info
index e8588a11c1312e3986df053b94ed24fc34f15364..0290141df02014edf0626bea8f98fbabedf111cf 100644 (file)
--- a/crypto/ec/build.info
+++ b/crypto/ec/build.info
@@ -15,8 +15,12 @@ GENERATE[ecp_nistz256-x86_64.s]=asm/ecp_nistz256-x86_64.pl $(PERLASM_SCHEME)
 GENERATE[ecp_nistz256-avx2.s]=asm/ecp_nistz256-avx2.pl $(PERLASM_SCHEME)
 
 GENERATE[ecp_nistz256-sparcv9.S]=asm/ecp_nistz256-sparcv9.pl $(PERLASM_SCHEME)
 GENERATE[ecp_nistz256-avx2.s]=asm/ecp_nistz256-avx2.pl $(PERLASM_SCHEME)
 
 GENERATE[ecp_nistz256-sparcv9.S]=asm/ecp_nistz256-sparcv9.pl $(PERLASM_SCHEME)

+INCLUDE[ecp_nistz256-sparcv9.o]=..

 
 BEGINRAW[Makefile]
 {- $builddir -}/ecp_nistz256-%.S:      {- $sourcedir -}/asm/ecp_nistz256-%.pl
        CC="$(CC)" $(PERL) $< $(PERLASM_SCHEME) $@
 ENDRAW[Makefile]
 
 BEGINRAW[Makefile]
 {- $builddir -}/ecp_nistz256-%.S:      {- $sourcedir -}/asm/ecp_nistz256-%.pl
        CC="$(CC)" $(PERL) $< $(PERLASM_SCHEME) $@
 ENDRAW[Makefile]

+
+INCLUDE[ecp_nistz256-armv4.o]=..
+INCLUDE[ecp_nistz256-armv8.o]=..

diff --git a/crypto/md5/build.info b/crypto/md5/build.info
index a10d582d1ff24e353fbf356acd3a03ced8847cb6..bea4f567f13aed42509d4cda25fd41929a8b04fa 100644 (file)
--- a/crypto/md5/build.info
+++ b/crypto/md5/build.info
@@ -7,6 +7,7 @@ GENERATE[md5-586.s]=asm/md5-586.pl $(PERLASM_SCHEME) $(CFLAGS)
 GENERATE[md5-x86_64.s]=asm/md5-x86_64.pl $(PERLASM_SCHEME)
 
 GENERATE[md5-sparcv9.S]=asm/md5-sparcv9.pl $(PERLASM_SCHEME)
 GENERATE[md5-x86_64.s]=asm/md5-x86_64.pl $(PERLASM_SCHEME)
 
 GENERATE[md5-sparcv9.S]=asm/md5-sparcv9.pl $(PERLASM_SCHEME)

+INCLUDE[md5-sparcv9.o]=..

 
 BEGINRAW[Makefile]
 {- $builddir -}/md5-ia64.s: {- $sourcedir -}/asm/md5-ia64.S
 
 BEGINRAW[Makefile]
 {- $builddir -}/md5-ia64.s: {- $sourcedir -}/asm/md5-ia64.S

diff --git a/crypto/modes/build.info b/crypto/modes/build.info
index d1b7d2bf630950a804c171fcb5e58f5e897870e3..b20154da17e6450f8c0d244f1b444f42080a9383 100644 (file)
--- a/crypto/modes/build.info
+++ b/crypto/modes/build.info
@@ -11,6 +11,7 @@ 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-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)

+INCLUDE[ghash-sparcv9.o]=..

 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[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)


@@ -21,3 +22,5 @@ BEGINRAW[Makefile]
 {- $builddir -}/ghash-%.S:     {- $sourcedir -}/asm/ghash-%.pl
        CC="$(CC)" $(PERL) $< $(PERLASM_SCHEME) $@
 ENDRAW[Makefile]
 {- $builddir -}/ghash-%.S:     {- $sourcedir -}/asm/ghash-%.pl
        CC="$(CC)" $(PERL) $< $(PERLASM_SCHEME) $@
 ENDRAW[Makefile]

+INCLUDE[ghash-armv4.o]=..
+INCLUDE[ghashv8-armx.o]=..

diff --git a/crypto/poly1305/build.info b/crypto/poly1305/build.info
index 5b548e62940fb60d7ed51a1e52af6305bd96fae5..d5d72ecb38a9b2cf30cc780e5e6bc3b4ae6fddc0 100644 (file)
--- a/crypto/poly1305/build.info
+++ b/crypto/poly1305/build.info
@@ -3,6 +3,7 @@ SOURCE[../../libcrypto]=\
         poly1305.c {- $target{poly1305_asm_src} -}
 
 GENERATE[poly1305-sparcv9.S]=asm/poly1305-sparcv9.pl $(PERLASM_SCHEME)
         poly1305.c {- $target{poly1305_asm_src} -}
 
 GENERATE[poly1305-sparcv9.S]=asm/poly1305-sparcv9.pl $(PERLASM_SCHEME)

+INCLUDE[poly1305-sparcv9.o]=..

 GENERATE[poly1305-x86.s]=asm/poly1305-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR)
 GENERATE[poly1305-x86_64.s]=asm/poly1305-x86_64.pl $(PERLASM_SCHEME)
 GENERATE[poly1305-ppc.s]=asm/poly1305-ppc.pl $(PERLASM_SCHEME)
 GENERATE[poly1305-x86.s]=asm/poly1305-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR)
 GENERATE[poly1305-x86_64.s]=asm/poly1305-x86_64.pl $(PERLASM_SCHEME)
 GENERATE[poly1305-ppc.s]=asm/poly1305-ppc.pl $(PERLASM_SCHEME)


@@ -12,3 +13,5 @@ BEGINRAW[Makefile(unix)]
 {- $builddir -}/poly1305-%.S:  {- $sourcedir -}/asm/poly1305-%.pl
        CC="$(CC)" $(PERL) $< $(PERLASM_SCHEME) $@
 ENDRAW[Makefile(unix)]
 {- $builddir -}/poly1305-%.S:  {- $sourcedir -}/asm/poly1305-%.pl
        CC="$(CC)" $(PERL) $< $(PERLASM_SCHEME) $@
 ENDRAW[Makefile(unix)]

+INCLUDE[poly1305-armv4.o]=..
+INCLUDE[poly1305-armv8.o]=..

diff --git a/crypto/sha/build.info b/crypto/sha/build.info
index 9f095a8c028a33d2c983e253a0ed332148225082..57e9c93b12a8f1bbd693777317df3a2f46db498b 100644 (file)
--- a/crypto/sha/build.info
+++ b/crypto/sha/build.info
@@ -24,8 +24,11 @@ GENERATE[sha256-mb-x86_64.s]=asm/sha256-mb-x86_64.pl $(PERLASM_SCHEME)
 GENERATE[sha512-x86_64.s]=asm/sha512-x86_64.pl $(PERLASM_SCHEME)
 
 GENERATE[sha1-sparcv9.S]=asm/sha1-sparcv9.pl $(PERLASM_SCHEME)
 GENERATE[sha512-x86_64.s]=asm/sha512-x86_64.pl $(PERLASM_SCHEME)
 
 GENERATE[sha1-sparcv9.S]=asm/sha1-sparcv9.pl $(PERLASM_SCHEME)

+INCLUDE[sha1-sparcv9.o]=..

 GENERATE[sha256-sparcv9.S]=asm/sha512-sparcv9.pl $(PERLASM_SCHEME)
 GENERATE[sha256-sparcv9.S]=asm/sha512-sparcv9.pl $(PERLASM_SCHEME)

+INCLUDE[sha256-sparcv9.o]=..

 GENERATE[sha512-sparcv9.S]=asm/sha512-sparcv9.pl $(PERLASM_SCHEME)
 GENERATE[sha512-sparcv9.S]=asm/sha512-sparcv9.pl $(PERLASM_SCHEME)

+INCLUDE[sha512-sparcv9.o]=..

 
 GENERATE[sha1-ppc.s]=asm/sha1-ppc.pl $(PERLASM_SCHEME)
 GENERATE[sha256-ppc.s]=asm/sha512-ppc.pl $(PERLASM_SCHEME)
 
 GENERATE[sha1-ppc.s]=asm/sha1-ppc.pl $(PERLASM_SCHEME)
 GENERATE[sha256-ppc.s]=asm/sha512-ppc.pl $(PERLASM_SCHEME)


@@ -52,3 +55,7 @@ BEGINRAW[Makefile(unix)]
 {- $builddir -}/sha512-%.S:    {- $sourcedir -}/asm/sha512-%.pl
        CC="$(CC)" $(PERL) $< $(PERLASM_SCHEME) $@
 ENDRAW[Makefile(unix)]
 {- $builddir -}/sha512-%.S:    {- $sourcedir -}/asm/sha512-%.pl
        CC="$(CC)" $(PERL) $< $(PERLASM_SCHEME) $@
 ENDRAW[Makefile(unix)]

+INCLUDE[sha1-armv4-large.o]=..
+INCLUDE[sha1-armv8.o]=..
+INCLUDE[sha256-armv8.o]=..
+INCLUDE[sha512-armv8.o]=..