Commit f0667b14 authored by Richard Levitte's avatar Richard Levitte
Browse files

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



Closes RT#4406

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent fb044341

crypto/aes/build.info

+3 −0
Original line number Diff line number Diff line
@@ -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)

INCLUDE[aes-sparcv9.o]=..

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

INCLUDE[aesv8-armx.o]=..

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

crypto/bn/build.info

+6 −0
Original line number Diff line number Diff line
@@ -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)

INCLUDE[sparcv9a-mont.o]=..

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

INCLUDE[sparcv9-mont.o]=..

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

INCLUDE[vis3-mont.o]=..

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

INCLUDE[armv4-mont.o]=..

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

crypto/camellia/build.info

+1 −0
Original line number Diff line number Diff line
@@ -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)

INCLUDE[cmllt4-sparcv9.o]=..

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

crypto/chacha/build.info

+2 −0
Original line number Diff line number Diff line
@@ -11,3 +11,5 @@ 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/des/build.info

+1 −1
Original line number Diff line number Diff line
@@ -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)

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