From 382a296001a6f2490468dd808ad9bd46249f3e6e Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@fedoraproject.org>
Date: Mar 25 2005 12:20:11 +0000
Subject: auto-import glibc-2.3.4-18 on branch devel from glibc-2.3.4-18.src.rpm


---

diff --git a/glibc-fedora.patch b/glibc-fedora.patch
index e69b395..1d0994b 100644
--- a/glibc-fedora.patch
+++ b/glibc-fedora.patch
@@ -1,6 +1,15 @@
 --- glibc-20050324T0715/ChangeLog	24 Mar 2005 00:20:39 -0000	1.9292
-+++ glibc-20050324T0715-fedora/ChangeLog	24 Mar 2005 08:18:28 -0000	1.8782.2.88
-@@ -968,6 +968,18 @@
++++ glibc-20050324T0715-fedora/ChangeLog	25 Mar 2005 11:58:56 -0000	1.8782.2.89
+@@ -1,3 +1,8 @@
++2005-03-25  Jakub Jelinek  <jakub@redhat.com>
++
++	* sysdeps/wordsize-64/strtol_l.c: Don't add aliases if UNSIGNED.
++	* sysdeps/wordsize-64/wcstol_l.c: Likewise.
++
+ 2005-03-23  Jakub Jelinek  <jakub@redhat.com>
+ 
+ 	* nis/ypclnt.c (yp_2_yperr): Revert 2004-11-30 patch.
+@@ -968,6 +973,18 @@
  
  	* scripts/soversions.awk: Fix default version set handling.
  
@@ -3133,30 +3142,25 @@
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
-2005-03-24  Jakub Jelinek  <jakub@redhat.com>
-
-	* sysdeps/wordsize-64/strtol_l.c: Don't add aliases if UNSIGNED.
-	* sysdeps/wordsize-64/wcstol_l.c: Likewise.
-
---- libc/sysdeps/wordsize-64/strtol_l.c.jj	2003-03-03 04:45:12.000000000 -0500
-+++ libc/sysdeps/wordsize-64/strtol_l.c	2005-03-24 08:09:38.970943112 -0500
+--- glibc-20050324T0715/sysdeps/wordsize-64/strtol_l.c	3 Mar 2003 09:45:12 -0000	1.4
++++ glibc-20050324T0715-fedora/sysdeps/wordsize-64/strtol_l.c	25 Mar 2005 11:59:01 -0000	1.4.2.1
 @@ -8,7 +8,9 @@
  #undef ____strtoll_l_internal
  #undef __strtoll_l
  #undef strtoll_l
-+#ifndef UNSIGNED
++#if !UNSIGNED
  strong_alias (____strtol_l_internal, ____strtoll_l_internal)
  libc_hidden_ver (____strtol_l_internal, ____strtoll_l_internal)
  weak_alias (__strtol_l, __strtoll_l)
  weak_alias (__strtol_l, strtoll_l)
 +#endif
---- libc/sysdeps/wordsize-64/wcstol_l.c.jj	2002-08-08 07:44:51.000000000 -0400
-+++ libc/sysdeps/wordsize-64/wcstol_l.c	2005-03-24 08:09:02.632875928 -0500
+--- glibc-20050324T0715/sysdeps/wordsize-64/wcstol_l.c	8 Aug 2002 11:44:51 -0000	1.4
++++ glibc-20050324T0715-fedora/sysdeps/wordsize-64/wcstol_l.c	25 Mar 2005 11:59:01 -0000	1.4.2.1
 @@ -8,6 +8,8 @@
  #undef ____wcstoll_l_internal
  #undef __wcstoll_l
  #undef wcstoll_l
-+#ifndef UNSIGNED
++#if !UNSIGNED
  strong_alias (____wcstol_l_internal, ____wcstoll_l_internal)
  weak_alias (__wcstol_l, __wcstoll_l)
  weak_alias (__wcstol_l, wcstoll_l)
diff --git a/glibc.spec b/glibc.spec
index 51ffad2..2a1c787 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,7 +1,7 @@
 %define glibcdate 20050324T0715
 %define glibcname glibc
 %define glibcversion 2.3.4
-%define glibcrelease 17
+%define glibcrelease 18
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64
@@ -1278,6 +1278,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Fri Mar 25 2005 Jakub Jelinek <jakub@redhat.com> 2.3.4-18
+- fix build on 64-bit arches with new GCC
+
 * Thu Mar 24 2005 Jakub Jelinek <jakub@redhat.com> 2.3.4-17
 - update from CVS
   - fix LD_AUDIT in LinuxThreads ld.so
diff --git a/sources b/sources
index 3e3dade..c2bf21d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 094f0a506082c395c44868109871cf89  glibc-20050324T0715.tar.bz2
-8db05af4f98f83078d0b9d89248cb2a3  glibc-fedora-20050324T0715.tar.bz2
+e0f737658ef41f394d3db0b12eeb526e  glibc-fedora-20050324T0715.tar.bz2