Updated to glibc-2_3_6

10 files changed, 41 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 06c104f910..5ccedd2052 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2005-11-03  Roland McGrath  <roland@redhat.com>
+
+	* NEWS, version.h (VERSION): 2.3.6.
+	* README.template: Add note about GCC 4 compiler warnings.
+	* README: Regenerated.
+
+2005-10-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/ia64/fpu/libm-symbols.h (WEAK_LIBM_ENTRY): Add "__"
+	prefix to LOCAL_LIBM_ENTRY.
+	(WEAK_LIBM_END): Add "__" prefix to LOCAL_LIBM_END.
+
+2005-10-24  Roland McGrath  <roland@redhat.com>
+
+	[BZ #1534]
+	* include/string.h: Use libc_hidden_proto, not
+	libc_hidden_builtin_proto, for strnlen.
+
 2005-10-22  Roland McGrath  <roland@redhat.com>
 
 	* README.template: Remove GCC 4 note.
diff --git a/NEWS b/NEWS
index 7db8a26c7c..f57db19d22 100644
--- a/NEWS
+++ b/NEWS
@@ -14,7 +14,7 @@ Version 2.3.6
   1087, 1088, 1090, 1091, 1092, 1093, 1094, 1095, 1096, 1097, 1098,
   1099, 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108, 1109,
   1110, 1111, 1112, 1113, 1125, 1137, 1138, 1249, 1250, 1251, 1252,
-  1253, 1254, 1350, 1358, 1394, 1438, 1498
+  1253, 1254, 1350, 1358, 1394, 1438, 1498, 1534
 
   Visit <http://sources.redhat.com/bugzilla/> for the details of each bug.
 
diff --git a/README b/README
index 8323b3e74d..75c28129bf 100644
--- a/README
+++ b/README
@@ -1,10 +1,7 @@
-This directory contains the version 2.3.5 release of the GNU C Library.
+This directory contains the version 2.3.6 release of the GNU C Library.
 Many bugs have been fixed since the last release.
 Some bugs surely remain.
 
-Please note that version 2.3.5 cannot be built with GCC 4!
-The next release will be compatible with the newer compiler.
-
 As of this release, the GNU C library is known to run on the following
 configurations:
 
@@ -31,6 +28,10 @@ no longer supported.  Porting the library is not hard.  If you are
 interested in doing a port, please contact the glibc maintainers;
 see http://www.gnu.org/software/libc/ for more information.
 
+This release can be compiled using GCC 4.0, but you should expect many more
+compiler warnings than using GCC 3.4.  The development version of libc is
+better suited to being built with the most recent GCC versions.
+
 There are some add-ons which can be used together with GNU libc.  They
 are designed in a way to ease the installation by integrating them in
 the libc source tree.  Simply get the add-ons you need and use the
diff --git a/README.template b/README.template
index d501d718df..c9d79a0583 100644
--- a/README.template
+++ b/README.template
@@ -28,6 +28,10 @@ no longer supported.  Porting the library is not hard.  If you are
 interested in doing a port, please contact the glibc maintainers;
 see http://www.gnu.org/software/libc/ for more information.
 
+This release can be compiled using GCC 4.0, but you should expect many more
+compiler warnings than using GCC 3.4.  The development version of libc is
+better suited to being built with the most recent GCC versions.
+
 There are some add-ons which can be used together with GNU libc.  They
 are designed in a way to ease the installation by integrating them in
 the libc source tree.  Simply get the add-ons you need and use the
diff --git a/fedora/branch.mk b/fedora/branch.mk
index ff8558fa35..4f3a3ae4d1 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -3,5 +3,6 @@ glibc-branch := fedora-2_3
 glibc-base := glibc-2_3-branch
 DIST_BRANCH := FC-3
 COLLECTION := dist-fc3-updates-candidate
-fedora-2_3-sync-date := 2005-10-23 01:23 UTC
-fedora-2_3-sync-tag := fedora-glibc-2_3-20051023T0123
+upstream := 2.3.6
+fedora-2_3-sync-date := 2005-11-04 01:01 UTC
+fedora-2_3-sync-tag := glibc-2_3_6
diff --git a/include/string.h b/include/string.h
index 532d5ed333..c196007dcb 100644
--- a/include/string.h
+++ b/include/string.h
@@ -83,6 +83,7 @@ libc_hidden_proto (__strxfrm_l)
 libc_hidden_proto (__strtok_r)
 extern char *__strsep_g (char **__stringp, __const char *__delim);
 libc_hidden_proto (__strsep_g)
+libc_hidden_proto (strnlen)
 
 libc_hidden_builtin_proto (memchr)
 libc_hidden_builtin_proto (memcpy)
@@ -96,7 +97,6 @@ libc_hidden_builtin_proto (strcmp)
 libc_hidden_builtin_proto (strcpy)
 libc_hidden_builtin_proto (strcspn)
 libc_hidden_builtin_proto (strlen)
-libc_hidden_builtin_proto (strnlen)
 libc_hidden_builtin_proto (strncmp)
 libc_hidden_builtin_proto (strncpy)
 libc_hidden_builtin_proto (strpbrk)
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index fa40293697..708e4e9242 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-24  Roland McGrath  <roland@redhat.com>
+
+	* sysdeps/unix/sysv/linux/x86_64/sem_trywait.S: Remove unnecessary
+	versioned_symbol use.
+
 2005-07-11  Jakub Jelinek  <jakub@redhat.com>
 
 	[BZ #1102]
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_trywait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/sem_trywait.S
index 31271bb94c..6b77dfc0d8 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_trywait.S
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/sem_trywait.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -56,4 +56,3 @@ sem_trywait:
 	orl	$-1, %eax
 	retq
 	.size	sem_trywait,.-sem_trywait
-	versioned_symbol(libpthread, __new_sem_trywait, sem_trywait, GLIBC_2_1)
diff --git a/sysdeps/ia64/fpu/libm-symbols.h b/sysdeps/ia64/fpu/libm-symbols.h
index 3d0eb37d2a..5b5e4b7d7b 100644
--- a/sysdeps/ia64/fpu/libm-symbols.h
+++ b/sysdeps/ia64/fpu/libm-symbols.h
@@ -39,13 +39,13 @@
 
 #define WEAK_LIBM_ENTRY(name)			\
 	.align 32;				\
-	LOCAL_LIBM_ENTRY(name);			\
+	LOCAL_LIBM_ENTRY(__##name);		\
 	.global __##name;			\
  __##name:
 #define WEAK_LIBM_END(name)			\
  weak_alias (__##name, name);			\
  .hidden __##name;				\
-	LOCAL_LIBM_END(name);			\
+	LOCAL_LIBM_END(__##name);		\
  ASM_SIZE_DIRECTIVE(__##name);			\
  ASM_TYPE_DIRECTIVE(__##name, @function)
 
diff --git a/version.h b/version.h
index 4d53d7b80d..cae82e28cc 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
 /* This file just defines the current version number of libc.  */
 
 #define RELEASE "stable"
-#define VERSION "2.3.5"
+#define VERSION "2.3.6"