2.12.90-8

2010-08-23 14:09:35 +02:00 · 2010-08-23 14:09:35 +02:00 · 20e565a20a
commit 20e565a20a
parent 98c76af435
4 changed files with 223 additions and 207 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,3 @@
-glibc-2.12-85-g73507d3-fedora.tar.xz
-glibc-2.12-85-g73507d3.tar.xz
-glibc-ports-2.12-12-g71feaf7.tar.xz
+/glibc-2.12-118-ga7ab6ec-fedora.tar.xz
+/glibc-2.12-118-ga7ab6ec.tar.xz
+/glibc-ports-2.12-25-g9ed28e4.tar.xz
--- a/glibc-fedora.patch
+++ b/glibc-fedora.patch
@ -1,6 +1,6 @@
--- glibc-2.12-85-g73507d3/ChangeLog
-+++ glibc-2.12.90-7/ChangeLog
-@@ -108,6 +108,17 @@
+--- glibc-2.12-118-ga7ab6ec/ChangeLog
+++ glibc-2.12.90-8/ChangeLog
+@@ -425,6 +425,17 @@
 	* sysdeps/powerpc/powerpc64/power6/fpu/s_copysign.S: New file.
 	* sysdeps/powerpc/powerpc64/power6/fpu/s_copysignf.S: New file.
 
@ -18,7 +18,7 @@
 2010-07-09  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/fpathconf.c (__fpathconf): Use __fcntl not
-@@ -238,6 +249,32 @@
+@@ -555,6 +566,32 @@
 	call returning > 0 value.
 	* sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise.
 
@ -51,7 +51,7 @@
 2010-06-07  Andreas Schwab  <schwab@redhat.com>
 
 	* dlfcn/Makefile: Remove explicit dependencies on libc.so and
-@@ -290,6 +327,24 @@
+@@ -607,6 +644,24 @@
 	* hurd/hurd/fd.h (__file_name_lookup_at): Update comment.
 	* sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS.
 
@ -76,8 +76,8 @@
 2010-05-28  Luis Machado  <luisgpm@br.ibm.com>
 
 	* sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi.
--- glibc-2.12-85-g73507d3/ChangeLog.15
-+++ glibc-2.12.90-7/ChangeLog.15
+--- glibc-2.12-118-ga7ab6ec/ChangeLog.15
+++ glibc-2.12.90-8/ChangeLog.15
@@ -477,6 +477,14 @@
 
 2004-11-26  Jakub Jelinek  <jakub@redhat.com>
@ -143,8 +143,8 @@
 2004-08-30  Roland McGrath  <roland@frob.com>
 
 	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
--- glibc-2.12-85-g73507d3/ChangeLog.16
-+++ glibc-2.12.90-7/ChangeLog.16
+--- glibc-2.12-118-ga7ab6ec/ChangeLog.16
+++ glibc-2.12.90-8/ChangeLog.16
@@ -2042,6 +2042,9 @@
 	(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
 	followed by __THROW.
@ -198,8 +198,8 @@
 2005-07-28  Thomas Schwinge  <schwinge@nic-nac-project.de>
 
 	[BZ #1137]
--- glibc-2.12-85-g73507d3/ChangeLog.17
-+++ glibc-2.12.90-7/ChangeLog.17
+--- glibc-2.12-118-ga7ab6ec/ChangeLog.17
+++ glibc-2.12.90-8/ChangeLog.17
@@ -256,6 +256,12 @@
 
 	* Makerules (libc-abis): Fix search for libc-abis in add-ons.
@ -284,8 +284,8 @@
 2006-12-09  Ulrich Drepper  <drepper@redhat.com>
 
 	[BZ #3632]
--- glibc-2.12-85-g73507d3/Makeconfig
-+++ glibc-2.12.90-7/Makeconfig
+--- glibc-2.12-118-ga7ab6ec/Makeconfig
+++ glibc-2.12.90-8/Makeconfig
@@ -789,12 +789,12 @@ endif
 # The assembler can generate debug information too.
 ifndef ASFLAGS
@ -302,8 +302,8 @@
 
 ifndef BUILD_CC
 BUILD_CC = $(CC)
--- glibc-2.12-85-g73507d3/csu/Makefile
-+++ glibc-2.12.90-7/csu/Makefile
+--- glibc-2.12-118-ga7ab6ec/csu/Makefile
+++ glibc-2.12.90-8/csu/Makefile
@@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
 $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
 	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@ -314,8 +314,8 @@
 
 vpath initfini.c $(sysdirs)
 
--- glibc-2.12-85-g73507d3/csu/elf-init.c
-+++ glibc-2.12.90-7/csu/elf-init.c
+--- glibc-2.12-118-ga7ab6ec/csu/elf-init.c
+++ glibc-2.12.90-8/csu/elf-init.c
@@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **)
 extern void (*__fini_array_start []) (void) attribute_hidden;
 extern void (*__fini_array_end []) (void) attribute_hidden;
@ -340,8 +340,8 @@
 
 /* These function symbols are provided for the .init/.fini section entry
    points automagically by the linker.  */
--- glibc-2.12-85-g73507d3/debug/tst-chk1.c
-+++ glibc-2.12.90-7/debug/tst-chk1.c
+--- glibc-2.12-118-ga7ab6ec/debug/tst-chk1.c
+++ glibc-2.12.90-8/debug/tst-chk1.c
@@ -17,6 +17,9 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
@ -370,8 +370,8 @@
 #  define O 0
 # else
 #  define O 1
--- glibc-2.12-85-g73507d3/debug/vdprintf_chk.c
-+++ glibc-2.12.90-7/debug/vdprintf_chk.c
+--- glibc-2.12-118-ga7ab6ec/debug/vdprintf_chk.c
+++ glibc-2.12.90-8/debug/vdprintf_chk.c
@@ -50,10 +50,10 @@ __vdprintf_chk (int d, int flags, const char *format, va_list arg)
       INTUSE(_IO_un_link) (&tmpfil);
       return EOF;
@ -387,8 +387,8 @@
 
   /* For flags > 0 (i.e. __USE_FORTIFY_LEVEL > 1) request that %n
      can only come from read-only format strings.  */
--- glibc-2.12-85-g73507d3/elf/Makefile
-+++ glibc-2.12.90-7/elf/Makefile
+--- glibc-2.12-118-ga7ab6ec/elf/Makefile
+++ glibc-2.12.90-8/elf/Makefile
@@ -89,6 +89,7 @@ distribute	:= rtld-Rules \
 		   unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \
 		   unload6mod1.c unload6mod2.c unload6mod3.c \
@ -442,8 +442,8 @@
 ifdef libdl
 $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a
 $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so
--- glibc-2.12-85-g73507d3/elf/dl-close.c
-+++ glibc-2.12.90-7/elf/dl-close.c
+--- glibc-2.12-118-ga7ab6ec/elf/dl-close.c
+++ glibc-2.12.90-8/elf/dl-close.c
@@ -421,6 +421,13 @@ _dl_close_worker (struct link_map *map)
 
 	      imap->l_scope_max = new_size;
@ -458,8 +458,8 @@
 
 	  /* The loader is gone, so mark the object as not having one.
 	     Note: l_idx != IDX_STILL_USED -> object will be removed.  */
--- glibc-2.12-85-g73507d3/elf/dl-init.c
-+++ glibc-2.12.90-7/elf/dl-init.c
+--- glibc-2.12-118-ga7ab6ec/elf/dl-init.c
+++ glibc-2.12.90-8/elf/dl-init.c
@@ -24,11 +24,9 @@
 /* Type of the initializer.  */
 typedef void (*init_t) (int, char **, char **);
@ -482,8 +482,8 @@
 -#endif
 }
 INTDEF (_dl_init)
--- glibc-2.12-85-g73507d3/elf/dl-support.c
-+++ glibc-2.12.90-7/elf/dl-support.c
+--- glibc-2.12-118-ga7ab6ec/elf/dl-support.c
+++ glibc-2.12.90-8/elf/dl-support.c
@@ -80,10 +80,8 @@ unsigned long long _dl_load_adds;
    create a fake scope containing nothing.  */
 struct r_scope_elem _dl_initial_searchlist;
@ -495,8 +495,8 @@
 
 /* Random data provided by the kernel.  */
 void *_dl_random;
--- glibc-2.12-85-g73507d3/elf/ldconfig.c
-+++ glibc-2.12.90-7/elf/ldconfig.c
+--- glibc-2.12-118-ga7ab6ec/elf/ldconfig.c
+++ glibc-2.12.90-8/elf/ldconfig.c
@@ -1031,17 +1031,19 @@ search_dirs (void)
 
 
@ -578,8 +578,8 @@
     }
 
   const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;
--- glibc-2.12-85-g73507d3/elf/rtld.c
-+++ glibc-2.12.90-7/elf/rtld.c
+--- glibc-2.12-118-ga7ab6ec/elf/rtld.c
+++ glibc-2.12.90-8/elf/rtld.c
@@ -106,7 +106,6 @@ static struct audit_list
   struct audit_list *next;
 } *audit_list;
@ -607,8 +607,8 @@
 
   if (*user_entry == (ElfW(Addr)) ENTRY_POINT)
     {
--- glibc-2.12-85-g73507d3/elf/tst-stackguard1.c
-+++ glibc-2.12.90-7/elf/tst-stackguard1.c
+--- glibc-2.12-118-ga7ab6ec/elf/tst-stackguard1.c
+++ glibc-2.12.90-8/elf/tst-stackguard1.c
@@ -160,17 +160,21 @@ do_test (void)
      the 16 runs, something is very wrong.  */
   int ndifferences = 0;
@ -633,8 +633,8 @@
     {
       puts ("stack guard canaries are not randomized enough");
       puts ("nor equal to the default canary value");
--- glibc-2.12-85-g73507d3/elf/unload8.c
-+++ glibc-2.12.90-7/elf/unload8.c
+--- glibc-2.12-118-ga7ab6ec/elf/unload8.c
+++ glibc-2.12.90-8/elf/unload8.c
@@ -0,0 +1,33 @@
 +#include <dlfcn.h>
 +#include <stdio.h>
@ -669,8 +669,8 @@
 +
 +  return 0;
 +}
--- glibc-2.12-85-g73507d3/elf/unload8mod1.c
-+++ glibc-2.12.90-7/elf/unload8mod1.c
+--- glibc-2.12-118-ga7ab6ec/elf/unload8mod1.c
+++ glibc-2.12.90-8/elf/unload8mod1.c
@@ -0,0 +1,7 @@
 +extern void mod2 (void);
 +
@ -679,12 +679,12 @@
 +{
 +  mod2 ();
 +}
--- glibc-2.12-85-g73507d3/elf/unload8mod1x.c
-+++ glibc-2.12.90-7/elf/unload8mod1x.c
+--- glibc-2.12-118-ga7ab6ec/elf/unload8mod1x.c
+++ glibc-2.12.90-8/elf/unload8mod1x.c
@@ -0,0 +1 @@
 +int mod1x;
--- glibc-2.12-85-g73507d3/elf/unload8mod2.c
-+++ glibc-2.12.90-7/elf/unload8mod2.c
+--- glibc-2.12-118-ga7ab6ec/elf/unload8mod2.c
+++ glibc-2.12.90-8/elf/unload8mod2.c
@@ -0,0 +1,7 @@
 +extern void mod3 (void);
 +
@ -693,8 +693,8 @@
 +{
 +  mod3 ();
 +}
--- glibc-2.12-85-g73507d3/elf/unload8mod3.c
-+++ glibc-2.12.90-7/elf/unload8mod3.c
+--- glibc-2.12-118-ga7ab6ec/elf/unload8mod3.c
+++ glibc-2.12.90-8/elf/unload8mod3.c
@@ -0,0 +1,27 @@
 +#include <dlfcn.h>
 +#include <stdio.h>
@ -723,16 +723,16 @@
 +
 +  atexit (mod3_fini);
 +}
--- glibc-2.12-85-g73507d3/include/bits/stdlib-ldbl.h
-+++ glibc-2.12.90-7/include/bits/stdlib-ldbl.h
+--- glibc-2.12-118-ga7ab6ec/include/bits/stdlib-ldbl.h
+++ glibc-2.12.90-8/include/bits/stdlib-ldbl.h
@@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
--- glibc-2.12-85-g73507d3/include/bits/wchar-ldbl.h
-+++ glibc-2.12.90-7/include/bits/wchar-ldbl.h
+--- glibc-2.12-118-ga7ab6ec/include/bits/wchar-ldbl.h
+++ glibc-2.12.90-8/include/bits/wchar-ldbl.h
@@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
--- glibc-2.12-85-g73507d3/include/features.h
-+++ glibc-2.12.90-7/include/features.h
+--- glibc-2.12-118-ga7ab6ec/include/features.h
+++ glibc-2.12.90-8/include/features.h
@@ -308,8 +308,13 @@
 #endif
 
@ -749,16 +749,16 @@
 #  define __USE_FORTIFY_LEVEL 2
 # else
 #  define __USE_FORTIFY_LEVEL 1
--- glibc-2.12-85-g73507d3/include/sys/resource.h
-+++ glibc-2.12.90-7/include/sys/resource.h
+--- glibc-2.12-118-ga7ab6ec/include/sys/resource.h
+++ glibc-2.12.90-8/include/sys/resource.h
@@ -12,4 +12,5 @@ extern int __getrusage (enum __rusage_who __who, struct rusage *__usage)
 
 extern int __setrlimit (enum __rlimit_resource __resource,
 			const struct rlimit *__rlimits);
 +libc_hidden_proto (__getrlimit)
 #endif
--- glibc-2.12-85-g73507d3/inet/Makefile
-+++ glibc-2.12.90-7/inet/Makefile
+--- glibc-2.12-118-ga7ab6ec/inet/Makefile
+++ glibc-2.12.90-8/inet/Makefile
@@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \
 
 include ../Rules
@ -768,8 +768,8 @@
 ifeq ($(have-thread-library),yes)
 
 CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions
--- glibc-2.12-85-g73507d3/intl/locale.alias
-+++ glibc-2.12.90-7/intl/locale.alias
+--- glibc-2.12-118-ga7ab6ec/intl/locale.alias
+++ glibc-2.12.90-8/intl/locale.alias
@@ -57,8 +57,6 @@ korean		ko_KR.eucKR
 korean.euc 	ko_KR.eucKR
 ko_KR		ko_KR.eucKR
@ -779,8 +779,8 @@
 norwegian       nb_NO.ISO-8859-1
 nynorsk		nn_NO.ISO-8859-1
 polish          pl_PL.ISO-8859-2
--- glibc-2.12-85-g73507d3/libio/iofdopen.c
-+++ glibc-2.12.90-7/libio/iofdopen.c
+--- glibc-2.12-118-ga7ab6ec/libio/iofdopen.c
+++ glibc-2.12.90-8/libio/iofdopen.c
@@ -172,9 +172,8 @@ _IO_new_fdopen (fd, mode)
     }
   new_f->fp.file._flags &= ~_IO_DELETE_DONT_CLOSE;
@ -793,8 +793,8 @@
 
   return &new_f->fp.file;
 }
--- glibc-2.12-85-g73507d3/libio/iofopncook.c
-+++ glibc-2.12.90-7/libio/iofopncook.c
+--- glibc-2.12-118-ga7ab6ec/libio/iofopncook.c
+++ glibc-2.12.90-8/libio/iofopncook.c
@@ -154,9 +154,8 @@ _IO_cookie_init (struct _IO_cookie_file *cfile, int read_write,
 
   INTUSE(_IO_file_init) (&cfile->__fp);
@ -807,8 +807,8 @@
 
   /* We use a negative number different from -1 for _fileno to mark that
      this special stream is not associated with a real file, but still has
--- glibc-2.12-85-g73507d3/libio/iovdprintf.c
-+++ glibc-2.12.90-7/libio/iovdprintf.c
+--- glibc-2.12-118-ga7ab6ec/libio/iovdprintf.c
+++ glibc-2.12.90-8/libio/iovdprintf.c
@@ -53,10 +53,10 @@ _IO_vdprintf (d, format, arg)
       INTUSE(_IO_un_link) (&tmpfil);
       return EOF;
@ -824,8 +824,8 @@
 
   done = INTUSE(_IO_vfprintf) (&tmpfil.file, format, arg);
 
--- glibc-2.12-85-g73507d3/libio/oldiofdopen.c
-+++ glibc-2.12.90-7/libio/oldiofdopen.c
+--- glibc-2.12-118-ga7ab6ec/libio/oldiofdopen.c
+++ glibc-2.12.90-8/libio/oldiofdopen.c
@@ -130,9 +130,8 @@ _IO_old_fdopen (fd, mode)
     }
   new_f->fp.file._file._flags &= ~_IO_DELETE_DONT_CLOSE;
@ -838,8 +838,8 @@
 
   return (_IO_FILE *) &new_f->fp;
 }
--- glibc-2.12-85-g73507d3/libio/stdio.h
-+++ glibc-2.12.90-7/libio/stdio.h
+--- glibc-2.12-118-ga7ab6ec/libio/stdio.h
+++ glibc-2.12.90-8/libio/stdio.h
@@ -165,10 +165,12 @@ typedef _G_fpos64_t fpos64_t;
 extern struct _IO_FILE *stdin;		/* Standard input stream.  */
 extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@ -853,8 +853,8 @@
 
 __BEGIN_NAMESPACE_STD
 /* Remove file FILENAME.  */
--- glibc-2.12-85-g73507d3/locale/iso-4217.def
-+++ glibc-2.12.90-7/locale/iso-4217.def
+--- glibc-2.12-118-ga7ab6ec/locale/iso-4217.def
+++ glibc-2.12.90-8/locale/iso-4217.def
@@ -8,6 +8,7 @@
  *
  * !!! The list has to be sorted !!!
@ -946,8 +946,8 @@
 DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
 DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
 DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
--- glibc-2.12-85-g73507d3/locale/programs/locarchive.c
-+++ glibc-2.12.90-7/locale/programs/locarchive.c
+--- glibc-2.12-118-ga7ab6ec/locale/programs/locarchive.c
+++ glibc-2.12.90-8/locale/programs/locarchive.c
@@ -134,7 +134,7 @@ create_archive (const char *archivefname, struct locarhandle *ah)
   size_t reserved = RESERVE_MMAP_SIZE;
   int xflags = 0;
@ -1006,8 +1006,8 @@
 add_alias (struct locarhandle *ah, const char *alias, bool replace,
 	   const char *oldname, uint32_t *locrec_offset_p)
 {
--- glibc-2.12-85-g73507d3/localedata/Makefile
-+++ glibc-2.12.90-7/localedata/Makefile
+--- glibc-2.12-118-ga7ab6ec/localedata/Makefile
+++ glibc-2.12.90-8/localedata/Makefile
@@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
 	echo -n '...'; \
 	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@ -1016,8 +1016,8 @@
 		     -i locales/$$input -c -f charmaps/$$charset \
 		     $(addprefix --prefix=,$(install_root)) $$locale; \
 	echo ' done'; \
--- glibc-2.12-85-g73507d3/localedata/SUPPORTED
-+++ glibc-2.12.90-7/localedata/SUPPORTED
+--- glibc-2.12-118-ga7ab6ec/localedata/SUPPORTED
+++ glibc-2.12.90-8/localedata/SUPPORTED
@@ -85,6 +85,7 @@ cy_GB.UTF-8/UTF-8 \
 cy_GB/ISO-8859-14 \
 da_DK.UTF-8/UTF-8 \
@ -1059,8 +1059,8 @@
 ta_IN/UTF-8 \
 te_IN/UTF-8 \
 tg_TJ.UTF-8/UTF-8 \
--- glibc-2.12-85-g73507d3/localedata/locales/cy_GB
-+++ glibc-2.12.90-7/localedata/locales/cy_GB
+--- glibc-2.12-118-ga7ab6ec/localedata/locales/cy_GB
+++ glibc-2.12.90-8/localedata/locales/cy_GB
@@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061><U0077><U0072>";/
 d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
 d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@ -1075,8 +1075,8 @@
 END LC_TIME
 
 LC_MESSAGES
--- glibc-2.12-85-g73507d3/localedata/locales/en_GB
-+++ glibc-2.12.90-7/localedata/locales/en_GB
+--- glibc-2.12-118-ga7ab6ec/localedata/locales/en_GB
+++ glibc-2.12.90-8/localedata/locales/en_GB
@@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/
 d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
 d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@ -1088,8 +1088,8 @@
 date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
 <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
 <U0025><U005A><U0020><U0025><U0059>"
--- glibc-2.12-85-g73507d3/localedata/locales/no_NO
-+++ glibc-2.12.90-7/localedata/locales/no_NO
+--- glibc-2.12-118-ga7ab6ec/localedata/locales/no_NO
+++ glibc-2.12.90-8/localedata/locales/no_NO
@@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@ -1160,8 +1160,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
--- glibc-2.12-85-g73507d3/localedata/locales/zh_TW
-+++ glibc-2.12.90-7/localedata/locales/zh_TW
+--- glibc-2.12-118-ga7ab6ec/localedata/locales/zh_TW
+++ glibc-2.12.90-8/localedata/locales/zh_TW
@@ -1,7 +1,7 @@
 comment_char %
 escape_char /
@ -1189,8 +1189,8 @@
 revision   "0.2"
 date       "2000-08-02"
 %
--- glibc-2.12-85-g73507d3/malloc/mcheck.c
-+++ glibc-2.12.90-7/malloc/mcheck.c
+--- glibc-2.12-118-ga7ab6ec/malloc/mcheck.c
+++ glibc-2.12.90-8/malloc/mcheck.c
@@ -24,9 +24,25 @@
 # include <mcheck.h>
 # include <stdint.h>
@ -1266,8 +1266,8 @@
 
       old_free_hook = __free_hook;
       __free_hook = freehook;
--- glibc-2.12-85-g73507d3/manual/libc.texinfo
-+++ glibc-2.12.90-7/manual/libc.texinfo
+--- glibc-2.12-118-ga7ab6ec/manual/libc.texinfo
+++ glibc-2.12.90-8/manual/libc.texinfo
@@ -5,7 +5,7 @@
 @c setchapternewpage odd
 
@ -1277,8 +1277,8 @@
 @direntry
 * Libc: (libc).                 C library.
 @end direntry
--- glibc-2.12-85-g73507d3/misc/sys/cdefs.h
-+++ glibc-2.12.90-7/misc/sys/cdefs.h
+--- glibc-2.12-118-ga7ab6ec/misc/sys/cdefs.h
+++ glibc-2.12.90-8/misc/sys/cdefs.h
@@ -132,7 +132,10 @@
 #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
 #define __bos0(ptr) __builtin_object_size (ptr, 0)
@ -1322,8 +1322,8 @@
 # define __va_arg_pack() __builtin_va_arg_pack ()
 # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
 #endif
--- glibc-2.12-85-g73507d3/nis/Makefile
-+++ glibc-2.12.90-7/nis/Makefile
+--- glibc-2.12-118-ga7ab6ec/nis/Makefile
+++ glibc-2.12.90-8/nis/Makefile
@@ -69,6 +69,8 @@ libnss_nisplus-inhibit-o = $(filter-out .os,$(object-suffixes))
 
 include ../Rules
@ -1333,8 +1333,8 @@
 
 $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version)
 $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \
--- glibc-2.12-85-g73507d3/nis/nss
-+++ glibc-2.12.90-7/nis/nss
+--- glibc-2.12-118-ga7ab6ec/nis/nss
+++ glibc-2.12.90-8/nis/nss
@@ -25,7 +25,7 @@
 #  memory with every getXXent() call.  Otherwise each getXXent() call
 #  might result into a network communication with the server to get
@ -1344,9 +1344,9 @@
 #
 # ADJUNCT_AS_SHADOW
 #  If set to TRUE, the passwd routines in the NIS NSS module will not
--- glibc-2.12-85-g73507d3/nptl/ChangeLog
-+++ glibc-2.12.90-7/nptl/ChangeLog
-@@ -3926,6 +3926,15 @@
+--- glibc-2.12-118-ga7ab6ec/nptl/ChangeLog
+++ glibc-2.12.90-8/nptl/ChangeLog
+@@ -3947,6 +3947,15 @@
 	Use __sigfillset.  Document that sigfillset does the right thing wrt
 	to SIGSETXID.
 
@ -1362,7 +1362,7 @@
 2005-07-11  Jakub Jelinek  <jakub@redhat.com>
 
 	[BZ #1102]
-@@ -4662,6 +4671,11 @@
+@@ -4683,6 +4692,11 @@
 	Move definition inside libpthread, libc, librt check.  Provide
 	definition for rtld.
 
@ -1374,7 +1374,7 @@
 2004-09-02  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -6736,6 +6750,11 @@
+@@ -6757,6 +6771,11 @@
 
 	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
 
@ -1386,8 +1386,8 @@
 2003-07-25  Jakub Jelinek  <jakub@redhat.com>
 
 	* tst-cancel17.c (do_test): Check if aio_cancel failed.
--- glibc-2.12-85-g73507d3/nptl/Makefile
-+++ glibc-2.12.90-7/nptl/Makefile
+--- glibc-2.12-118-ga7ab6ec/nptl/Makefile
+++ glibc-2.12.90-8/nptl/Makefile
@@ -342,7 +342,8 @@ endif
 extra-objs += $(crti-objs) $(crtn-objs)
 omit-deps += crti crtn
@ -1420,8 +1420,8 @@
 else
 $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
 endif
--- glibc-2.12-85-g73507d3/nptl/Versions
-+++ glibc-2.12.90-7/nptl/Versions
+--- glibc-2.12-118-ga7ab6ec/nptl/Versions
+++ glibc-2.12.90-8/nptl/Versions
@@ -29,6 +29,7 @@ libc {
   GLIBC_PRIVATE {
     # Internal libc interface to libpthread
@ -1430,8 +1430,8 @@
   }
 }
 
--- glibc-2.12-85-g73507d3/nptl/allocatestack.c
-+++ glibc-2.12.90-7/nptl/allocatestack.c
+--- glibc-2.12-118-ga7ab6ec/nptl/allocatestack.c
+++ glibc-2.12.90-8/nptl/allocatestack.c
@@ -994,7 +994,16 @@ setxid_mark_thread (struct xid_command *cmdp, struct pthread *t)
 
       /* If the thread is exiting right now, ignore it.  */
@ -1450,8 +1450,8 @@
     }
   while (atomic_compare_and_exchange_bool_acq (&t->cancelhandling,
 					       ch | SETXID_BITMASK, ch));
--- glibc-2.12-85-g73507d3/nptl/nptl-init.c
-+++ glibc-2.12.90-7/nptl/nptl-init.c
+--- glibc-2.12-118-ga7ab6ec/nptl/nptl-init.c
+++ glibc-2.12.90-8/nptl/nptl-init.c
@@ -396,7 +396,7 @@ __pthread_initialize_minimal_internal (void)
   /* Determine the default allowed stack size.  This is the size used
      in case the user does not specify one.  */
@ -1461,8 +1461,8 @@
       || limit.rlim_cur == RLIM_INFINITY)
     /* The system limit is not usable.  Use an architecture-specific
        default.  */
--- glibc-2.12-85-g73507d3/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
-+++ glibc-2.12.90-7/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+--- glibc-2.12-118-ga7ab6ec/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+++ glibc-2.12.90-8/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
@@ -189,4 +189,7 @@
 /* Typed memory objects are not available.  */
 #define _POSIX_TYPED_MEMORY_OBJECTS	-1
@ -1471,8 +1471,8 @@
 +#define _XOPEN_STREAMS	-1
 +
 #endif /* bits/posix_opt.h */
--- glibc-2.12-85-g73507d3/nptl/sysdeps/unix/sysv/linux/i386/Versions
-+++ glibc-2.12.90-7/nptl/sysdeps/unix/sysv/linux/i386/Versions
+--- glibc-2.12-118-ga7ab6ec/nptl/sysdeps/unix/sysv/linux/i386/Versions
+++ glibc-2.12.90-8/nptl/sysdeps/unix/sysv/linux/i386/Versions
@@ -0,0 +1,6 @@
 +libc {
 +  GLIBC_PRIVATE {
@ -1480,8 +1480,8 @@
 +    __uname;
 +  }
 +}
--- glibc-2.12-85-g73507d3/nptl/sysdeps/unix/sysv/linux/i386/smp.h
-+++ glibc-2.12.90-7/nptl/sysdeps/unix/sysv/linux/i386/smp.h
+--- glibc-2.12-118-ga7ab6ec/nptl/sysdeps/unix/sysv/linux/i386/smp.h
+++ glibc-2.12.90-8/nptl/sysdeps/unix/sysv/linux/i386/smp.h
@@ -37,7 +37,7 @@ is_smp_system (void)
   char *cp;
 
@ -1491,8 +1491,8 @@
     cp = u.uts.version;
   else
     {
--- glibc-2.12-85-g73507d3/nptl/sysdeps/unix/sysv/linux/kernel-features.h
-+++ glibc-2.12.90-7/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.12-118-ga7ab6ec/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+++ glibc-2.12.90-8/nptl/sysdeps/unix/sysv/linux/kernel-features.h
@@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@ -1500,8 +1500,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
--- glibc-2.12-85-g73507d3/nptl/tst-stackguard1.c
-+++ glibc-2.12.90-7/nptl/tst-stackguard1.c
+--- glibc-2.12-118-ga7ab6ec/nptl/tst-stackguard1.c
+++ glibc-2.12.90-8/nptl/tst-stackguard1.c
@@ -190,17 +190,21 @@ do_test (void)
      the 16 runs, something is very wrong.  */
   int ndifferences = 0;
@ -1526,8 +1526,8 @@
     {
       puts ("stack guard canaries are not randomized enough");
       puts ("nor equal to the default canary value");
--- glibc-2.12-85-g73507d3/nscd/nscd.conf
-+++ glibc-2.12.90-7/nscd/nscd.conf
+--- glibc-2.12-118-ga7ab6ec/nscd/nscd.conf
+++ glibc-2.12.90-8/nscd/nscd.conf
@@ -33,7 +33,7 @@
 #	logfile			/var/log/nscd.log
 #	threads			4
@ -1537,8 +1537,8 @@
 #	stat-user		somebody
 	debug-level		0
 #	reload-count		5
--- glibc-2.12-85-g73507d3/nscd/nscd.init
-+++ glibc-2.12.90-7/nscd/nscd.init
+--- glibc-2.12-118-ga7ab6ec/nscd/nscd.init
+++ glibc-2.12.90-8/nscd/nscd.init
@@ -9,6 +9,7 @@
 #		slow naming services like NIS, NIS+, LDAP, or hesiod.
 # processname: /usr/sbin/nscd
@ -1615,9 +1615,9 @@
 	;;
     *)
 	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
--- glibc-2.12-85-g73507d3/nss/Makefile
-+++ glibc-2.12.90-7/nss/Makefile
-@@ -74,6 +74,7 @@ endif
+--- glibc-2.12-118-ga7ab6ec/nss/Makefile
+++ glibc-2.12.90-8/nss/Makefile
+@@ -75,6 +75,7 @@ endif
 
 include ../Rules
 
@ -1625,8 +1625,8 @@
 
 ifeq (yes,$(build-static-nss))
 $(objpfx)getent: $(objpfx)libnss_files.a
--- glibc-2.12-85-g73507d3/posix/Makefile
-+++ glibc-2.12.90-7/posix/Makefile
+--- glibc-2.12-118-ga7ab6ec/posix/Makefile
+++ glibc-2.12.90-8/posix/Makefile
@@ -305,15 +305,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
 	  mv -f $@/$$spec.new $@/$$spec; \
 	done < $(objpfx)getconf.speclist
@ -1647,8 +1647,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 	mv -f $@.new $@
--- glibc-2.12-85-g73507d3/posix/gai.conf
-+++ glibc-2.12.90-7/posix/gai.conf
+--- glibc-2.12-118-ga7ab6ec/posix/gai.conf
+++ glibc-2.12.90-8/posix/gai.conf
@@ -41,7 +41,7 @@
 #
 # precedence  <mask>   <value>
@ -1673,8 +1673,8 @@
 #scopev4 ::ffff:0.0.0.0/96       14
 +#
 +#    This is what the Red Hat setting currently uses.
--- glibc-2.12-85-g73507d3/posix/getconf.speclist.h
-+++ glibc-2.12.90-7/posix/getconf.speclist.h
+--- glibc-2.12-118-ga7ab6ec/posix/getconf.speclist.h
+++ glibc-2.12.90-8/posix/getconf.speclist.h
@@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@ -1715,8 +1715,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
--- glibc-2.12-85-g73507d3/resolv/Makefile
-+++ glibc-2.12.90-7/resolv/Makefile
+--- glibc-2.12-118-ga7ab6ec/resolv/Makefile
+++ glibc-2.12.90-8/resolv/Makefile
@@ -77,6 +77,7 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \
 	    -Dgetnetbyaddr=res_getnetbyaddr
 
@ -1725,8 +1725,8 @@
 
 # The BIND code elicits some harmless warnings.
 +cflags += -Wno-strict-prototypes -Wno-write-strings
--- glibc-2.12-85-g73507d3/resource/getrlimit.c
-+++ glibc-2.12.90-7/resource/getrlimit.c
+--- glibc-2.12-118-ga7ab6ec/resource/getrlimit.c
+++ glibc-2.12.90-8/resource/getrlimit.c
@@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
   __set_errno (ENOSYS);
   return -1;
@ -1735,8 +1735,8 @@
 weak_alias (__getrlimit, getrlimit)
 
 stub_warning (getrlimit)
--- glibc-2.12-85-g73507d3/streams/Makefile
-+++ glibc-2.12.90-7/streams/Makefile
+--- glibc-2.12-118-ga7ab6ec/streams/Makefile
+++ glibc-2.12.90-8/streams/Makefile
@@ -21,7 +21,7 @@
 #
 subdir	:= streams
@ -1746,8 +1746,8 @@
 routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
 
 include ../Rules
--- glibc-2.12-85-g73507d3/sunrpc/Makefile
-+++ glibc-2.12.90-7/sunrpc/Makefile
+--- glibc-2.12-118-ga7ab6ec/sunrpc/Makefile
+++ glibc-2.12.90-8/sunrpc/Makefile
@@ -129,6 +129,10 @@ CFLAGS-openchild.c = -fexceptions
 
 CPPFLAGS += -D_RPC_THREAD_SAFE_
@ -1759,8 +1759,8 @@
 include ../Rules
 
 $(objpfx)rpcgen: $(addprefix $(objpfx),$(rpcgen-objs)) \
--- glibc-2.12-85-g73507d3/sysdeps/generic/dl-cache.h
-+++ glibc-2.12.90-7/sysdeps/generic/dl-cache.h
+--- glibc-2.12-118-ga7ab6ec/sysdeps/generic/dl-cache.h
+++ glibc-2.12.90-8/sysdeps/generic/dl-cache.h
@@ -36,6 +36,14 @@
 # define add_system_dir(dir) add_dir (dir)
 #endif
@ -1776,8 +1776,8 @@
 #define CACHEMAGIC "ld.so-1.7.0"
 
 /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
--- glibc-2.12-85-g73507d3/sysdeps/i386/Makefile
-+++ glibc-2.12.90-7/sysdeps/i386/Makefile
+--- glibc-2.12-118-ga7ab6ec/sysdeps/i386/Makefile
+++ glibc-2.12.90-8/sysdeps/i386/Makefile
@@ -2,6 +2,8 @@
 # Every i386 port in use uses gas syntax (I think).
 asm-CPPFLAGS += -DGAS_SYNTAX
@ -1802,8 +1802,8 @@
 endif
 
 ifeq ($(subdir),elf)
--- glibc-2.12-85-g73507d3/sysdeps/i386/i686/Makefile
-+++ glibc-2.12.90-7/sysdeps/i386/i686/Makefile
+--- glibc-2.12-118-ga7ab6ec/sysdeps/i386/i686/Makefile
+++ glibc-2.12.90-8/sysdeps/i386/i686/Makefile
@@ -9,19 +9,3 @@ stack-align-test-flags += -msse
 ifeq ($(subdir),string)
 sysdep_routines += cacheinfo
@ -1824,8 +1824,8 @@
 -ASFLAGS-.ob += -Wa,-mtune=i686
 -ASFLAGS-.oS += -Wa,-mtune=i686
 -endif
--- glibc-2.12-85-g73507d3/sysdeps/ia64/Makefile
-+++ glibc-2.12.90-7/sysdeps/ia64/Makefile
+--- glibc-2.12-118-ga7ab6ec/sysdeps/ia64/Makefile
+++ glibc-2.12.90-8/sysdeps/ia64/Makefile
@@ -12,8 +12,8 @@ elide-routines.os += hp-timing
 
 ifeq (yes,$(build-shared))
@ -1837,8 +1837,8 @@
 endif
 endif
 
--- glibc-2.12-85-g73507d3/sysdeps/ia64/ia64libgcc.S
-+++ glibc-2.12.90-7/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.12-118-ga7ab6ec/sysdeps/ia64/ia64libgcc.S
+++ glibc-2.12.90-8/sysdeps/ia64/ia64libgcc.S
@@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@ -2190,8 +2190,8 @@
 -	.symver	___multi3, __multi3@GLIBC_2.2
 -
 -#endif
--- glibc-2.12-85-g73507d3/sysdeps/ia64/libgcc-compat.c
-+++ glibc-2.12.90-7/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.12-118-ga7ab6ec/sysdeps/ia64/libgcc-compat.c
+++ glibc-2.12.90-8/sysdeps/ia64/libgcc-compat.c
@@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@ -2277,17 +2277,17 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
--- glibc-2.12-85-g73507d3/sysdeps/mach/hurd/getrlimit.c
-+++ glibc-2.12.90-7/sysdeps/mach/hurd/getrlimit.c
+--- glibc-2.12-118-ga7ab6ec/sysdeps/mach/hurd/getrlimit.c
+++ glibc-2.12.90-8/sysdeps/mach/hurd/getrlimit.c
@@ -44,4 +44,5 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
 
   return 0;
 }
 +libc_hidden_def (__getrlimit)
 weak_alias (__getrlimit, getrlimit)
--- glibc-2.12-85-g73507d3/sysdeps/posix/getaddrinfo.c
-+++ glibc-2.12.90-7/sysdeps/posix/getaddrinfo.c
-@@ -1099,10 +1099,12 @@ static const struct scopeentry
+--- glibc-2.12-118-ga7ab6ec/sysdeps/posix/getaddrinfo.c
+++ glibc-2.12.90-8/sysdeps/posix/getaddrinfo.c
+@@ -1100,10 +1100,12 @@ static const struct scopeentry
     /* Link-local addresses: scope 2.  */
     { { { 169, 254, 0, 0 } }, htonl_c (0xffff0000), 2 },
     { { { 127, 0, 0, 0 } }, htonl_c (0xff000000), 2 },
@ -2300,8 +2300,8 @@
     /* Default: scope 14.  */
     { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 }
   };
--- glibc-2.12-85-g73507d3/sysdeps/powerpc/powerpc64/Makefile
-+++ glibc-2.12.90-7/sysdeps/powerpc/powerpc64/Makefile
+--- glibc-2.12-118-ga7ab6ec/sysdeps/powerpc/powerpc64/Makefile
+++ glibc-2.12.90-8/sysdeps/powerpc/powerpc64/Makefile
@@ -30,6 +30,7 @@ ifneq ($(elf),no)
 # we use -fpic instead which is much better.
 CFLAGS-initfini.s += -fpic -O1
@ -2310,8 +2310,8 @@
 endif
 
 ifeq ($(subdir),elf)
--- glibc-2.12-85-g73507d3/sysdeps/powerpc/powerpc64/dl-machine.h
-+++ glibc-2.12.90-7/sysdeps/powerpc/powerpc64/dl-machine.h
+--- glibc-2.12-118-ga7ab6ec/sysdeps/powerpc/powerpc64/dl-machine.h
+++ glibc-2.12.90-8/sysdeps/powerpc/powerpc64/dl-machine.h
@@ -641,16 +641,14 @@ elf_machine_rela (struct link_map *map,
       value = elf_machine_tprel (map, sym_map, sym, reloc);
       if (dont_expect ((value & 3) != 0))
@ -2331,16 +2331,16 @@
       break;
 
     case R_PPC64_TPREL16:
--- glibc-2.12-85-g73507d3/sysdeps/powerpc/powerpc64/elf/Makefile
-+++ glibc-2.12.90-7/sysdeps/powerpc/powerpc64/elf/Makefile
+--- glibc-2.12-118-ga7ab6ec/sysdeps/powerpc/powerpc64/elf/Makefile
+++ glibc-2.12.90-8/sysdeps/powerpc/powerpc64/elf/Makefile
@@ -9,3 +9,5 @@ CFLAGS-rtld-mempcpy.os = $(no-special-regs)
 CFLAGS-rtld-memmove.os = $(no-special-regs)
 CFLAGS-rtld-memchr.os = $(no-special-regs)
 CFLAGS-rtld-strnlen.os = $(no-special-regs)
 +
 +CFLAGS-gmon-start.c = -fno-strict-aliasing
--- glibc-2.12-85-g73507d3/sysdeps/unix/nice.c
-+++ glibc-2.12.90-7/sysdeps/unix/nice.c
+--- glibc-2.12-118-ga7ab6ec/sysdeps/unix/nice.c
+++ glibc-2.12.90-8/sysdeps/unix/nice.c
@@ -42,7 +42,12 @@ nice (int incr)
 	__set_errno (save);
     }
@ -2355,8 +2355,8 @@
   if (result == -1)
     {
       if (errno == EACCES)
--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/check_pf.c
-+++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.12-118-ga7ab6ec/sysdeps/unix/sysv/linux/check_pf.c
+++ glibc-2.12.90-8/sysdeps/unix/sysv/linux/check_pf.c
@@ -27,13 +27,10 @@
 #include <unistd.h>
 #include <sys/socket.h>
@ -2372,8 +2372,8 @@
 
 #ifndef IFA_F_HOMEADDRESS
 # define IFA_F_HOMEADDRESS 0
--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/dl-osinfo.h
-+++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/dl-osinfo.h
+--- glibc-2.12-118-ga7ab6ec/sysdeps/unix/sysv/linux/dl-osinfo.h
+++ glibc-2.12.90-8/sysdeps/unix/sysv/linux/dl-osinfo.h
@@ -17,10 +17,13 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
@ -2421,8 +2421,8 @@
     }
   else
 #endif
--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/futimesat.c
-+++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.12-118-ga7ab6ec/sysdeps/unix/sysv/linux/futimesat.c
+++ glibc-2.12.90-8/sysdeps/unix/sysv/linux/futimesat.c
@@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
 {
   int result;
@ -2465,8 +2465,8 @@
     {
       size_t filelen = strlen (file);
       if (__builtin_expect (filelen == 0, 0))
--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/getpagesize.c
-+++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/getpagesize.c
+--- glibc-2.12-118-ga7ab6ec/sysdeps/unix/sysv/linux/getpagesize.c
+++ glibc-2.12.90-8/sysdeps/unix/sysv/linux/getpagesize.c
@@ -28,7 +28,7 @@
 int
 __getpagesize ()
@ -2476,8 +2476,8 @@
   assert (GLRO(dl_pagesize) != 0);
   return GLRO(dl_pagesize);
 #else
--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/i386/dl-cache.h
-+++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.12-118-ga7ab6ec/sysdeps/unix/sysv/linux/i386/dl-cache.h
+++ glibc-2.12.90-8/sysdeps/unix/sysv/linux/i386/dl-cache.h
@@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@ -2538,16 +2538,16 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/i386/getrlimit.c
-+++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/i386/getrlimit.c
+--- glibc-2.12-118-ga7ab6ec/sysdeps/unix/sysv/linux/i386/getrlimit.c
+++ glibc-2.12.90-8/sysdeps/unix/sysv/linux/i386/getrlimit.c
@@ -79,4 +79,5 @@ __new_getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
 }
 
 weak_alias (__new_getrlimit, __getrlimit);
 +libc_hidden_weak (__getrlimit)
 versioned_symbol (libc, __new_getrlimit, getrlimit, GLIBC_2_2);
--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/ia64/dl-cache.h
-+++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+--- glibc-2.12-118-ga7ab6ec/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+++ glibc-2.12.90-8/sysdeps/unix/sysv/linux/ia64/dl-cache.h
@@ -22,4 +22,31 @@
 #define _dl_cache_check_flags(flags) \
   ((flags) == _DL_CACHE_DEFAULT_ID)
@ -2580,29 +2580,29 @@
 +  } while (0)
 +
 #include_next <dl-cache.h>
--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
-+++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.12-118-ga7ab6ec/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+++ glibc-2.12.90-8/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
@@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
-+++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.12-118-ga7ab6ec/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+++ glibc-2.12.90-8/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
@@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
-+++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.12-118-ga7ab6ec/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+++ glibc-2.12.90-8/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
@@ -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"_
--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/netlinkaccess.h
-+++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.12-118-ga7ab6ec/sysdeps/unix/sysv/linux/netlinkaccess.h
+++ glibc-2.12.90-8/sysdeps/unix/sysv/linux/netlinkaccess.h
@@ -25,6 +25,24 @@
 
 #include <kernel-features.h>
@ -2628,8 +2628,8 @@
 
 struct netlink_res
 {
--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/paths.h
-+++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.12-118-ga7ab6ec/sysdeps/unix/sysv/linux/paths.h
+++ glibc-2.12.90-8/sysdeps/unix/sysv/linux/paths.h
@@ -62,7 +62,7 @@
 #define	_PATH_TTY	"/dev/tty"
 #define	_PATH_UNIX	"/boot/vmlinux"
@ -2639,13 +2639,13 @@
 #define _PATH_WTMP	"/var/log/wtmp"
 
 /* Provide trailing slash, since mostly used for building pathnames. */
--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c
-+++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c
+--- glibc-2.12-118-ga7ab6ec/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c
+++ glibc-2.12.90-8/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c
@@ -1 +1 @@
 -#include "../../fxstat.c"
 +#include "../../i386/fxstat.c"
--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/tcsetattr.c
-+++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/tcsetattr.c
+--- glibc-2.12-118-ga7ab6ec/sysdeps/unix/sysv/linux/tcsetattr.c
+++ glibc-2.12.90-8/sysdeps/unix/sysv/linux/tcsetattr.c
@@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
 {
   struct __kernel_termios k_termios;
@ -2691,8 +2691,8 @@
 +  return retval;
 }
 libc_hidden_def (tcsetattr)
--- glibc-2.12-85-g73507d3/timezone/zic.c
-+++ glibc-2.12.90-7/timezone/zic.c
+--- glibc-2.12-118-ga7ab6ec/timezone/zic.c
+++ glibc-2.12.90-8/timezone/zic.c
@@ -1921,7 +1921,7 @@ const int			zonecount;
 		if (stdrp != NULL && stdrp->r_hiyear == 2037)
 			return;
--- a/glibc.spec
+++ b/glibc.spec
@ -1,6 +1,6 @@
-%define glibcsrcdir glibc-2.12-85-g73507d3
+%define glibcsrcdir glibc-2.12-118-ga7ab6ec
 %define glibcversion 2.12.90
-%define glibcportsdir glibc-ports-2.12-12-g71feaf7
+%define glibcportsdir glibc-ports-2.12-25-g9ed28e4
 ### glibc.spec.in follows:
 %define run_glibc_tests 1
 %define auxarches athlon sparcv9v sparc64v alphaev6
@ -20,12 +20,11 @@
 %define rtkaioarches %{ix86} x86_64 ia64 ppc ppc64 s390 s390x
 %define debuginfocommonarches alpha alphaev6 sparc sparcv9 sparcv9v sparc64 sparc64v
 %define multiarcharches ppc ppc64 %{ix86} x86_64
-%define portsarches alpha armv5tel

 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 7
+Release: 8
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@ -336,9 +335,6 @@ AddOns=`echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkai
 %ifarch %{rtkaioarches}
 AddOns=,rtkaio$AddOns
 %endif
-%ifarch %{portsarches}
-AddOns=,../%{glibcportsdir}$AddOns
-%endif

 build_nptl()
 {
@ -347,7 +343,10 @@ shift
 rm -rf $builddir
 mkdir $builddir ; cd $builddir
 build_CFLAGS="$BuildFlags -g -O3 $*"
-../configure CC="$GCC" CXX="$GXX" CFLAGS="$build_CFLAGS" \
+# Some configure checks can spuriously fail for some architectures if
+# unwind info is present
+configure_CFLAGS="$build_CFLAGS -fno-asynchronous-unwind-tables"
+../configure CC="$GCC" CXX="$GXX" CFLAGS="$configure_CFLAGS" \
 	--prefix=%{_prefix} \
 	--enable-add-ons=../%{glibcportsdir},nptl$AddOns \
 	--with-headers=%{_prefix}/include $EnableKernel --enable-bind-now \
@ -356,7 +355,8 @@ build_CFLAGS="$BuildFlags -g -O3 $*"
 %ifarch %{multiarcharches}
 	--enable-multi-arch \
 %endif
-	--disable-profile --enable-experimental-malloc --enable-nss-crypt
+	--disable-profile --enable-experimental-malloc --enable-nss-crypt ||
+{ cat config.log; false; }

 make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s

@ -1040,6 +1040,22 @@ rm -f *.filelist*
 %endif

 %changelog
+* Mon Aug 23 2010 Andreas Schwab <schwab@redhat.com> - 2.12.90-8
+- Update from master
+  - Fix static strspn on x86 (#624852)
+  - Various POWER7 optimized string functions
+  - Fix x86 pthread_cond_signal() FUTEX_WAKE_OP fallback
+  - Add optimized strncasecmp versions for x86-64
+  - PowerPC64 ABI fixes
+  - Properly quote output of locale (BZ#11904)
+  - f_flags in statfs implementation
+  - Add support for fanotify_init and fanotify_mask syscalls
+  - Add support for prlimit and prlimit64
+  - Fix IPTOS_CLASS definition (BZ#11903)
+  - Avoid too much stack use in fnmatch (BZ#11883)
+  - x86: Add support for frame pointer less mcount
+- Disable asynchronous-unwind-tables during configure run
+
 * Mon Aug  2 2010 Andreas Schwab <schwab@redhat.com> - 2.12.90-7
 - Update from master
  - Add optimized x86-64 implementation of strnlen and strcaecmp
--- a/6
+++ b/6
@ -1,3 +1,3 @@
-9704d193f6a9e882b832d3ba854b043f  glibc-2.12-85-g73507d3-fedora.tar.xz
-a3d900a2d8d4d6269bd1e4cdb8799c85  glibc-2.12-85-g73507d3.tar.xz
-27f2d898f0de8c19c9d69b959734cba6  glibc-ports-2.12-12-g71feaf7.tar.xz
+4fc0859e066ff721f48435ac39264cd1  glibc-2.12-118-ga7ab6ec-fedora.tar.xz
+d2f09d9d83b6feda30fb0cf70c502622  glibc-2.12-118-ga7ab6ec.tar.xz
+893f29728ee3fec0693287180cb243f6  glibc-ports-2.12-25-g9ed28e4.tar.xz