From nobody Wed Jan 05 02:04:49 2022 X-Original-To: dev-commits-src-branches@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 B0ED6193C525; Wed, 5 Jan 2022 02:04:49 +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 4JTCV92lHCz4TJm; Wed, 5 Jan 2022 02:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 33B1A23E50; Wed, 5 Jan 2022 02:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20524nX2068282; Wed, 5 Jan 2022 02:04:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20524n0C068281; Wed, 5 Jan 2022 02:04:49 GMT (envelope-from git) Date: Wed, 5 Jan 2022 02:04:49 GMT Message-Id: <202201050204.20524n0C068281@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: cb4d27f48efc - stable/13 - readelf: add Go Build ID ELF note support List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cb4d27f48efca1903ec13d71c5f3b4e42009821c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641348289; 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=3L1cQGkDqBNKdDcGU//L4ksJgE7ajNBhaEEEBR5H+7g=; b=Oghuunwoj5ST27bpdiBxSu9/EAUy/y8kXnAewI4GEv+eJ0TpXbSmngMBXtoLJNdfeyNaV5 /x2JcPM77hWMtOyq19GfNKQW733IfBld/lwXKtR8SGbpNzwQ5xffm23eVblU+eqZCZ+LSY FyVrZFcY1byz/fxUA7ZO6xSOoVZU0CaCUy7bMRbJLZQ3vxtSBiBnF6sDO9uxwqIfzaWiHu LN1UOXZQSkjtdSJMdeMLJCRjJN+aCHhin09pGq/pJa7R5Vqt2XxIfdCYDRAnEheZS5lLH3 YljIZ6i58fRnoibiyNiFaHvwJogBh5iud/v9eSuRkRb+FBSDVvUjQJj2UKCuJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641348289; a=rsa-sha256; cv=none; b=J89LaYHSz4TbDaJQxRpomwWQIFKhY/9bVj8owArx0OSftMs++/vfTREZfHYXQ1xptNwA6X Gqbqv0X1yK5wGn1F0YhSXaV/RH1pLJ6EKWgK3RaOTi1D4vYFcPcdv6k8xYgxqIF+i66JsH klqZ3oDFWCbOVmaFJGxvVw5o4SKJ1PTHjT1pTt3KuE9Aq0b28PC/2ONwgo61KtPkOsUh4E 0I+R089MVhFVG4hIzHO0imvIYw1v7GPRzyoJoAoVMef9RaAkkeRxOF2DyzxlboBTJ2Ob7D SES+zsLqFHIKETVS/skiUKtQOUXDiq4RT0wKZJw77/7IUy+dbpAQxMXyJpeMhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=cb4d27f48efca1903ec13d71c5f3b4e42009821c commit cb4d27f48efca1903ec13d71c5f3b4e42009821c Author: Ed Maste AuthorDate: 2021-12-10 20:11:45 +0000 Commit: Ed Maste CommitDate: 2022-01-05 02:04:19 +0000 readelf: add Go Build ID ELF note support Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D33379 (cherry picked from commit ca457394fccfc7d712cd9cc6a66e574767a0a32b) --- contrib/elftoolchain/readelf/readelf.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/contrib/elftoolchain/readelf/readelf.c b/contrib/elftoolchain/readelf/readelf.c index f33519112eb4..987a2ffb128b 100644 --- a/contrib/elftoolchain/readelf/readelf.c +++ b/contrib/elftoolchain/readelf/readelf.c @@ -373,8 +373,9 @@ static const char *note_type(const char *note_name, unsigned int et, unsigned int nt); static const char *note_type_freebsd(unsigned int nt); static const char *note_type_freebsd_core(unsigned int nt); -static const char *note_type_linux_core(unsigned int nt); +static const char *note_type_go(unsigned int nt); static const char *note_type_gnu(unsigned int nt); +static const char *note_type_linux_core(unsigned int nt); static const char *note_type_netbsd(unsigned int nt); static const char *note_type_openbsd(unsigned int nt); static const char *note_type_unknown(unsigned int nt); @@ -1151,6 +1152,8 @@ note_type(const char *name, unsigned int et, unsigned int nt) return note_type_freebsd(nt); else if (strcmp(name, "GNU") == 0 && et != ET_CORE) return note_type_gnu(nt); + else if (strcmp(name, "Go") == 0 && et != ET_CORE) + return note_type_go(nt); else if (strcmp(name, "NetBSD") == 0 && et != ET_CORE) return note_type_netbsd(nt); else if (strcmp(name, "OpenBSD") == 0 && et != ET_CORE) @@ -1243,6 +1246,15 @@ note_type_gnu(unsigned int nt) } } +static const char * +note_type_go(unsigned int nt) +{ + switch (nt) { + case 4: return "elfGoBuildIDTag"; + default: return (note_type_unknown(nt)); + } +} + static const char * note_type_netbsd(unsigned int nt) { @@ -3814,6 +3826,16 @@ dump_notes_data(struct readelf *re, const char *name, uint32_t type, dump_flags(note_feature_ctl_flags, ubuf[0]); return; } + } else if (strcmp(name, "Go") == 0) { + if (type == 4) { + printf(" Build ID: "); + for (i = 0; i < sz; i++) { + printf(isprint(buf[i]) ? "%c" : "<%02x>", + buf[i]); + } + printf("\n"); + return; + } } else if (strcmp(name, "GNU") == 0) { switch (type) { case NT_GNU_PROPERTY_TYPE_0: