public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] elf: Support lld-style link map for librtld.map
Date: Tue, 21 Apr 2020 18:12:27 +0000 (GMT)	[thread overview]
Message-ID: <20200421181227.4C762386F43F@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=eb06601bb4187d8f5a9f55c2d212747869f63fe1

commit eb06601bb4187d8f5a9f55c2d212747869f63fe1
Author: Fangrui Song <maskray@google.com>
Date:   Tue Apr 21 13:28:42 2020 -0300

    elf: Support lld-style link map for librtld.map
    
    GNU ld and gold's -Map include a line like:
    
      path/to/build/libc_pic.a(check_fds.os)
    
    lld -Map does not have the archive member list, but we can still derive the
    members from the following output
    
                 VMA              LMA     Size Align Out     In      Symbol
    ...
               1a1c0            1a1c0       e2    16         path/to/build/libc_pic.a(check_fds.os):(.text)

Diff:
---
 elf/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/elf/Makefile b/elf/Makefile
index 9b1d58c7ad..6919e53c14 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -514,9 +514,10 @@ $(objpfx)librtld.map: $(objpfx)dl-allobjs.os $(common-objpfx)libc_pic.a
 	rm -f $@.o
 	mv -f $@T $@
 
+# For lld, skip preceding addresses and values before matching the archive and the member.
 $(objpfx)librtld.mk: $(objpfx)librtld.map Makefile
 	LC_ALL=C \
-	sed -n 's@^$(common-objpfx)\([^(]*\)(\([^)]*\.os\)) *.*$$@\1 \2@p' \
+	sed -n 's@^[0-9a-f ]*$(common-objpfx)\([^(]*\)(\([^)]*\.os\)) *.*$$@\1 \2@p' \
 	    $< | \
 	while read lib file; do \
 	  case $$lib in \


                 reply	other threads:[~2020-04-21 18:12 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200421181227.4C762386F43F@sourceware.org \
    --to=azanella@sourceware.org \
    --cc=glibc-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).