Commit ee619197 authored Mar 11, 2016 by Andy Polyakov

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



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

parent 12940f08

crypto/aes/build.info

+4 −2

Original line number	Diff line number	Diff line
		@@ -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]=..

crypto/build.info

+2 −0

Original line number	Diff line number	Diff line
		@@ -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]=.

crypto/chacha/build.info

+4 −2

Original line number	Diff line number	Diff line
		@@ -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]=..

crypto/ec/build.info

+5 −3

Original line number	Diff line number	Diff line
		@@ -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]=..

crypto/modes/build.info

+4 −3

Original line number	Diff line number	Diff line
		@@ -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]=..