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

Add $(LIB_CFLAGS) for any build.info generator that uses $(CFLAGS) 



The reason to do so is that some of the generators detect PIC flags
like -fPIC and -KPIC, and those are normally delivered in LD_CFLAGS.

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

crypto/aes/build.info

+3 −3
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ SOURCE[../../libcrypto]=\ 


GENERATE[aes-ia64.s]=asm/aes-ia64.S



GENERATE[aes-586.s]=asm/aes-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR)

GENERATE[aes-586.s]=asm/aes-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(PROCESSOR)

DEPEND[aes-586.s]=../perlasm/x86asm.pl

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

GENERATE[vpaes-x86.s]=asm/vpaes-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(PROCESSOR)

DEPEND[vpaes-586.s]=../perlasm/x86asm.pl

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

GENERATE[aesni-x86.s]=asm/aesni-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(PROCESSOR)

DEPEND[aesni-586.s]=../perlasm/x86asm.pl



GENERATE[aes-x86_64.s]=asm/aes-x86_64.pl $(PERLASM_SCHEME)

crypto/bf/build.info

+1 −1
Original line number Diff line number Diff line 
LIBS=../../libcrypto

SOURCE[../../libcrypto]=bf_skey.c bf_ecb.c bf_enc.c bf_cfb64.c bf_ofb64.c 



GENERATE[bf-586.s]=asm/bf-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR)

GENERATE[bf-586.s]=asm/bf-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(PROCESSOR)

DEPEND[bf-586.s]=../perlasm/x86asm.pl ../perlasm/cbc.pl

crypto/bn/build.info

+6 −6
Original line number Diff line number Diff line
@@ -12,16 +12,16 @@ INCLUDE[../../libcrypto]={- rel2abs(catdir($builddir,"..","..","crypto","include 
INCLUDE[bn_exp.o]=..



GENERATE[bn-586.s]=asm/bn-586.pl \

	$(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR)

	$(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(PROCESSOR)

DEPEND[bn-586.s]=../perlasm/x86asm.pl

GENERATE[co-586.s]=asm/co-586.pl \

	$(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR)

	$(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(PROCESSOR)

DEPEND[co-586.s]=../perlasm/x86asm.pl

GENERATE[x86-mont.s]=asm/x86-mont.pl \

	$(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR)

	$(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(PROCESSOR)

DEPEND[x86-mont.s]=../perlasm/x86asm.pl

GENERATE[x86-gf2m.s]=asm/x86-gf2m.pl \

	$(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR)

	$(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(PROCESSOR)

DEPEND[x86-gf2m.s]=../perlasm/x86asm.pl



GENERATE[sparcv9a-mont.S]=asm/sparcv9a-mont.pl $(PERLASM_SCHEME)
@@ -48,7 +48,7 @@ GENERATE[rsaz-x86_64.s]=asm/rsaz-x86_64.pl $(PERLASM_SCHEME) 
GENERATE[rsaz-avx2.s]=asm/rsaz-avx2.pl $(PERLASM_SCHEME)



GENERATE[bn-ia64.s]=asm/ia64.S

GENERATE[ia64-mont.s]=asm/ia64-mont.pl $(CFLAGS)

GENERATE[ia64-mont.s]=asm/ia64-mont.pl $(CFLAGS) $(LIB_CFLAGS)



GENERATE[parisc-mont.s]=asm/parisc-mont.pl $(PERLASM_SCHEME)
@@ -73,7 +73,7 @@ BEGINRAW[Makefile] 
	@if [ "$(CC)" = "gcc" ]; then \

		ABI=`expr "$(CFLAGS)" : ".*-mabi=\([n3264]*\)"` && \

		as -$$ABI -O -o $@ {- $sourcedir -}/asm/mips3.s; \

	else	$(CC) -c $(CFLAGS) -o $@ {- $sourcedir -}/asm/mips3.s; fi

	else	$(CC) -c $(CFLAGS) $(LIB_CFLAGS) -o $@ {- $sourcedir -}/asm/mips3.s; fi



# GNU assembler fails to compile PA-RISC2 modules, insist on calling

# vendor assembler...

crypto/build.info

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ DEPEND[buildinf.h]=configdata.pm 


GENERATE[uplink-x86.s]=../ms/uplink-x86.pl $(PERLASM_SCHEME)



GENERATE[x86cpuid.s]=x86cpuid.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR)

GENERATE[x86cpuid.s]=x86cpuid.pl $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(PROCESSOR)

DEPEND[x86cpuid.s]=perlasm/x86asm.pl



GENERATE[x86_64cpuid.s]=x86_64cpuid.pl $(PERLASM_SCHEME)

crypto/camellia/build.info

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ SOURCE[../../libcrypto]=\ 
        cmll_ecb.c cmll_ofb.c cmll_cfb.c cmll_ctr.c \

        {- $target{cmll_asm_src} -}



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

GENERATE[cmll-x86.s]=asm/cmll-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(LIB_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)