From 3797fe720a37ff9fb5b20546494ef1c4a6c01541 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Sat, 21 Mar 2026 17:39:16 -0700 Subject: [PATCH] libcrypto: compile all PIC objects with -DOPENSSL_PIC -fPIC This change modifies the libcrypto PIC objects to always compile with `-DOPENSSL_PIC -fPIC` to restore parity with the upstream build process. This ensures that the legacy provider is built with parity to the upstream legacy provider. MFC after: 12 days Tested with: `make check` (legacy provider), `make universe` Fixes: 14b9955e Differential Revision: https://reviews.freebsd.org/D44896 --- secure/lib/libcrypto/Makefile | 6 ------ secure/lib/libcrypto/Makefile.inc | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 738de347998..9d484e9d480 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -687,12 +687,6 @@ SUBDIR.${MK_TESTS}= tests .include -.if ${MACHINE} == "powerpc" -# Work around "relocation R_PPC_GOT16 out of range" errors -PICFLAG= -fPIC -.endif -PICFLAG+= -DOPENSSL_PIC - .if defined(ASM_${MACHINE_CPUARCH}) .PATH: ${SRCTOP}/sys/crypto/openssl/${MACHINE_CPUARCH} .if defined(ASM_amd64) diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index 73c650d590f..8f22d501e00 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -12,6 +12,9 @@ CFLAGS+= -I${LCRYPTO_SRC}/providers/common/include CFLAGS+= -I${LCRYPTO_SRC}/providers/fips/include CFLAGS+= -I${LCRYPTO_SRC}/providers/implementations/include +PICFLAG= -fPIC +PICFLAG+= -DOPENSSL_PIC + .SUFFIXES: .pc .PATH.pc: ${LCRYPTO_SRC}/exporters