From nobody Sat Apr 25 16:08:10 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g2vrJ35zDz6bkTn for ; Sat, 25 Apr 2026 16:08:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2vrJ0bcNz3tr7 for ; Sat, 25 Apr 2026 16:08:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777133296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=udq8Wmkv6+D/UEP2c9M3Jkm7fzOELzC3pCuN2nhf7XY=; b=kF3XZlfEPu5KP5WvFxLuXdhALBiJ+N8XMCEreGSf5ZgT7ZuZN5nYLhJbJuzaGQ+9VZENxG 8e9ffMrXxLlgBlplzznsscCa9xLCIjVa8FrA2n3Awb8HbJDOmVaf3hF3GT2G2LI365fNh2 NKjqJNzpQWVdZt8ZSCJR6W/xjWdC7ojCBYIEmSW6P8DlDuOIBr5X1CDNo0Zyc0UzC3Y7jz 3624/IY/t2q2nqTdTA/yyRjtQ6+qqWVaR9b9tsSHTd+fs53xNek/Z+7NqV7vRWItOQRpWI sgaIL4NUvM3Lo6zBxdEHbIrn9tmB7Mk+469YTj8gRkSJc6MfwXG2eJMbvFFRfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777133296; a=rsa-sha256; cv=none; b=IYK+STiCkYp2/aE6k05BWAPiZSwybM3LA90u2BUsnlrXkz92CB7KgmJIm9AwQt/ZAIi1e8 zCBzLQBaptFF3MvRo+KIKs7x//mvF/XBFy3AdVoKj5M5Qxy3MRw62zCAuWzlRQOXGk/8p3 +nx4JU8T2E3hKDO2juCBqED/Eeoe23VL6NxGUSea8pfbi10oqY/cl4nUD8F2SEBlaZLUH7 Rvr0nQydQnXIue11BCTtnKRFHsTc0FlBV4hD9lEf3w/DAyKKUfR+5LUgZ1JFPzYSJFA2qI UaqnFBbl2EBaqBaVNUg3/oSvoccGYDSSE4tBOzJdgHWwoGXQ/qINRmAcVkwkBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777133296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=udq8Wmkv6+D/UEP2c9M3Jkm7fzOELzC3pCuN2nhf7XY=; b=sKsnMddpSZhlnPNjrMOccaunhn21UNguR4fQGn+jhZH3+G05Cr6GBQ6iakITQw4pHpQEK8 KG90Vhoj0OFEUztId3a+LtmDA9TI239dUs7U15q82TA5fQ2JefERl6YCOG0EfO1NjNOcuA ZvEyFO2WGkgGBVrYv8/8iIaLqVp+d8s953zssAMjjH6/booDTd/TvyDoLzhgwv2QBNrSZF cDkmaUSn4O+x4Rey/hVhImabS2RyxrIHdk+KrMtuX9HgGjS/i7RYjp0F2pCWSVJ8BfD3GX 6o0yIusKh8//wEVIaJXDcmRGOxGPhLuupuEIxEodphQMWXwS+tOqBiGsQ5+kxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2vrH6n1zzhJw for ; Sat, 25 Apr 2026 16:08:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42508 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 16:08:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 689cc820446a - stable/15 - libcrypto: compile all PIC objects with -DOPENSSL_PIC -fPIC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 689cc820446a6c11b521163b1b48a8c98bbfce1f Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 16:08:10 +0000 Message-Id: <69ece6ea.42508.142ca1a3@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=689cc820446a6c11b521163b1b48a8c98bbfce1f commit 689cc820446a6c11b521163b1b48a8c98bbfce1f Author: Enji Cooper AuthorDate: 2026-03-22 00:39:16 +0000 Commit: Enji Cooper CommitDate: 2026-04-25 16:07:56 +0000 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 (cherry picked from commit 3797fe720a37ff9fb5b20546494ef1c4a6c01541) --- 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 738de3479987..9d484e9d480c 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 73c650d590ff..8f22d501e005 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