From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2124) id 2D4AD385696B; Thu, 27 Apr 2023 12:02:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2D4AD385696B Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Nick Clifton To: bfd-cvs@sourceware.org Subject: [binutils-gdb] Add support for %x and %lx formats to the linker's vinfo() function. X-Act-Checkin: binutils-gdb X-Git-Author: Nick Clifton X-Git-Refname: refs/heads/master X-Git-Oldrev: 0bda45b270245dd5cf7effec0053cf893ab6e98f X-Git-Newrev: c386bf4df5c4a6548278c5a03fc6a790da2e2bd4 Message-Id: <20230427120230.2D4AD385696B@sourceware.org> Date: Thu, 27 Apr 2023 12:02:30 +0000 (GMT) X-BeenThere: binutils-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Apr 2023 12:02:30 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dc386bf4df5c4= a6548278c5a03fc6a790da2e2bd4 commit c386bf4df5c4a6548278c5a03fc6a790da2e2bd4 Author: Nick Clifton Date: Thu Apr 27 13:02:00 2023 +0100 Add support for %x and %lx formats to the linker's vinfo() function. Diff: --- ld/ChangeLog | 4 ++++ ld/ldmisc.c | 18 +++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index c4de3276784..f941b138c17 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2023-04-27 Nick Clifton + + * ldmisc.c (vfinfo): Add support for %x and %lx. + 2023-04-18 mengqinggang =20 * testsuite/ld-loongarch-elf/macro_op.d: Regenerated. diff --git a/ld/ldmisc.c b/ld/ldmisc.c index 5d7012e50b1..ef46ad665e9 100644 --- a/ld/ldmisc.c +++ b/ld/ldmisc.c @@ -52,6 +52,7 @@ %d integer, like printf %ld long, like printf %lu unsigned long, like printf + %lx unsigned long, like printf %p native (host) void* pointer, like printf %pA section name from a section %pB filename from a bfd @@ -63,6 +64,7 @@ %s arbitrary string, like printf %u integer, like printf %v hex bfd_vma, no leading zeros + %x integer, like printf */ =20 void @@ -152,11 +154,12 @@ vfinfo (FILE *fp, const char *fmt, va_list ap, bool i= s_warning) =20 case 'd': case 'u': + case 'x': arg_type =3D Int; break; =20 case 'l': - if (*scan =3D=3D 'd' || *scan =3D=3D 'u') + if (*scan =3D=3D 'd' || *scan =3D=3D 'u' || *scan =3D=3D 'x') { ++scan; arg_type =3D Long; @@ -544,6 +547,12 @@ vfinfo (FILE *fp, const char *fmt, va_list ap, bool is= _warning) ++arg_count; break; =20 + case 'x': + /* unsigned integer, like printf */ + fprintf (fp, "%x", args[arg_no].i); + ++arg_count; + break; + case 'l': if (*fmt =3D=3D 'd') { @@ -559,6 +568,13 @@ vfinfo (FILE *fp, const char *fmt, va_list ap, bool is= _warning) ++fmt; break; } + else if (*fmt =3D=3D 'x') + { + fprintf (fp, "%lx", args[arg_no].l); + ++arg_count; + ++fmt; + break; + } /* Fallthru */ =20 default: