From nobody Sun Sep 21 14:52:56 2025 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 4cV8P54fCgz68CSr; Sun, 21 Sep 2025 14:52:57 +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 4cV8P52jlKz3v1j; Sun, 21 Sep 2025 14:52:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758466377; 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=3KoALdOrvnq1beQhW7eOW/PhygaQFt6QSYStNn2doJI=; b=O5FUUaZ2fhF08tAqiL8BHQY+Z8nIJRhD4KPjzCD7v641LxfxmzHDycn60AdiqSSktg0j93 Ul3VSJcIPe/oHN5Z8HvvUJWSuWT6Thn05Rw4cNG03bguQApzh/ib30RSKX3LEswKNWBmgF OlxuW/16Lj5n3GindArFixqJQCSOskRO70nORDwVMV7AKxXuNVeg8ehg7yYQK6h9D2r6hl HTbLJi9har74weEPekTCpLXs1ksVDJ8kR2QmidlA00waEaQ8BmGrJWa2FA1jNWATQsC+yh PQjJkGDgMveZ4k/CSZS0OMuiSm4or8VwZU+yhGN4mh7R1dJxcjg9CPFpwkhqHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758466377; 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=3KoALdOrvnq1beQhW7eOW/PhygaQFt6QSYStNn2doJI=; b=Vi8xHSSesVvAPsv0e02D+hIPiU62iS7yITdLlQe3FxPlRZWKZLx8myFlCOYBWOf1iieRtS AlmlIRcW//sSIa3uxcbv/kFPNCjfXuiNJ0IuyHHV9pf8nKx/oEVsXNvmedhBUtBclcmrU9 xO7xVNLtlMvRFNHn37a3PfmQCR0fQlzRyKN19NiJ9XOZaPOU4J03EfmkNqzFR5w/qkeKti 0byRdS5EWKO0KhReQuMfYrPnqXDh3yVOR2wSYfFfKKmFURPniPBUVyKAV+eEuaQ1JNeJYf JWeayW2XMCxwyYx4n4tWUOknrHaeiK0Ttbe4hKfm6RfBRKCQWpYMbayX+VLb4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758466377; a=rsa-sha256; cv=none; b=r1ZE974bx4NPv9FGSWFUM8VDyiRHEfrlU241KtMtdShATKeZMGmnt83UB/bxdLpftefv3s h2yaCjXfPhb70clF7741XbVdpGIV91KXfkaFwTCLjSFBoq5uAq0x6/+8CydnINmjAb9YiK yJSEpaX/RkoZKkEAmPbTc79eLEE459sOX+yjcYlkFvmWSW+9Xy1dbPTap5Zq5xkI4KaV+T ZW8sDvzBka3937/0qx5cXAm3/sQ/rcNy+qWGneoays5OwK4drnWI10MW4+rycRKljxANUK K5w9nZeGupk7GXi9zVosgyNTyFQZGz4+YBJ8ybdq14L6KPJq/NdyEplM1IEKnQ== 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 4cV8P44KQQz48P; Sun, 21 Sep 2025 14:52:56 +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 58LEquSO017413; Sun, 21 Sep 2025 14:52:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58LEqu1d017410; Sun, 21 Sep 2025 14:52:56 GMT (envelope-from git) Date: Sun, 21 Sep 2025 14:52:56 GMT Message-Id: <202509211452.58LEqu1d017410@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c3a8da8f6828 - stable/14 - vdso: Build without debug info 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c3a8da8f6828979f53a54ec1da9d3ee28feeb95b Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c3a8da8f6828979f53a54ec1da9d3ee28feeb95b commit c3a8da8f6828979f53a54ec1da9d3ee28feeb95b Author: Mark Johnston AuthorDate: 2025-08-22 20:47:43 +0000 Commit: Mark Johnston CommitDate: 2025-09-21 14:52:38 +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 (cherry picked from commit b7e0373acb1d022e9e5acb5be9727def5f941194) --- 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 80ebc2ab6768..0da06d7a0997 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