From owner-dev-commits-src-all@freebsd.org Fri Sep 24 00:58:29 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 96BE36B0AA8; Fri, 24 Sep 2021 00:58:29 +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 4HFtv93qHbz3GFX; Fri, 24 Sep 2021 00:58:29 +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 62D03540B; Fri, 24 Sep 2021 00:58:29 +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 18O0wT31075586; Fri, 24 Sep 2021 00:58:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18O0wTak075585; Fri, 24 Sep 2021 00:58:29 GMT (envelope-from git) Date: Fri, 24 Sep 2021 00:58:29 GMT Message-Id: <202109240058.18O0wTak075585@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: cd6569d47ce5 - stable/12 - readelf: include notes (-n) and unwind (-u) in --all/-a 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/12 X-Git-Reftype: branch X-Git-Commit: cd6569d47ce58726aba476598790df7cbb8c1826 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Sep 2021 00:58:29 -0000 The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=cd6569d47ce58726aba476598790df7cbb8c1826 commit cd6569d47ce58726aba476598790df7cbb8c1826 Author: Ed Maste AuthorDate: 2021-09-17 12:06:27 +0000 Commit: Ed Maste CommitDate: 2021-09-24 00:58:14 +0000 readelf: include notes (-n) and unwind (-u) in --all/-a This matches the GNU and LLVM versions of readelf. As markj noted in the review -u is not actually implemented yet and has no effect. The option is accepted and just ignored. Reported by: andrew Reviewed by: andrew, markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D32003 (cherry picked from commit f161abf9f2cd7fdd28543f9774de82c89675477c) --- contrib/elftoolchain/readelf/readelf.1 | 4 +++- contrib/elftoolchain/readelf/readelf.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/elftoolchain/readelf/readelf.1 b/contrib/elftoolchain/readelf/readelf.1 index 67344d5359b4..108b62775712 100644 --- a/contrib/elftoolchain/readelf/readelf.1 +++ b/contrib/elftoolchain/readelf/readelf.1 @@ -24,7 +24,7 @@ .\" .\" $Id: readelf.1 3753 2019-06-28 01:13:13Z emaste $ .\" -.Dd October 31, 2020 +.Dd September 17, 2021 .Dt READELF 1 .Os .Sh NAME @@ -76,8 +76,10 @@ Turn on the following flags: .Fl h , .Fl I , .Fl l , +.Fl n , .Fl r , .Fl s , +.Fl u , .Fl A , .Fl S and diff --git a/contrib/elftoolchain/readelf/readelf.c b/contrib/elftoolchain/readelf/readelf.c index a3b7e7a6bcac..a647f2e7961d 100644 --- a/contrib/elftoolchain/readelf/readelf.c +++ b/contrib/elftoolchain/readelf/readelf.c @@ -7778,7 +7778,7 @@ main(int argc, char **argv) break; case 'a': re->options |= RE_AA | RE_D | RE_G | RE_H | RE_II | - RE_L | RE_R | RE_SS | RE_S | RE_VV; + RE_L | RE_N | RE_R | RE_SS | RE_S | RE_U | RE_VV; break; case 'c': re->options |= RE_C;