From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1474 invoked by alias); 1 Mar 2011 22:59:38 -0000 Received: (qmail 1465 invoked by uid 22791); 1 Mar 2011 22:59:37 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from mail-iy0-f169.google.com (HELO mail-iy0-f169.google.com) (209.85.210.169) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 01 Mar 2011 22:59:31 +0000 Received: by iyf13 with SMTP id 13so5964435iyf.0 for ; Tue, 01 Mar 2011 14:59:29 -0800 (PST) MIME-Version: 1.0 Received: by 10.42.221.136 with SMTP id ic8mr7721923icb.223.1299020284251; Tue, 01 Mar 2011 14:58:04 -0800 (PST) Received: by 10.42.60.129 with HTTP; Tue, 1 Mar 2011 14:58:04 -0800 (PST) In-Reply-To: References: <4D6BA5F4.1060108@redhat.com> Date: Tue, 01 Mar 2011 22:59:00 -0000 Message-ID: Subject: Re: [patch ld]: Let binutils understand DOS-paths (3 of 4) From: "H.J. Lu" To: Kai Tietz Cc: Nick Clifton , Binutils , Dave Korn Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-IsSubscribed: yes Mailing-List: contact binutils-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sourceware.org X-SW-Source: 2011-03/txt/msg00007.txt.bz2 On Tue, Mar 1, 2011 at 2:42 PM, H.J. Lu wrote: > On Mon, Feb 28, 2011 at 10:39 AM, Kai Tietz wro= te: >> 2011/2/28 Nick Clifton : >>> Hi Kai, >>> >>>> ChangeLog ld/ >>>> 2011-02-27 =A0Kai Tietz >>>> >>>> =A0 =A0 =A0 =A0* emultempl/beos.em (sort_by_file_name): Use filename_(= n)cmp. >>>> =A0 =A0 =A0 =A0* emultempl/elf32.em (gld${EMULATION_NAME}_vercheck): >>>> =A0 =A0 =A0 =A0Likewise. >>>> =A0 =A0 =A0 =A0(gld${EMULATION_NAME}_stat_needed): Likewise. >>>> =A0 =A0 =A0 =A0(gld${EMULATION_NAME}_check_needed): Likewise. >>>> =A0 =A0 =A0 =A0* emultempl/pe.em (gld_${EMULATION_NAME}_after_open): L= ikewise. >>>> =A0 =A0 =A0 =A0(gld_${EMULATION_NAME}_unrecognized_file): Likewise. >>>> =A0 =A0 =A0 =A0* emultempl/pep.em (gld_${EMULATION_NAME}_after_open): = Likewise. >>>> =A0 =A0 =A0 =A0(gld_${EMULATION_NAME}_unrecognized_file): Likewise. >>>> =A0 =A0 =A0 =A0* ldfile.c (ldfile_open_file): Likewise. >>>> =A0 =A0 =A0 =A0* ldlang.c (wild_sort): Likewise. >>>> =A0 =A0 =A0 =A0(lookup_name): Likewise. >>>> =A0 =A0 =A0 =A0(check_excluded_libs): Likewise. >>>> =A0 =A0 =A0 =A0* ldmisc.c (vfinfo): Likewise. >>>> =A0 =A0 =A0 =A0* pe-dll.c (libnamencmp): Likewise. >>>> =A0 =A0 =A0 =A0(auto_export): Likewise. >>>> =A0 =A0 =A0 =A0(pe_dll_generate_implib): Likewise. >>>> =A0 =A0 =A0 =A0* testplug.c (onclaim_file): Likewise. >>> >>> Approved - please apply. >>> >>> Cheers >>> =A0Nick >>> > > This caused: > > http://www.sourceware.org/bugzilla/show_bug.cgi?id=3D12529 > Linker failed to load libldtestplug.so since filename_cmp is undefined. I checked in this patch to revert it. Please make sure that "make check" works on Linux/x86 before making changes like this. Thanks. --=20 H.J. --- diff --git a/ld/ChangeLog b/ld/ChangeLog index 8ed86f3..4f5f2c8 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2011-03-01 H.J. Lu + + PR ld/12529 + * testplug.c: Don't include "filenames.h". + (onclaim_file): Don't use filename_cmp. + 2011-02-28 Kai Tietz * emultempl/beos.em (sort_by_file_name): Use filename_(n)cmp. diff --git a/ld/testplug.c b/ld/testplug.c index 9e1561c..f04df10 100644 --- a/ld/testplug.c +++ b/ld/testplug.c @@ -23,7 +23,6 @@ #include "plugin-api.h" /* For ARRAY_SIZE macro only - we don't link the library itself. */ #include "libiberty.h" -#include "filenames.h" extern enum ld_plugin_status onload (struct ld_plugin_tv *tv); static enum ld_plugin_status onclaim_file (const struct ld_plugin_input_file *file, @@ -520,7 +519,7 @@ onclaim_file (const struct ld_plugin_input_file *file, int *claimed) claim_file_t *claimfile =3D claimfiles_list; while (claimfile) { - if (!filename_cmp (file->name, claimfile->file.name)) + if (!strcmp (file->name, claimfile->file.name)) break; claimfile =3D claimfile->next; }