diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2013-12-03 22:56:05 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2013-12-03 22:56:05 +0000 |
| commit | 6905a19f7a8443950f105b6716f6b4b1f98c4dbd (patch) | |
| tree | 5be1a79d72e0c3e7bf5ca99767c3ab44efbd57c4 | |
| parent | 749008ff0361297af02b8574ac8848d35436eac3 (diff) | |
| download | glibc-6905a19f7a8443950f105b6716f6b4b1f98c4dbd.tar.gz | |
Update MIPS dl-lookup.c from generic version.
| -rw-r--r-- | ports/ChangeLog.mips | 4 | ||||
| -rw-r--r-- | ports/sysdeps/mips/dl-lookup.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/ports/ChangeLog.mips b/ports/ChangeLog.mips index 21308e7f1b..687b21f120 100644 --- a/ports/ChangeLog.mips +++ b/ports/ChangeLog.mips @@ -1,3 +1,7 @@ +2013-12-03 Joseph Myers <joseph@codesourcery.com> + + * sysdeps/mips/dl-lookup.c: Update from generic version. + 2013-11-28 Joseph Myers <joseph@codesourcery.com> * 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 6d8f744246..2b7bf15cde 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), |