From eb090791c67113f5b85f759f84353461197a5756 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 2 Aug 2006 18:18:00 +0000
Subject: Updated to fedora-glibc-20060802T1808

---
 elf/dl-addr.c        |  2 +-
 fedora/branch.mk     |  4 ++--
 fedora/glibc.spec.in | 12 +++++++++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/elf/dl-addr.c b/elf/dl-addr.c
index 535977ca5e..5d3719adb2 100644
--- a/elf/dl-addr.c
+++ b/elf/dl-addr.c
@@ -83,7 +83,7 @@ _dl_addr (const void *address, Dl_info *info,
 	  for (Elf_Symndx bucket = 0; bucket < match->l_nbuckets; ++bucket)
 	    {
 	      Elf32_Word symndx = match->l_gnu_buckets[bucket];
-	      if (bucket != 0)
+	      if (symndx != 0)
 		{
 		  const Elf32_Word *hasharr = &match->l_gnu_chain_zero[symndx];
 
diff --git a/fedora/branch.mk b/fedora/branch.mk
index b472f8bbf7..502adadffb 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-08-02 16:50 UTC
-fedora-sync-tag := fedora-glibc-20060802T1650
+fedora-sync-date := 2006-08-02 18:08 UTC
+fedora-sync-tag := fedora-glibc-20060802T1808
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 23b28861a0..957a788ed4 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 16
+%define glibcrelease 17
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define xenarches i686 athlon
 %ifarch %{xenarches}
@@ -787,6 +787,9 @@ BuildFlags="-march=%{_target_cpu} -DUSE_CFA_VAL_EXPRESSION"
 %ifarch i686
 BuildFlags="-march=i686 -mtune=pentium4 -DUSE_CFA_VAL_EXPRESSION"
 %endif
+%ifarch i386
+BuildFlags="$BuildFlags -mno-tls-direct-seg-refs"
+%endif
 %ifarch x86_64
 BuildFlags="-DUSE_CFA_VAL_EXPRESSION"
 %endif
@@ -1027,6 +1030,8 @@ for i in $RPM_BUILD_ROOT%{_prefix}/bin/{xtrace,memusage}; do
   cp -a $i $i.tmp
   sed -e 's~=/%{_lib}/libpcprofile.so~=%{_prefix}/%{_lib}/libpcprofile.so~' \
       -e 's~=/%{_lib}/libmemusage.so~=%{_prefix}/%{_lib}/libmemusage.so~' \
+      -e 's~=/\$LIB/libpcprofile.so~=%{_prefix}/$LIB/libpcprofile.so~' \
+      -e 's~=/\$LIB/libmemusage.so~=%{_prefix}/$LIB/libmemusage.so~' \
     $i.tmp > $i
   chmod 755 $i; rm -f $i.tmp
 done
@@ -1433,6 +1438,11 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Wed Aug  2 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-17
+- typo fix for the dladdr patch
+- build i?86 glibc with -mno-tls-direct-seg-refs (#200469)
+- fix memusage and xtrace scripts (#200736)
+
 * Wed Aug  2 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-16
 - fix dladdr on binaries/libraries with only DT_GNU_HASH and no
   DT_HASH (#200635)
-- 
cgit v1.2.3