public inbox for
 help / color / mirror / Atom feed
From: "Joseph S. Myers" <>
To: <>
Subject: Update MIPS dl-lookup.c from generic version
Date: Tue, 03 Dec 2013 22:59:00 -0000	[thread overview]
Message-ID: <> (raw)

I've applied this patch to resync the MIPS dl-lookup.c with the generic 
version (one whitespace difference and one substantive change).

We should really work out a way to stop MIPS needing this copy of this 
file (that is, define an appropriate hook architectures can define that 
allows for the MIPS semantics).

diff --git a/ports/ChangeLog.mips b/ports/ChangeLog.mips
index 21308e7..687b21f 100644
--- a/ports/ChangeLog.mips
+++ b/ports/ChangeLog.mips
@@ -1,3 +1,7 @@
+2013-12-03  Joseph Myers  <>
+	* sysdeps/mips/dl-lookup.c: Update from generic version.
 2013-11-28  Joseph Myers  <>
 	* sysdeps/mips/fpu/fegetround.c (fegetround): Use libm_hidden_def.
diff --git a/ports/sysdeps/mips/dl-lookup.c b/ports/sysdeps/mips/dl-lookup.c
index 6d8f744..2b7bf15 100644
--- a/ports/sysdeps/mips/dl-lookup.c
+++ b/ports/sysdeps/mips/dl-lookup.c
@@ -113,8 +113,7 @@ do_lookup_x (const char *undef_name, uint_fast32_t new_hash,
       /* Print some debugging info if wanted.  */
       if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SYMBOLS, 0))
 	_dl_debug_printf ("symbol=%s;  lookup in file=%s [%lu]\n",
-			  undef_name,
-			  DSO_FILENAME (map->l_name),
+			  undef_name, DSO_FILENAME (map->l_name),
       /* If the hash table is empty there is nothing to do here.  */
@@ -764,7 +763,7 @@ _dl_lookup_symbol_x (const char *undef_name, struct link_map *undef_map,
 	     contain the needed symbol.  This code is never reached
 	     for unversioned lookups.  */
 	  assert (version != NULL);
-	  const char *reference_name = undef_map ? undef_map->l_name : NULL;
+	  const char *reference_name = undef_map ? undef_map->l_name : "";
 	  /* XXX We cannot translate the message.  */
 	  _dl_signal_cerror (0, DSO_FILENAME (reference_name),

Joseph S. Myers

             reply	other threads:[~2013-12-03 22:59 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-03 22:59 Joseph S. Myers [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-08-15  9:50 Joseph S. Myers

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:

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

  git send-email \ \ \ \

* 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).