From: Andy Polyakov <appro@openssl.org>
Date: Fri, 11 Mar 2016 12:44:46 +0000 (+0100)
Subject: crypto/*/build.info: make it work on ARM platforms.
X-Git-Tag: OpenSSL_1_1_0-pre4~62
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ee619197db0c1efa676bedf3b05d028080988759;p=oweals%2Fopenssl.git

crypto/*/build.info: make it work on ARM platforms.

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/crypto/aes/build.info b/crypto/aes/build.info
index fe1dd15f56..ca34a28d0f 100644
--- a/crypto/aes/build.info
+++ b/crypto/aes/build.info
@@ -38,6 +38,10 @@ 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[aes-armv4.S]=asm/aes-armv4.pl $(PERLASM_SCHEME)
+INCLUDE[aes-armv4.o]=..
+GENERATE[bsaes-armv7.S]=asm/bsaes-armv7.pl $(PERLASM_SCHEME)
+INCLUDE[bsaes-armv7.o]=..
 
 BEGINRAW[Makefile]
 ##### AES assembler implementations
@@ -49,5 +53,3 @@ BEGINRAW[Makefile]
 	CC="$(CC)" $(PERL) $< $(PERLASM_SCHEME) $@
 
 ENDRAW[Makefile]
-INCLUDE[aes-armv4.o]=..
-INCLUDE[bsaes-armv7.o]=..
diff --git a/crypto/build.info b/crypto/build.info
index d465d9d1fc..939339bcb0 100644
--- a/crypto/build.info
+++ b/crypto/build.info
@@ -26,4 +26,6 @@ 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)
+INCLUDE[arm64cpuid.o]=.
 GENERATE[armv4cpuid.S]=armv4cpuid.pl $(PERLASM_SCHEME)
+INCLUDE[armv4cpuid.o]=.
diff --git a/crypto/chacha/build.info b/crypto/chacha/build.info
index 28c221f93d..41e996727d 100644
--- a/crypto/chacha/build.info
+++ b/crypto/chacha/build.info
@@ -4,6 +4,10 @@ SOURCE[../../libcrypto]={- $target{chacha_asm_src} -}
 GENERATE[chacha-x86.s]=asm/chacha-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR)
 GENERATE[chacha-x86_64.s]=asm/chacha-x86_64.pl $(PERLASM_SCHEME)
 GENERATE[chacha-ppc.s]=asm/chacha-ppc.pl $(PERLASM_SCHEME)
+GENERATE[chacha-armv4.S]=asm/chacha-armv4.pl $(PERLASM_SCHEME)
+INCLUDE[chacha-armv4.o]=..
+GENERATE[chacha-armv8.S]=asm/chacha-armv8.pl $(PERLASM_SCHEME)
+INCLUDE[chacha-armv8.o]=..
 
 BEGINRAW[Makefile(unix)]
 ##### CHACHA assembler implementations
@@ -11,5 +15,3 @@ BEGINRAW[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/ec/build.info b/crypto/ec/build.info
index 0290141df0..157fd33cae 100644
--- a/crypto/ec/build.info
+++ b/crypto/ec/build.info
@@ -17,10 +17,12 @@ 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]=..
 
+GENERATE[ecp_nistz256-armv4.S]=asm/ecp_nistz256-armv4.pl $(PERLASM_SCHEME)
+INCLUDE[ecp_nistz256-armv4.o]=..
+GENERATE[ecp_nistz256-armv8.S]=asm/ecp_nistz256-armv8.pl $(PERLASM_SCHEME)
+INCLUDE[ecp_nistz256-armv8.o]=..
+
 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/modes/build.info b/crypto/modes/build.info
index b20154da17..1c12b78e85 100644
--- a/crypto/modes/build.info
+++ b/crypto/modes/build.info
@@ -14,13 +14,14 @@ 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[ghashp8-ppc.s]=asm/ghashp8-ppc.pl $(PERLASM_SCHEME)
+GENERATE[ghash-armv4.S]=asm/ghash-armv4.pl $(PERLASM_SCHEME)
+INCLUDE[ghash-armv4.o]=..
+GENERATE[ghashv8-armx.S]=asm/ghashv8-armx.pl $(PERLASM_SCHEME)
+INCLUDE[ghashv8-armx.o]=..
 
 BEGINRAW[Makefile]
 # GNU make "catch all"
 {- $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 d5d72ecb38..de0f577e69 100644
--- a/crypto/poly1305/build.info
+++ b/crypto/poly1305/build.info
@@ -8,10 +8,12 @@ GENERATE[poly1305-x86.s]=asm/poly1305-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCE
 GENERATE[poly1305-x86_64.s]=asm/poly1305-x86_64.pl $(PERLASM_SCHEME)
 GENERATE[poly1305-ppc.s]=asm/poly1305-ppc.pl $(PERLASM_SCHEME)
 GENERATE[poly1305-ppcfp.s]=asm/poly1305-ppcfp.pl $(PERLASM_SCHEME)
+GENERATE[poly1305-armv4.S]=asm/poly1305-armv4.pl $(PERLASM_SCHEME)
+INCLUDE[poly1305-armv4.o]=..
+GENERATE[poly1305-armv8.S]=asm/poly1305-armv8.pl $(PERLASM_SCHEME)
+INCLUDE[poly1305-armv8.o]=..
 
 BEGINRAW[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 136d0ee2cf..5e2cd712e8 100644
--- a/crypto/sha/build.info
+++ b/crypto/sha/build.info
@@ -13,8 +13,6 @@ GENERATE[sha1-ia64.s]=sha1-ia64.pl $(CFLAGS)
 GENERATE[sha256-ia64.s]=sha512-ia64.pl $(CFLAGS)
 GENERATE[sha512-ia64.s]=sha512-ia64.pl $(CFLAGS)
 
-GENERATE[sha256-armv4.S]=asm/sha256-armv4.pl $(PERLASM_SCHEME)
-
 GENERATE[sha1-alpha.s]=asm/sha1-alpha.pl
 
 GENERATE[sha1-x86_64.s]=asm/sha1-x86_64.pl $(PERLASM_SCHEME)
@@ -44,6 +42,20 @@ GENERATE[sha1-mips.S]=asm/sha1-mips.pl $(PERLASM_SCHEME)
 GENERATE[sha256-mips.S]=asm/sha512-mips.pl $(PERLASM_SCHEME)
 GENERATE[sha512-mips.S]=asm/sha512-mips.pl $(PERLASM_SCHEME)
 
+GENERATE[sha1-armv4-large.S]=asm/sha1-armv4-large.pl $(PERLASM_SCHEME)
+INCLUDE[sha1-armv4-large.o]=..
+GENERATE[sha256-armv4.S]=asm/sha256-armv4.pl $(PERLASM_SCHEME)
+INCLUDE[sha256-armv4.o]=..
+GENERATE[sha512-armv4.S]=asm/sha512-armv4.pl $(PERLASM_SCHEME)
+INCLUDE[sha512-armv4.o]=..
+
+GENERATE[sha1-armv8.S]=asm/sha1-armv8.pl $(PERLASM_SCHEME)
+INCLUDE[sha1-armv8.o]=..
+GENERATE[sha256-armv8.S]=asm/sha512-armv8.pl $(PERLASM_SCHEME)
+INCLUDE[sha256-armv8.o]=..
+GENERATE[sha512-armv8.S]=asm/sha512-armv8.pl $(PERLASM_SCHEME)
+INCLUDE[sha512-armv8.o]=..
+
 BEGINRAW[Makefile(unix)]
 ##### SHA assembler implementations
 
@@ -55,9 +67,3 @@ BEGINRAW[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-armv4.o]=..
-INCLUDE[sha256-armv8.o]=..
-INCLUDE[sha512-armv4.o]=..
-INCLUDE[sha512-armv8.o]=..