From nobody Fri Aug 22 20:50:34 2025 X-Original-To: dev-commits-src-main@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 4c7slb1szBz64wZp; Fri, 22 Aug 2025 20:50:35 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7slb07Xxz3Dkm; Fri, 22 Aug 2025 20:50:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755895835; 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=ch68f0WpCaGQP6StzEFU++23I2Hwe05zc4UKSe7T9Js=; b=q74jzoyJv5Qi0JxphjfiH5Gb8lm+V3C9yIx8j2/3fKcWCiTkySMvTqZii1MZWYD8UhPd3M rX6JmvOQmV+X60Xz9vpRp3IECWffnLeFz9waX9W+6zT2j29J6t6LnW3bG/TxlJMvljXDDu sLl50JCjpGOYiQIbNUF8IfUDM+5OYRmnDV/aXKbKNoRJ59T45BYQEpCXwi4gu+4kRJlvD2 1lFEelSCEoyMCvNqW3ppvzjgvD55v4yzBZk/JevHvNufK+7ZhfB4tNZVFt/07LV2F5GWTc ZK43qgnMBXZqfS66/QyAT5IciGh5PXOGczb5CU7YuZmc989RZZNFll9DHET/YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755895835; 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=ch68f0WpCaGQP6StzEFU++23I2Hwe05zc4UKSe7T9Js=; b=HpuwzEJgZCo3GBNpnWNRQLRiEXXTTY10pyDFiCXQgmckjmA18vVaJJdYJgvGTJbFvlEUNN cVd6xBHrsiam/v28eaI2FWxiZXGqLaKDWaQQUlbAp3UNG/4H8RXeCptVNN6Z1MA3vtviFc 5DErGfAOVKDU3HV9DIo7NrKrQBUflb/ISYrWANkSlJM9O4Rxboz6QZXiEo6jTKv9ikbaGT up3M2nu5/b7r/g4o0AFm1Zi1aM4b9CvPaoUOr92EBlhyI5/lEMQOotSk1r5XsFu5utlOOE gMqKe6DDk7FB4jhxwcaynJU/54WcNR40rfRVLm5jnbhKFniHsEm+4xJf4tFXkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755895835; a=rsa-sha256; cv=none; b=K9/VyWtyFENvfWypCm7rJ4S4+nmARD/APAM7vsp1V64MsV5Ysx9yVnsdJB1WLRnAX79VoD OLafaIdg5+BZsbDkuaR8z47xdlgt940/IFTVQai+JPMhh561CimM7JzW5RBDgoPK2+AnyF TjAdZBYGTOgyYQBo5GS/giSy7ipgzlYQrP4x3dCtzO1yo2DV4maCe/ygpgiWNgA2I5993r 4mQYh0l0HaIlEwQ/gf9qZlUBRm5yHLKRhvdO3fpXjr/lBTChdIv9zJt7jeJe5OXiEIqPgb iR2FyNLBvZhU9PzJfR++/w4tk8/9GYhpR6tEYqEzEwKcm535RKJwTxxMA4UQXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c7slZ6Jd2z11p9; Fri, 22 Aug 2025 20:50:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57MKoYa8018612; Fri, 22 Aug 2025 20:50:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57MKoYTO018609; Fri, 22 Aug 2025 20:50:34 GMT (envelope-from git) Date: Fri, 22 Aug 2025 20:50:34 GMT Message-Id: <202508222050.57MKoYTO018609@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: b7e0373acb1d - main - vdso: Build without debug info List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b7e0373acb1d022e9e5acb5be9727def5f941194 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b7e0373acb1d022e9e5acb5be9727def5f941194 commit b7e0373acb1d022e9e5acb5be9727def5f941194 Author: Mark Johnston AuthorDate: 2025-08-22 20:47:43 +0000 Commit: Mark Johnston CommitDate: 2025-08-22 20:50:26 +0000 vdso: Build without debug info The debug info is not very useful and embeds build paths because elf-vdso.so.o is built without CFLAGS, breaking reproducibility of elf-vdso.so.o and thus the kernel. Just stop passing debug flags to amd64_vdso.sh. Reviewed by: kib MFC after: 2 weeks Sponsored by: Klara, Inc. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52129 --- sys/conf/files.amd64 | 4 ++-- sys/tools/amd64_ia32_vdso.sh | 2 +- sys/tools/amd64_vdso.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 9b6ba03b78df..c12ab9db030a 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -13,14 +13,14 @@ include "conf/files.x86" # elf-vdso.so.o standard \ dependency "$S/amd64/amd64/sigtramp.S assym.inc $S/conf/vdso_amd64.ldscript $S/tools/amd64_vdso.sh" \ - compile-with "env AWK='${AWK}' NM='${NM}' LD='${LD}' CC='${CC}' DEBUG='${DEBUG}' OBJCOPY='${OBJCOPY}' ELFDUMP='${ELFDUMP}' S='${S}' sh $S/tools/amd64_vdso.sh" \ + compile-with "env AWK='${AWK}' NM='${NM}' LD='${LD}' CC='${CC}' OBJCOPY='${OBJCOPY}' ELFDUMP='${ELFDUMP}' S='${S}' sh $S/tools/amd64_vdso.sh" \ no-ctfconvert \ no-implicit-rule before-depend \ clean "elf-vdso.so.o elf-vdso.so.1 vdso_offsets.h sigtramp.pico" # elf-vdso32.so.o optional compat_freebsd32 \ dependency "$S/amd64/ia32/ia32_sigtramp.S ia32_assym.h $S/conf/vdso_amd64_ia32.ldscript $S/tools/amd64_ia32_vdso.sh" \ - compile-with "env AWK='${AWK}' NM='${NM}' LD='${LD}' CC='${CC}' DEBUG='${DEBUG}' OBJCOPY='${OBJCOPY}' ELFDUMP='${ELFDUMP}' S='${S}' sh $S/tools/amd64_ia32_vdso.sh" \ + compile-with "env AWK='${AWK}' NM='${NM}' LD='${LD}' CC='${CC}' OBJCOPY='${OBJCOPY}' ELFDUMP='${ELFDUMP}' S='${S}' sh $S/tools/amd64_ia32_vdso.sh" \ no-ctfconvert \ no-implicit-rule before-depend \ clean "elf-vdso32.so.o elf-vdso32.so.1 vdso_ia32_offsets.h ia32_sigtramp.pico" diff --git a/sys/tools/amd64_ia32_vdso.sh b/sys/tools/amd64_ia32_vdso.sh index 85d2299b45d0..e5865639d398 100644 --- a/sys/tools/amd64_ia32_vdso.sh +++ b/sys/tools/amd64_ia32_vdso.sh @@ -58,7 +58,7 @@ then exit 1 fi -${CC} ${DEBUG} -x assembler-with-cpp -DLOCORE -fPIC -nostdinc -c \ +${CC} -x assembler-with-cpp -DLOCORE -fPIC -nostdinc -c \ -o elf-vdso32.so.o -I. -I"${S}" -include opt_global.h \ -DVDSO_NAME=elf_vdso32_so_1 -DVDSO_FILE=\"elf-vdso32.so.1\" \ "${S}"/tools/vdso_wrap.S diff --git a/sys/tools/amd64_vdso.sh b/sys/tools/amd64_vdso.sh index 2a83ae874ab7..ed91ddc8abb5 100644 --- a/sys/tools/amd64_vdso.sh +++ b/sys/tools/amd64_vdso.sh @@ -67,7 +67,7 @@ then exit 1 fi -${CC} ${DEBUG} -x assembler-with-cpp -DLOCORE -fPIC -nostdinc -c \ +${CC} -x assembler-with-cpp -DLOCORE -fPIC -nostdinc -c \ -o elf-vdso.so.o -I. -I"${S}" -include opt_global.h \ -DVDSO_NAME=elf_vdso_so_1 -DVDSO_FILE=\"elf-vdso.so.1\" \ "${S}"/tools/vdso_wrap.S