From nobody Sun Nov 08 19:29:13 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 4jN2zG19rRz6yhpr for ; Sun, 08 Nov 2026 19:29:14 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jN2zG0XfFz3MvG for ; Sun, 08 Nov 2026 19:29:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794166154; 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=ubsnFCudaIE1Qn0PXJYWKQ3mP6Ld5plipfHZ9KJzjn0=; b=lKOc0WTiPBbPT6TxNWWmJ9c73XX6L2qRGf6M7Zaae3ZlfTs5Qitp6gYCOWQkTZjubdhccl QCoh/sUEcPOTpAPrUQpnynJ+L/HqwePKutz3fsXX/Y7+bhltzgH3ygP7c0i0WUlqFKIMGd CgqQVr2dp1kXOefT1jlotcoXAp5b+tz5RB+Ku4Ch1rnjidVogH7OwkuuB6JRZxatBcDqJ8 8iMhiTWATqz5jCMN1MX/vgAL54paiLk11L59bw/tbS8xYm3o4qacmoXC5CC8BH2JYeH4e9 BZFmRwWeLFMzQGWHeZI9RWygTXKmhX8yFS2QtlWJBlqd936gu8iX1X3GvkUUnA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794166154; b=Bcof02fPZ7JPzFoxrKqIz+cFc7txxvP+VCZAZmZiX25+tv2RL4w7GHeQJDz7fuQGHnEkGj OwkMadWekujClXDzs0OFWWwUmhSMw0pcgAKtGgRuUA+O5aHUlBpxyQZVPCiMYcmNutUuoE ey/hyAbBvNVSVlvva9pj0Nxy/p0belcJbFZVvEL68puU299e1tGRnFYcuOpqsjC7lhi4A9 98jlaDFax0GU/jBhfTMSRqbnUZ0yxBoVwxNKw/3GGa4GlLImI7ymQ6Sn8pTXXL4UWkVgKi jSuMYkN0Do95OO5JqbIFRhuAIbil5zDz+rJeQvKONhedSCIdyLX6BHKcwWjHhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794166154; 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=ubsnFCudaIE1Qn0PXJYWKQ3mP6Ld5plipfHZ9KJzjn0=; b=bG7q2mdZv40xU6bckRB2D8EOSW6Wjh1iMM7Q+VNZzDtHT7po875X53B3gX5tkKE2BBNKZW Am2dHUiuzUJA34OsGS5hh/XS9Q/dod4VEe+21M+l7QVVKsfNywXRuwSA+5/cfLNdIq/p8O QVriHXNVSnDG0QKmCvN5E+Ljac8skhOB8dp10kjzXwDaCMglabADC9fJ35Ww/Jp4dPTdaL 5LQAmc3nD7J+6u9Aag+Bme+ogOoXz+SRSMoAMy8F4vvjveZ9OvwX7RAs+4hCwe2DXVfW1G Bss1ZQSu2c83DCCqgGsEFXgfU/NpppK/3MtIHG5v1FTELvkJvP/i/285Is+VNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jN2zF70zyz1Kkw for ; Sun, 08 Nov 2026 19:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 526a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 08 Nov 2026 19:29:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: f22d65998fe1 - main - libdwarf: standard DWARF 5 form names, DW_LANG_C17 and C23 List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f22d65998fe15b6bed9c8c3a2eede25c706837e1 Auto-Submitted: auto-generated Date: Sun, 08 Nov 2026 19:29:13 +0000 Message-Id: <6af0cd89.526a.3c98de6b@gitrepo.freebsd.org> The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=f22d65998fe15b6bed9c8c3a2eede25c706837e1 commit f22d65998fe15b6bed9c8c3a2eede25c706837e1 Author: Xin LI AuthorDate: 2026-11-02 01:41:07 +0000 Commit: Xin LI CommitDate: 2026-11-08 19:28:45 +0000 libdwarf: standard DWARF 5 form names, DW_LANG_C17 and C23 7bb441c86678 added the fixed-size string and address index forms 0x25 to 0x2c as DW_FORM_ref_strx1..4 and DW_FORM_ref_addrx1..4; the standard (DWARF 5, table 7.6) names them DW_FORM_strx1..4 and DW_FORM_addrx1..4, with no "ref". Rename them, keep the old spellings as aliases since the header is installed, and update dwarf_dump.c's form names accordingly. Add DW_LANG_C17 (0x2c) and DW_LANG_C23 (0x3e), which clang emits for -std=c17 and -std=c23 units. ctfconv(1) needs all of these; it carried them in a private header until now. Reviewed by: markj, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D61154 --- contrib/elftoolchain/libdwarf/dwarf.h | 27 +++++++++++++++++-------- contrib/elftoolchain/libdwarf/dwarf_dump.c | 32 +++++++++++++++--------------- 2 files changed, 35 insertions(+), 24 deletions(-) diff --git a/contrib/elftoolchain/libdwarf/dwarf.h b/contrib/elftoolchain/libdwarf/dwarf.h index 99e934078e7d..b4ce942a6477 100644 --- a/contrib/elftoolchain/libdwarf/dwarf.h +++ b/contrib/elftoolchain/libdwarf/dwarf.h @@ -340,14 +340,23 @@ #define DW_FORM_loclistx 0x22 #define DW_FORM_rnglistx 0x23 #define DW_FORM_ref_sup8 0x24 -#define DW_FORM_ref_strx1 0x25 -#define DW_FORM_ref_strx2 0x26 -#define DW_FORM_ref_strx3 0x27 -#define DW_FORM_ref_strx4 0x28 -#define DW_FORM_ref_addrx1 0x29 -#define DW_FORM_ref_addrx2 0x2a -#define DW_FORM_ref_addrx3 0x2b -#define DW_FORM_ref_addrx4 0x2c +#define DW_FORM_strx1 0x25 +#define DW_FORM_strx2 0x26 +#define DW_FORM_strx3 0x27 +#define DW_FORM_strx4 0x28 +#define DW_FORM_addrx1 0x29 +#define DW_FORM_addrx2 0x2a +#define DW_FORM_addrx3 0x2b +#define DW_FORM_addrx4 0x2c +/* Misspellings of the eight above, kept for source compatibility. */ +#define DW_FORM_ref_strx1 DW_FORM_strx1 +#define DW_FORM_ref_strx2 DW_FORM_strx2 +#define DW_FORM_ref_strx3 DW_FORM_strx3 +#define DW_FORM_ref_strx4 DW_FORM_strx4 +#define DW_FORM_ref_addrx1 DW_FORM_addrx1 +#define DW_FORM_ref_addrx2 DW_FORM_addrx2 +#define DW_FORM_ref_addrx3 DW_FORM_addrx3 +#define DW_FORM_ref_addrx4 DW_FORM_addrx4 #define DW_FORM_GNU_ref_alt 0x1f20 #define DW_FORM_GNU_strp_alt 0x1f21 @@ -609,6 +618,8 @@ #define DW_LANG_Fortran08 0x0023 #define DW_LANG_RenderScript 0x0024 #define DW_LANG_BLISS 0x0025 +#define DW_LANG_C17 0x002c +#define DW_LANG_C23 0x003e #define DW_LANG_lo_user 0x8000 #define DW_LANG_Mips_Assembler 0x8001 #define DW_LANG_hi_user 0xffff diff --git a/contrib/elftoolchain/libdwarf/dwarf_dump.c b/contrib/elftoolchain/libdwarf/dwarf_dump.c index e847d8e443f2..381c373e05c0 100644 --- a/contrib/elftoolchain/libdwarf/dwarf_dump.c +++ b/contrib/elftoolchain/libdwarf/dwarf_dump.c @@ -670,22 +670,22 @@ dwarf_get_FORM_name(unsigned form, const char **s) *s = "DW_FORM_rnglistx"; break; case DW_FORM_ref_sup8: *s = "DW_FORM_ref_sup8"; break; - case DW_FORM_ref_strx1: - *s = "DW_FORM_ref_strx1"; break; - case DW_FORM_ref_strx2: - *s = "DW_FORM_ref_strx2"; break; - case DW_FORM_ref_strx3: - *s = "DW_FORM_ref_strx3"; break; - case DW_FORM_ref_strx4: - *s = "DW_FORM_ref_strx4"; break; - case DW_FORM_ref_addrx1: - *s = "DW_FORM_ref_addrx1"; break; - case DW_FORM_ref_addrx2: - *s = "DW_FORM_ref_addrx2"; break; - case DW_FORM_ref_addrx3: - *s = "DW_FORM_ref_addrx3"; break; - case DW_FORM_ref_addrx4: - *s = "DW_FORM_ref_addrx4"; break; + case DW_FORM_strx1: + *s = "DW_FORM_strx1"; break; + case DW_FORM_strx2: + *s = "DW_FORM_strx2"; break; + case DW_FORM_strx3: + *s = "DW_FORM_strx3"; break; + case DW_FORM_strx4: + *s = "DW_FORM_strx4"; break; + case DW_FORM_addrx1: + *s = "DW_FORM_addrx1"; break; + case DW_FORM_addrx2: + *s = "DW_FORM_addrx2"; break; + case DW_FORM_addrx3: + *s = "DW_FORM_addrx3"; break; + case DW_FORM_addrx4: + *s = "DW_FORM_addrx4"; break; default: return (DW_DLV_NO_ENTRY); }