Updated to fedora-glibc-20061103T1610

14 files changed, 165 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index 5964c01527..e5f9d7d13f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
+2006-11-02  Ulrich Drepper  <drepper@redhat.com>
+
+	* configure.in: Work around ld --help change and avoid -z relro
+	test completely if the architecture doesn't care about security.
+
+2006-11-01  Ulrich Drepper  <drepper@redhat.com>
+
+	* po/sv.po: Update from translation team.
+
+2006-10-31  Ulrich Drepper  <drepper@redhat.com>
+
+	* stdlib/atexit.c (atexit): Don't mark as hidden when used to
+	generate compatibility version.
+
 2006-10-29  Ulrich Drepper  <drepper@redhat.com>
 
+	* configure.in: Relax -z relro requirement a bit.
+
 	* po/sv.po: Update from translation team.
 
 2006-10-29  Jakub Jelinek  <jakub@redhat.com>
diff --git a/configure b/configure
index b04bf8b71d..0f00394f03 100755
--- a/configure
+++ b/configure
@@ -5629,7 +5629,9 @@ fi
 echo "$as_me:$LINENO: result: $libc_cv_z_initfirst" >&5
 echo "${ECHO_T}$libc_cv_z_initfirst" >&6
 
-  echo "$as_me:$LINENO: checking for -z relro option" >&5
+  case "$base_machine" in
+    i[34567]86 | x86_64 | powerpc* | s390* | sparc* | alpha*)
+      echo "$as_me:$LINENO: checking for -z relro option" >&5
 echo $ECHO_N "checking for -z relro option... $ECHO_C" >&6
 if test "${libc_cv_z_relro+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5655,11 +5657,14 @@ else
 fi
 echo "$as_me:$LINENO: result: $libc_cv_z_relro" >&5
 echo "${ECHO_T}$libc_cv_z_relro" >&6
-  if test $libc_cv_z_relro != yes; then
-    { { echo "$as_me:$LINENO: error: linker with -z relro support required" >&5
+      if test "$libc_cv_z_relro" = no; then
+        { { echo "$as_me:$LINENO: error: linker with -z relro support required" >&5
 echo "$as_me: error: linker with -z relro support required" >&2;}
    { (exit 1); exit 1; }; }
-  fi
+      fi
+      ;;
+    *) ;;
+   esac
 
   echo "$as_me:$LINENO: checking for -Bgroup option" >&5
 echo $ECHO_N "checking for -Bgroup option... $ECHO_C" >&6
diff --git a/configure.in b/configure.in
index fb43804b1f..71ceb04b33 100644
--- a/configure.in
+++ b/configure.in
@@ -1436,8 +1436,12 @@ EOF
   fi
   rm -f conftest*])
 
-  AC_CACHE_CHECK(for -z relro option,
-		 libc_cv_z_relro, [dnl
+  case "$base_machine" in
+changequote(,)dnl
+    i[34567]86 | x86_64 | powerpc* | s390* | sparc* | alpha*)
+changequote([,])dnl
+      AC_CACHE_CHECK(for -z relro option,
+		     libc_cv_z_relro, [dnl
   libc_cv_z_relro=no
   if AC_TRY_COMMAND([${CC-cc} -v --help 2>&1|grep "z relro" 1>&AS_MESSAGE_LOG_FD])
   then
@@ -1446,9 +1450,12 @@ EOF
       libc_cv_z_relro=yes
     fi
   fi])
-  if test $libc_cv_z_relro != yes; then
-    AC_MSG_ERROR(linker with -z relro support required)
-  fi
+      if test "$libc_cv_z_relro" = no; then
+        AC_MSG_ERROR(linker with -z relro support required)
+      fi
+      ;;
+    *) ;;
+   esac
 
   AC_CACHE_CHECK(for -Bgroup option,
 		 libc_cv_Bgroup, [dnl
diff --git a/fedora/branch.mk b/fedora/branch.mk
index ae06ce3ee7..040e9efd2d 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -3,5 +3,5 @@ glibc-branch := fedora
 glibc-base := HEAD
 DIST_BRANCH := devel
 COLLECTION := dist-fc4
-fedora-sync-date := 2006-10-29 21:55 UTC
-fedora-sync-tag := fedora-glibc-20061029T2155
+fedora-sync-date := 2006-11-03 16:10 UTC
+fedora-sync-tag := fedora-glibc-20061103T1610
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index e3fe59977e..4b1b31cb9e 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 3
+%define glibcrelease 4
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define xenarches i686 athlon
 %ifarch %{xenarches}
@@ -904,6 +904,7 @@ librtso=`basename $RPM_BUILD_ROOT/%{_lib}/librt.so.*`
 
 %ifarch %{rtkaioarches}
 rm -f $RPM_BUILD_ROOT{,%{_prefix}}/%{_lib}/librtkaio.so*
+rm -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/librt.so.*
 mkdir -p $RPM_BUILD_ROOT/%{_lib}/rtkaio
 mv $RPM_BUILD_ROOT/%{_lib}/librtkaio-*.so $RPM_BUILD_ROOT/%{_lib}/rtkaio/
 rm -f $RPM_BUILD_ROOT/%{_lib}/$librtso
@@ -1528,6 +1529,13 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Fri Nov  3 2006 Jakub Jelinek <jakub@redhat.com> 2.5.90-4
+- fix atexit backwards compatibility (#213388)
+- add mai_IN locale (#213415)
+- remove bogus %{_libdir}/librt.so.1 symlink (#213555)
+- fix memusage (#213656)
+- change libc.info category (#209493)
+
 * Sun Oct 29 2006 Jakub Jelinek <jakub@redhat.com> 2.5.90-3
 - fix suid/sgid binaries on i?86/x86_64 (#212723)
 
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index f805ee8c01..2d13f941dd 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,10 @@
+2006-11-02  Ulrich Drepper  <drepper@redhat.com>
+
+	* locales/mai_IN: New file.
+	Provided by Rajesh Ranjan <rajeshkajha@yahoo.com>.
+
+	* SUPPORTED: Add mai_IN/UTF-8.
+
 2006-10-12  Ulrich Drepper  <drepper@redhat.com>
 
 	[BZ #3320]
diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED
index 80f5efe72f..b66c9ea232 100644
--- a/localedata/SUPPORTED
+++ b/localedata/SUPPORTED
@@ -255,6 +255,7 @@ lt_LT.UTF-8/UTF-8 \
 lt_LT/ISO-8859-13 \
 lv_LV.UTF-8/UTF-8 \
 lv_LV/ISO-8859-13 \
+mai_IN/UTF-8 \
 mg_MG.UTF-8/UTF-8 \
 mg_MG/ISO-8859-15 \
 mi_NZ.UTF-8/UTF-8 \
diff --git a/localedata/locales/mai_IN b/localedata/locales/mai_IN
new file mode 100644
index 0000000000..32bd127211
--- /dev/null
+++ b/localedata/locales/mai_IN
@@ -0,0 +1,84 @@
+comment_char    %
+escape_char     /
+% Maithili language locale for India.
+% Contributed by Rajesh Ranjan <rajeshkajha@yahoo.com> and
+% Sangeeta Kumari <sangeeta09@gmail.com>.
+
+LC_IDENTIFICATION
+title      "Maithili language locale for India"
+source     "Maithili Computing Research Center, Pune, India"
+address    "B-3/302, Lunkad Daffodills, Viman Nagar, Pune, India"
+contact    ""
+email      "rajeshkajha@yahoo.com"
+tel        ""
+fax        ""
+language   "Maithili"
+territory  "India"
+revision   "1.0"
+date       "2006-11-01"
+%
+category  "mai_IN:2006";LC_IDENTIFICATION
+category  "mai_IN:2006";LC_CTYPE
+category  "mai_IN:2006";LC_COLLATE
+category  "mai_IN:2006";LC_TIME
+category  "mai_IN:2006";LC_NUMERIC
+category  "mai_IN:2006";LC_MONETARY
+category  "mai_IN:2006";LC_MESSAGES
+category  "mai_IN:2006";LC_PAPER
+category  "mai_IN:2006";LC_NAME
+category  "mai_IN:2006";LC_ADDRESS
+category  "mai_IN:2006";LC_TELEPHONE
+
+END LC_IDENTIFICATION
+
+LC_CTYPE
+copy "hi_IN"
+END LC_CTYPE
+
+LC_COLLATE
+copy "hi_IN"
+END LC_COLLATE
+
+LC_MONETARY
+copy "hi_IN"
+END LC_MONETARY
+
+
+LC_NUMERIC
+copy "hi_IN"
+END LC_NUMERIC
+
+
+LC_TIME
+copy "hi_IN"
+END LC_TIME
+
+
+LC_MESSAGES
+copy "hi_IN"
+END LC_MESSAGES
+
+
+LC_PAPER
+copy "hi_IN"
+END LC_PAPER
+
+
+LC_NAME
+copy "hi_IN"
+END LC_NAME
+
+
+LC_ADDRESS
+copy "hi_IN"
+END LC_ADDRESS
+
+
+LC_TELEPHONE
+copy "hi_IN"
+END LC_TELEPHONE
+
+
+LC_MEASUREMENT
+copy "hi_IN"
+END LC_MEASUREMENT
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index baf3d4ea4d..ac3ddfff9b 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-30  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/ia64/pthread_spin_unlock.c (pthread_spin_unlock): Use
+	__sync_lock_release instead of __sync_lock_release_si.
+
 2006-10-29  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/sysv/linux/i386/sysdep-cancel.h (RTLD_SINGLE_THREAD_P):
diff --git a/nptl/sysdeps/ia64/pthread_spin_unlock.c b/nptl/sysdeps/ia64/pthread_spin_unlock.c
index 6232764b13..50d9c5f6a8 100644
--- a/nptl/sysdeps/ia64/pthread_spin_unlock.c
+++ b/nptl/sysdeps/ia64/pthread_spin_unlock.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
 
@@ -23,6 +23,6 @@
 int
 pthread_spin_unlock (pthread_spinlock_t *lock)
 {
-  __sync_lock_release_si ((int *) lock);
+  __sync_lock_release ((int *) lock);
   return 0;
 }
diff --git a/nptl_db/ChangeLog b/nptl_db/ChangeLog
index f96ab04b86..3a8c3c68e8 100644
--- a/nptl_db/ChangeLog
+++ b/nptl_db/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-26  Pete Eberlein  <eberlein@us.ibm.com>
+
+	* nptl_db/db_info.c [TLS_DTV_AT_TP]: Fixed size init for dtvp
+	to sizeof a pointer, instead of sizeof the union.
+
 2006-10-27  Ulrich Drepper  <drepper@redhat.com>
 
 	* structs.def: USE_TLS support is now default.
diff --git a/nptl_db/db_info.c b/nptl_db/db_info.c
index 5000b99ba5..6d5eb4b1d8 100644
--- a/nptl_db/db_info.c
+++ b/nptl_db/db_info.c
@@ -59,7 +59,7 @@ typedef struct link_map link_map;
    i.e. at the very end of the area covered by TLS_PRE_TCB_SIZE.  */
 DESC (_thread_db_pthread_dtvp,
       TLS_PRE_TCB_SIZE + offsetof (tcbhead_t, dtv)
-      - (TLS_TCB_SIZE == 0 ? sizeof (tcbhead_t) : 0), union dtv)
+      - (TLS_TCB_SIZE == 0 ? sizeof (tcbhead_t) : 0), union dtv *)
 #endif
 
 
diff --git a/po/sv.po b/po/sv.po
index ed2e18f17c..37a6af79b9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,13 +1,13 @@
 # GNU libc message catalog for swedish
 # Copyright © 1996, 1998, 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 # Jan Djärv <jan.h.d@swipnet.se>, 1996, 1998, 2001, 2002, 2003, 2006.
-# Revision: 1.50
+# Revision: 1.51
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: libc 2.5\n"
 "POT-Creation-Date: 2006-09-29 11:38-0700\n"
-"PO-Revision-Date: 2006-10-29 19:03+0100\n"
+"PO-Revision-Date: 2006-11-01 08:40+0100\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
@@ -487,7 +487,7 @@ msgstr "kan inte skapa kopia av RUNPATH/RPATH"
 
 #: elf/dl-load.c:659
 msgid "cannot create search path array"
-msgstr "kan inte skapa säkvägslista"
+msgstr "kan inte skapa sökvägslista"
 
 #: elf/dl-load.c:870
 msgid "cannot stat shared object"
@@ -551,7 +551,7 @@ msgstr "delat objekt kan inte göras dlopen() på"
 
 #: elf/dl-load.c:1372
 msgid "cannot allocate memory for program header"
-msgstr "Kan inte allokera minne för programhuvud"
+msgstr "kan inte allokera minne för programhuvud"
 
 #: elf/dl-load.c:1389 elf/dl-open.c:174
 msgid "invalid caller"
@@ -579,11 +579,11 @@ msgstr "ogiltigt ELF-huvud"
 
 #: elf/dl-load.c:1704
 msgid "ELF file data encoding not big-endian"
-msgstr "Kodning för ELF-fildata är inte \"big-endian\""
+msgstr "Kodning för ELF-fildata är inte rak byteordning"
 
 #: elf/dl-load.c:1706
 msgid "ELF file data encoding not little-endian"
-msgstr "Kodning för ELF-fildata är inte \"little-endian\""
+msgstr "Kodning för ELF-fildata är inte omvänd byteordning"
 
 #: elf/dl-load.c:1710
 msgid "ELF file version ident does not match current one"
@@ -721,11 +721,11 @@ msgstr "Generera inte länkar"
 
 #: elf/ldconfig.c:137
 msgid "Change to and use ROOT as root directory"
-msgstr "Byt till och använd ROOT som rotkatalog"
+msgstr "Byt till och använd ROT som rotkatalog"
 
 #: elf/ldconfig.c:137
 msgid "ROOT"
-msgstr "ROOT"
+msgstr "ROT"
 
 #: elf/ldconfig.c:138
 msgid "CACHE"
@@ -869,7 +869,7 @@ msgstr "bibliotek %s och %s i katalog %s har samma \"soname\" men olika typ."
 #: elf/ldconfig.c:995
 #, c-format
 msgid "Can't open configuration file %s"
-msgstr "Kan inte öppna konfigurationsfil \"%s\""
+msgstr "Kan inte öppna konfigurationsfil %s"
 
 #: elf/ldconfig.c:1059
 #, c-format
@@ -884,7 +884,7 @@ msgstr "%s:%u: hwcap-index %lu är större än maximum %u"
 #: elf/ldconfig.c:1072 elf/ldconfig.c:1080
 #, c-format
 msgid "%s:%u: hwcap index %lu already defined as %s"
-msgstr "%s:%u: hwcap-index %lu redan definierad som %s"
+msgstr "%s:%u: hwcap-index %lu redan definierat som %s"
 
 #: elf/ldconfig.c:1083
 #, c-format
diff --git a/stdlib/atexit.c b/stdlib/atexit.c
index 0575dda03b..256c5fcfc0 100644
--- a/stdlib/atexit.c
+++ b/stdlib/atexit.c
@@ -43,7 +43,9 @@ extern void *__dso_handle __attribute__ ((__weak__));
 
 /* Register FUNC to be executed by `exit'.  */
 int
+#ifndef atexit
 attribute_hidden
+#endif
 atexit (void (*func) (void))
 {
   return __cxa_atexit ((void (*) (void *)) func, NULL,