From nobody Tue Feb 13 22:53:42 2024 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 4TZGpG5hyvz5B11G; Tue, 13 Feb 2024 22:53:42 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TZGpG4jMZz4hx0; Tue, 13 Feb 2024 22:53:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707864822; 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=ReLnBBFTrqjFNDsPv8MshfedmTe+tLnq/dionJXeXCA=; b=yCqZNzTrYNJ5goZpSqnGPGx/WDCqmoGweRcjcyh4SDHfnWGxtRbud9bMnKzQBq6T3KlyD6 99gNQ3wz8c4ADC49PaK7ZwJ2MCfpN7OW8l3EIQ7tQOkw/3vHxB26yzpf3N8a9wCBhUfiT7 7JqCneg5BnUhQswgABQvVDx+ZkSN7maANufhvNERVL96jwqZR0kvVFvZiBua7oepeownhL Zz5osm3tOKRz5jZcVAoALii6E8ho80rgel4esBHRGprzaeqrg/rb/Xh0Fvo2TMhrK/GMfo LsBLspOc0LjMBonPxJpgAF7cqCvIjxrxs50G3Of7WtEAAHkpK6ValQAwmskX4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707864822; a=rsa-sha256; cv=none; b=P8sbokFAIQKzBUntDswh/2Vtsxjr9rlvcg24YKo6ld9k3nbVuNvm31PV4VvgT027s30+f1 g476sro30gSoU9Vlns1lwyoFzW8J/8HECoU/fT59KaBG/VZPzhRrEjJi1qtuU+bh4e47RS l7u/UZ+T3drY7rGjBdonPBvSSQUcVkv2zYI3X1XmwvJ/vtXC7DcpOBWQ7IR5YWeCa4PY6T H+Yuxi0eUqihxVIEAPWiLBdyDTirStZLmcoofQDi/bXUpNfqE96bQWtgrRc3uIxp2iNq9B RL3orC66UmGWub6ED0jC73HD3fj7uq5diuBxfLU+wPLRgJ7kUAeGMiomgyFYTg== 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=1707864822; 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=ReLnBBFTrqjFNDsPv8MshfedmTe+tLnq/dionJXeXCA=; b=cr8Eb/hXiC9ZtE7m86Tiej4nrUj9EJwB6BL7NkZqNp5uOEKfmtYopmTWD5sutwh20PmRln cWfTd3TwnyhftL7ASJ22v6H5cqw8Y+D7H1nXzCH/enuT0pRLnsOmffG1fuNgWbJpajnCxR JrFU93Q58tczGCu63quiNeiNfxIO2nj49dGexosvdlvknFBIk2mo/zwCVFHmpuet6ePZG+ sktvqAuFMkQxVu2kjjRLGSxHXMrK2WeI+ebMYK7Z3Vi5C3o+J8guIuZQcWNJ15ojBV1Q1a ty6hpOPRRyY89E5c0aaIRkTn0Mn/nNp3hxhjbjPSpBqYBp93nLgHkIgJEjlLjQ== 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 4TZGpG3n4tzZRf; Tue, 13 Feb 2024 22:53:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41DMrgXa059711; Tue, 13 Feb 2024 22:53:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DMrgIh059708; Tue, 13 Feb 2024 22:53:42 GMT (envelope-from git) Date: Tue, 13 Feb 2024 22:53:42 GMT Message-Id: <202402132253.41DMrgIh059708@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: 53fba3b984ac - main - build: Default to DWARF4 in the kernel 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 53fba3b984aca0dc5d34b84d0e21f0d4d121b56f Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=53fba3b984aca0dc5d34b84d0e21f0d4d121b56f commit 53fba3b984aca0dc5d34b84d0e21f0d4d121b56f Author: Mark Johnston AuthorDate: 2024-02-11 18:03:23 +0000 Commit: Mark Johnston CommitDate: 2024-02-13 22:51:09 +0000 build: Default to DWARF4 in the kernel gcc 12 defaults to emitting DWARF 5, but this is not yet supported by our libdwarf and thus by ctfconvert. Reviewed by: emaste, imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43837 --- sys/conf/kern.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index 08779b4da193..53781927dee8 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -256,6 +256,14 @@ CFLAGS+= -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clan .endif .endif +# +# Some newer toolchains default to DWARF 5, which isn't supported by some build +# tools yet. +# +.if (${CFLAGS:M-g} != "" || ${CFLAGS:M-g[0-3]} != "") && ${CFLAGS:M-gdwarf*} == "" +CFLAGS+= -gdwarf-4 +.endif + CFLAGS+= ${CWARNFLAGS:M*} ${CWARNFLAGS.${.IMPSRC:T}} CFLAGS+= ${CWARNFLAGS.${COMPILER_TYPE}} CFLAGS+= ${CFLAGS.${COMPILER_TYPE}} ${CFLAGS.${.IMPSRC:T}}