From nobody Wed Dec 29 20:31:36 2021 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 A4574192359F; Wed, 29 Dec 2021 20:31:36 +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 4JPNNS2wlhz57LR; Wed, 29 Dec 2021 20:31:36 +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 463CC3378; Wed, 29 Dec 2021 20:31:36 +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 1BTKVa4p084087; Wed, 29 Dec 2021 20:31:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BTKVaqE084086; Wed, 29 Dec 2021 20:31:36 GMT (envelope-from git) Date: Wed, 29 Dec 2021 20:31:36 GMT Message-Id: <202112292031.1BTKVaqE084086@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: ca457394fccf - main - readelf: add Go Build ID ELF note support 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca457394fccfc7d712cd9cc6a66e574767a0a32b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640809896; 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=cnfKxmcR598gV90QgYKGGd2A3edq6tJny8XmCpN4fYQ=; b=tzh/+VEXi2o1xePoue/K8XWaT6fTB8KZw23wPrNChCVD5DwB85wLzoBQ5/AwX7TqeUFwAo Aj+gDu0704OBjjHTrk/MxoXD5Kfcs7nl7gMvJa3b6OEryDAGoYMZHTghAwCm3dZgNVqtzS F/oW2Qb4AkqrZG66BkonUhlzbT8Vilvtr2T56t05ekp0LlV56hrYyl0jebPkkh4PX38W2r Y4PUcY8q+fVtdyJck3r+1uQeXar6SWNz0+mEDto5t7SlFz256d2DI2Q1rXG1g+qeGEmrqQ LJvznzlPxKj7/7ghDc2sVSnYZqXOChpm3MNV97SME5k70zBb1mqoAroau7dKxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640809896; a=rsa-sha256; cv=none; b=dV3M3JVUZJKlIp/Kz4vZ4M3K9aftV6e+XT50b8QMbazOf1/c/MdTri3PhIWwISEM5I0Yi4 Ks7c7lSW6MHkMudlazbz9nUinKcoZkCoik+zuPXUr1G6xbBmuRsi/c9UeB3xbdCbKnAfnR beEWCBQRnKhrH6LnKRZh05Y8URBHohnLthsezhLsFkppIfVl5TWFsvP3/j2HOzYxTkERWl pEc2JqkZHfmNCZtY0eY2DVs8PdPpkmr/FjR/4vBMf9D0K9WGRkDsRYsfCRXw1mV1Z6h+Lv ZvcZB3kcSaNxNCWlZ0/4Ne5Oij9il7jtwVKd8QmubUAJxL5jswjLY2zxOxj6tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ca457394fccfc7d712cd9cc6a66e574767a0a32b commit ca457394fccfc7d712cd9cc6a66e574767a0a32b Author: Ed Maste AuthorDate: 2021-12-10 20:11:45 +0000 Commit: Ed Maste CommitDate: 2021-12-29 20:30:22 +0000 readelf: add Go Build ID ELF note support Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D33379 --- 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: