From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <libc-hacker-return-8397-listarch-libc-hacker=sources.redhat.com@sources.redhat.com>
Received: (qmail 4413 invoked by alias); 25 Mar 2005 20:02:19 -0000
Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:libc-hacker-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/libc-hacker/>
List-Post: <mailto:libc-hacker@sources.redhat.com>
List-Help: <mailto:libc-hacker-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: libc-hacker-owner@sources.redhat.com
Received: (qmail 4395 invoked from network); 25 Mar 2005 20:02:17 -0000
Received: from unknown (HELO work.mcgary.org) (65.101.185.152)
  by sourceware.org with SMTP; 25 Mar 2005 20:02:17 -0000
Received: from work.mcgary.org (localhost [127.0.0.1])
	by work.mcgary.org (8.12.8/8.12.8) with ESMTP id j2PK1ci2015008;
	Fri, 25 Mar 2005 13:01:38 -0700
Received: (from gkm@localhost)
	by work.mcgary.org (8.12.8/8.12.8/Submit) id j2PK1cvP015004;
	Fri, 25 Mar 2005 13:01:38 -0700
To: Jakub Jelinek <jakub@redhat.com>, Ulrich Drepper <drepper@redhat.com>
Cc: Glibc hackers <libc-hacker@sources.redhat.com>, greg@mcgary.org
Subject: Re: [PATCH] Fix build with latest GCC 4
References: <20050325122715.GL4961@sunsite.mff.cuni.cz>
From: Greg McGary <greg@mcgary.org>
Date: Fri, 25 Mar 2005 20:02:00 -0000
In-Reply-To: <20050325122715.GL4961@sunsite.mff.cuni.cz>
Message-ID: <mswtrvebq5.fsf@mcgary.org>
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.2
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-SW-Source: 2005-03/txt/msg00062.txt.bz2

Jakub Jelinek <jakub@redhat.com> writes:

> Hi!
> 
> wordsize-64/wcstoul_l.c includes generic/wcstoul_l.c which
> in turn includes wordsize-64/wcstol_l.c.  But the aliases
> and libc_hidden_ver for strtol_l.c are not desirable in the ul compilation.

This can also be fixed by short-cutting the diversion through
wordsize-64/wcstol_l.c, by including generic/wcstol_l.c directly from
generic/wcstoul_l.c:

Greg

2005-03-25  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/generic/wcstoul_l.c: Include generic/wcstol_l.c,
        bypassing wordsize-64/wcstol_l.c in the 64-bit case.

Index: wcstoul_l.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/generic/wcstoul_l.c,v
retrieving revision 1.4
diff -u -p -r1.4 wcstoul_l.c
--- wcstoul_l.c	14 Mar 2004 20:58:49 -0000	1.4
+++ wcstoul_l.c	25 Mar 2005 19:25:30 -0000
@@ -27,4 +27,4 @@
 extern unsigned long int ____wcstoul_l_internal (const wchar_t *, wchar_t **,
 						 int, int, __locale_t);
 
-#include <wcstol_l.c>
+#include <sysdeps/generic/wcstol_l.c>