git: cd6569d47ce5 - stable/12 - readelf: include notes (-n) and unwind (-u) in --all/-a

[Ed Maste]

The branch stable/12 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=cd6569d47ce58726aba476598790df7cbb8c1826

commit cd6569d47ce58726aba476598790df7cbb8c1826
Author:     Ed Maste <emaste at FreeBSD.org>
AuthorDate: 2021-09-17 12:06:27 +0000
Commit:     Ed Maste <emaste at FreeBSD.org>
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;