Update MIPS dl-lookup.c from generic version

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

Update MIPS dl-lookup.c from generic version

Joseph Myers
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  <[hidden email]>
+
+ * sysdeps/mips/dl-lookup.c: Update from generic version.
+
 2013-11-28  Joseph Myers  <[hidden email]>
 
  * 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),
   map->l_ns);
 
       /* 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
[hidden email]