From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12694 invoked by alias); 3 Dec 2013 22:59:21 -0000 Mailing-List: contact libc-ports-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: libc-ports-owner@sourceware.org Received: (qmail 12684 invoked by uid 89); 3 Dec 2013 22:59:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.3 required=5.0 tests=AWL,BAYES_50,RDNS_NONE,URIBL_BLOCKED autolearn=no version=3.3.2 X-HELO: relay1.mentorg.com Received: from Unknown (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 03 Dec 2013 22:59:20 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1Vnyvo-0004T4-Kg from joseph_myers@mentor.com for libc-ports@sourceware.org; Tue, 03 Dec 2013 14:59:04 -0800 Received: from SVR-IES-FEM-03.mgc.mentorg.com ([137.202.0.108]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Tue, 3 Dec 2013 14:59:04 -0800 Received: from digraph.polyomino.org.uk (137.202.0.76) by SVR-IES-FEM-03.mgc.mentorg.com (137.202.0.108) with Microsoft SMTP Server id 14.2.247.3; Tue, 3 Dec 2013 22:59:02 +0000 Received: from jsm28 (helo=localhost) by digraph.polyomino.org.uk with local-esmtp (Exim 4.76) (envelope-from ) id 1Vnyvl-0001GG-9K for libc-ports@sourceware.org; Tue, 03 Dec 2013 22:59:01 +0000 Date: Tue, 03 Dec 2013 22:59:00 -0000 From: "Joseph S. Myers" To: Subject: Update MIPS dl-lookup.c from generic version Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" X-SW-Source: 2013-12/txt/msg00000.txt.bz2 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), 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 joseph@codesourcery.com