diff --git a/.gitignore b/.gitignore
index fa75199..40d3687 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/glibc-2.13-fedora.tar.xz
-/glibc-2.13.tar.xz
 /glibc-ports-2.12-54-gbd44238.tar.xz
+/glibc-2.13-6-g3321010-fedora.tar.xz
+/glibc-2.13-6-g3321010.tar.xz
diff --git a/glibc-fedora.patch b/glibc-fedora.patch
index 5d66794..c978701 100644
--- a/glibc-fedora.patch
+++ b/glibc-fedora.patch
@@ -1,6 +1,6 @@
---- glibc-2.13/ChangeLog
-+++ glibc-2.13-1/ChangeLog
-@@ -285,6 +285,11 @@
+--- glibc-2.13-6-g3321010/ChangeLog
++++ glibc-2.13.90-1/ChangeLog
+@@ -322,6 +322,11 @@
  
  	* sysdeps/unix/sysv/linux/sys/swap.h (SWAP_FLAG_DISCARD): Define.
  
@@ -12,19 +12,7 @@
  2010-11-11  Andreas Schwab  <schwab@redhat.com>
  
  	* posix/fnmatch_loop.c (NEW_PATTERN): Fix use of alloca.
-@@ -606,6 +611,11 @@
- 	* string/str-two-way.h (two_way_long_needle): Always clear memory
- 	when skipping input due to the shift table.
- 
-+2010-10-05  Andreas Schwab  <schwab@redhat.com>
-+
-+	* sysdeps/posix/getaddrinfo.c (gaih_inet): Don't discard result of
-+	decoding ACE if AI_CANONIDN.
-+
- 2010-10-03  Ulrich Drepper  <drepper@gmail.com>
- 
- 	[BZ #12005]
-@@ -648,6 +658,34 @@
+@@ -685,6 +690,34 @@
  	* sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS):
  	Mask out sign-bit copies when constructing f_fsid.
  
@@ -59,7 +47,7 @@
  2010-09-24  Petr Baudis <pasky@suse.cz>
  
  	* debug/stack_chk_fail_local.c: Add missing licence exception.
-@@ -1439,6 +1477,32 @@
+@@ -1476,6 +1509,28 @@
  	call returning > 0 value.
  	* sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise.
  
@@ -85,14 +73,10 @@
 +	* elf/dl-close.c (_dl_close_worker): Reset private search list if
 +	it wasn't used.
 +
-+2010-06-21  Andreas Schwab  <schwab@redhat.com>
-+
-+	* sysdeps/i386/i686/Makefile: Don't pass -mtune to assembler.
-+
  2010-06-07  Andreas Schwab  <schwab@redhat.com>
  
  	* dlfcn/Makefile: Remove explicit dependencies on libc.so and
-@@ -1491,6 +1555,24 @@
+@@ -1528,6 +1583,24 @@
  	* hurd/hurd/fd.h (__file_name_lookup_at): Update comment.
  	* sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS.
  
@@ -117,8 +101,8 @@
  2010-05-28  Luis Machado  <luisgpm@br.ibm.com>
  
  	* sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi.
---- glibc-2.13/ChangeLog.15
-+++ glibc-2.13-1/ChangeLog.15
+--- glibc-2.13-6-g3321010/ChangeLog.15
++++ glibc-2.13.90-1/ChangeLog.15
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub@redhat.com>
@@ -184,8 +168,8 @@
  2004-08-30  Roland McGrath  <roland@frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-2.13/ChangeLog.16
-+++ glibc-2.13-1/ChangeLog.16
+--- glibc-2.13-6-g3321010/ChangeLog.16
++++ glibc-2.13.90-1/ChangeLog.16
 @@ -2042,6 +2042,9 @@
  	(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
  	followed by __THROW.
@@ -239,8 +223,8 @@
  2005-07-28  Thomas Schwinge  <schwinge@nic-nac-project.de>
  
  	[BZ #1137]
---- glibc-2.13/ChangeLog.17
-+++ glibc-2.13-1/ChangeLog.17
+--- glibc-2.13-6-g3321010/ChangeLog.17
++++ glibc-2.13.90-1/ChangeLog.17
 @@ -256,6 +256,12 @@
  
  	* Makerules (libc-abis): Fix search for libc-abis in add-ons.
@@ -319,8 +303,8 @@
  2006-12-09  Ulrich Drepper  <drepper@redhat.com>
  
  	[BZ #3632]
---- glibc-2.13/Makeconfig
-+++ glibc-2.13-1/Makeconfig
+--- glibc-2.13-6-g3321010/Makeconfig
++++ glibc-2.13.90-1/Makeconfig
 @@ -789,12 +789,12 @@ endif
  # The assembler can generate debug information too.
  ifndef ASFLAGS
@@ -337,8 +321,8 @@
  
  ifndef BUILD_CC
  BUILD_CC = $(CC)
---- glibc-2.13/csu/Makefile
-+++ glibc-2.13-1/csu/Makefile
+--- glibc-2.13-6-g3321010/csu/Makefile
++++ glibc-2.13.90-1/csu/Makefile
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -349,8 +333,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-2.13/csu/elf-init.c
-+++ glibc-2.13-1/csu/elf-init.c
+--- glibc-2.13-6-g3321010/csu/elf-init.c
++++ glibc-2.13.90-1/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;
@@ -375,8 +359,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-2.13/debug/tst-chk1.c
-+++ glibc-2.13-1/debug/tst-chk1.c
+--- glibc-2.13-6-g3321010/debug/tst-chk1.c
++++ glibc-2.13.90-1/debug/tst-chk1.c
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -405,8 +389,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-2.13/elf/Makefile
-+++ glibc-2.13-1/elf/Makefile
+--- glibc-2.13-6-g3321010/elf/Makefile
++++ glibc-2.13.90-1/elf/Makefile
 @@ -89,6 +89,7 @@ distribute	:= rtld-Rules \
  		   unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \
  		   unload6mod1.c unload6mod2.c unload6mod3.c \
@@ -415,7 +399,7 @@
  		   tst-audit1.c tst-audit2.c tst-audit3.c tst-audit4.c \
  		   tst-auditmod1.c tst-auditmod3a.c tst-auditmod3b.c \
  		   tst-auditmod4a.c tst-auditmod4b.c \
-@@ -129,6 +130,7 @@ include ../Makeconfig
+@@ -132,6 +133,7 @@ include ../Makeconfig
  ifeq ($(unwind-find-fde),yes)
  routines += unwind-dw2-fde-glibc
  shared-only-routines += unwind-dw2-fde-glibc
@@ -423,7 +407,7 @@
  endif
  
  before-compile  = $(objpfx)trusted-dirs.h
-@@ -195,7 +197,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
+@@ -198,7 +200,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
  	 tst-align tst-align2 $(tests-execstack-$(have-z-execstack)) \
  	 tst-dlmodcount tst-dlopenrpath tst-deep1 \
  	 tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \
@@ -431,26 +415,26 @@
 +	 unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \
  	 tst-audit1 tst-audit2 \
  	 tst-stackguard1 tst-addr1 tst-thrlock \
- 	 tst-unique1 tst-unique2
-@@ -248,6 +250,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
+ 	 tst-unique1 tst-unique2 \
+@@ -252,6 +254,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
  		unload4mod1 unload4mod2 unload4mod3 unload4mod4 \
  		unload6mod1 unload6mod2 unload6mod3 \
  		unload7mod1 unload7mod2 \
 +		unload8mod1 unload8mod1x unload8mod2 unload8mod3 \
  		order2mod1 order2mod2 order2mod3 order2mod4 \
  		tst-unique1mod1 tst-unique1mod2 \
- 		tst-unique2mod1 tst-unique2mod2
-@@ -531,6 +534,9 @@ $(objpfx)unload6mod2.so: $(libdl)
+ 		tst-unique2mod1 tst-unique2mod2 \
+@@ -538,6 +541,9 @@ $(objpfx)unload6mod2.so: $(libdl)
  $(objpfx)unload6mod3.so: $(libdl)
  $(objpfx)unload7mod1.so: $(libdl)
  $(objpfx)unload7mod2.so: $(objpfx)unload7mod1.so
 +$(objpfx)unload8mod1.so: $(objpfx)unload8mod2.so
 +$(objpfx)unload8mod2.so: $(objpfx)unload8mod3.so
 +$(objpfx)unload8mod3.so: $(libdl)
- 
- LDFLAGS-tst-tlsmod5.so = -nostdlib
- LDFLAGS-tst-tlsmod6.so = -nostdlib
-@@ -832,6 +838,9 @@ $(objpfx)unload7: $(libdl)
+ $(objpfx)tst-initordera2.so: $(objpfx)tst-initordera1.so
+ $(objpfx)tst-initorderb2.so: $(objpfx)tst-initorderb1.so $(objpfx)tst-initordera2.so
+ $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb1.so
+@@ -844,6 +850,9 @@ $(objpfx)unload7: $(libdl)
  $(objpfx)unload7.out: $(objpfx)unload7mod1.so $(objpfx)unload7mod2.so
  unload7-ENV = MALLOC_PERTURB_=85
  
@@ -460,8 +444,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.13/elf/dl-close.c
-+++ glibc-2.13-1/elf/dl-close.c
+--- glibc-2.13-6-g3321010/elf/dl-close.c
++++ glibc-2.13.90-1/elf/dl-close.c
 @@ -421,6 +421,13 @@ _dl_close_worker (struct link_map *map)
  
  	      imap->l_scope_max = new_size;
@@ -476,8 +460,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.13/elf/dl-deps.c
-+++ glibc-2.13-1/elf/dl-deps.c
+--- glibc-2.13-6-g3321010/elf/dl-deps.c
++++ glibc-2.13.90-1/elf/dl-deps.c
 @@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
  		  nneeded * sizeof needed[0]);
  	  atomic_write_barrier ();
@@ -486,7 +470,7 @@
  	}
  
        /* If we have no auxiliary objects just go on to the next map.  */
-@@ -662,6 +663,7 @@ Filters not supported with LD_TRACE_PRELINKING"));
+@@ -674,6 +675,7 @@ Filters not supported with LD_TRACE_PRELINKING"));
    l_initfini[nlist] = NULL;
    atomic_write_barrier ();
    map->l_initfini = l_initfini;
@@ -494,8 +478,8 @@
    if (l_reldeps != NULL)
      {
        atomic_write_barrier ();
---- glibc-2.13/elf/dl-init.c
-+++ glibc-2.13-1/elf/dl-init.c
+--- glibc-2.13-6-g3321010/elf/dl-init.c
++++ glibc-2.13.90-1/elf/dl-init.c
 @@ -24,11 +24,9 @@
  /* Type of the initializer.  */
  typedef void (*init_t) (int, char **, char **);
@@ -518,8 +502,8 @@
 -#endif
  }
  INTDEF (_dl_init)
---- glibc-2.13/elf/dl-libc.c
-+++ glibc-2.13-1/elf/dl-libc.c
+--- glibc-2.13-6-g3321010/elf/dl-libc.c
++++ glibc-2.13.90-1/elf/dl-libc.c
 @@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
  
    for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
@@ -546,8 +530,8 @@
  	}
  
        if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
---- glibc-2.13/elf/dl-object.c
-+++ glibc-2.13-1/elf/dl-object.c
+--- glibc-2.13-6-g3321010/elf/dl-object.c
++++ glibc-2.13.90-1/elf/dl-object.c
 @@ -220,6 +220,9 @@ _dl_new_object (char *realname, const char *libname, int type,
      out:
        new->l_origin = origin;
@@ -558,8 +542,8 @@
  
    return new;
  }
---- glibc-2.13/elf/dl-support.c
-+++ glibc-2.13-1/elf/dl-support.c
+--- glibc-2.13-6-g3321010/elf/dl-support.c
++++ glibc-2.13.90-1/elf/dl-support.c
 @@ -81,10 +81,8 @@ unsigned long long _dl_load_adds;
     create a fake scope containing nothing.  */
  struct r_scope_elem _dl_initial_searchlist;
@@ -571,8 +555,8 @@
  
  /* Random data provided by the kernel.  */
  void *_dl_random;
---- glibc-2.13/elf/ldconfig.c
-+++ glibc-2.13-1/elf/ldconfig.c
+--- glibc-2.13-6-g3321010/elf/ldconfig.c
++++ glibc-2.13.90-1/elf/ldconfig.c
 @@ -1031,17 +1031,19 @@ search_dirs (void)
  
  
@@ -654,8 +638,8 @@
      }
  
    const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;
---- glibc-2.13/elf/rtld.c
-+++ glibc-2.13-1/elf/rtld.c
+--- glibc-2.13-6-g3321010/elf/rtld.c
++++ glibc-2.13.90-1/elf/rtld.c
 @@ -107,7 +107,6 @@ static struct audit_list
    struct audit_list *next;
  } *audit_list;
@@ -713,8 +697,8 @@
    if (! prelinked && rtld_multiple_ref)
      {
        /* There was an explicit ref to the dynamic linker as a shared lib.
---- glibc-2.13/elf/tst-stackguard1.c
-+++ glibc-2.13-1/elf/tst-stackguard1.c
+--- glibc-2.13-6-g3321010/elf/tst-stackguard1.c
++++ glibc-2.13.90-1/elf/tst-stackguard1.c
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -739,8 +723,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.13/elf/unload8.c
-+++ glibc-2.13-1/elf/unload8.c
+--- glibc-2.13-6-g3321010/elf/unload8.c
++++ glibc-2.13.90-1/elf/unload8.c
 @@ -0,0 +1,33 @@
 +#include <dlfcn.h>
 +#include <stdio.h>
@@ -775,8 +759,8 @@
 +
 +  return 0;
 +}
---- glibc-2.13/elf/unload8mod1.c
-+++ glibc-2.13-1/elf/unload8mod1.c
+--- glibc-2.13-6-g3321010/elf/unload8mod1.c
++++ glibc-2.13.90-1/elf/unload8mod1.c
 @@ -0,0 +1,7 @@
 +extern void mod2 (void);
 +
@@ -785,12 +769,12 @@
 +{
 +  mod2 ();
 +}
---- glibc-2.13/elf/unload8mod1x.c
-+++ glibc-2.13-1/elf/unload8mod1x.c
+--- glibc-2.13-6-g3321010/elf/unload8mod1x.c
++++ glibc-2.13.90-1/elf/unload8mod1x.c
 @@ -0,0 +1 @@
 +int mod1x;
---- glibc-2.13/elf/unload8mod2.c
-+++ glibc-2.13-1/elf/unload8mod2.c
+--- glibc-2.13-6-g3321010/elf/unload8mod2.c
++++ glibc-2.13.90-1/elf/unload8mod2.c
 @@ -0,0 +1,7 @@
 +extern void mod3 (void);
 +
@@ -799,8 +783,8 @@
 +{
 +  mod3 ();
 +}
---- glibc-2.13/elf/unload8mod3.c
-+++ glibc-2.13-1/elf/unload8mod3.c
+--- glibc-2.13-6-g3321010/elf/unload8mod3.c
++++ glibc-2.13.90-1/elf/unload8mod3.c
 @@ -0,0 +1,27 @@
 +#include <dlfcn.h>
 +#include <stdio.h>
@@ -829,16 +813,16 @@
 +
 +  atexit (mod3_fini);
 +}
---- glibc-2.13/include/bits/stdlib-ldbl.h
-+++ glibc-2.13-1/include/bits/stdlib-ldbl.h
+--- glibc-2.13-6-g3321010/include/bits/stdlib-ldbl.h
++++ glibc-2.13.90-1/include/bits/stdlib-ldbl.h
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-2.13/include/bits/wchar-ldbl.h
-+++ glibc-2.13-1/include/bits/wchar-ldbl.h
+--- glibc-2.13-6-g3321010/include/bits/wchar-ldbl.h
++++ glibc-2.13.90-1/include/bits/wchar-ldbl.h
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-2.13/include/features.h
-+++ glibc-2.13-1/include/features.h
+--- glibc-2.13-6-g3321010/include/features.h
++++ glibc-2.13.90-1/include/features.h
 @@ -309,8 +309,13 @@
  #endif
  
@@ -855,8 +839,8 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-2.13/include/link.h
-+++ glibc-2.13-1/include/link.h
+--- glibc-2.13-6-g3321010/include/link.h
++++ glibc-2.13.90-1/include/link.h
 @@ -192,6 +192,9 @@ struct link_map
  						 during LD_TRACE_PRELINKING=1
  						 contains any DT_SYMBOLIC
@@ -867,16 +851,16 @@
  
      /* Collected information about own RPATH directories.  */
      struct r_search_path_struct l_rpath_dirs;
---- glibc-2.13/include/sys/resource.h
-+++ glibc-2.13-1/include/sys/resource.h
+--- glibc-2.13-6-g3321010/include/sys/resource.h
++++ glibc-2.13.90-1/include/sys/resource.h
 @@ -13,4 +13,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.13/inet/Makefile
-+++ glibc-2.13-1/inet/Makefile
+--- glibc-2.13-6-g3321010/inet/Makefile
++++ glibc-2.13.90-1/inet/Makefile
 @@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \
  
  include ../Rules
@@ -886,8 +870,8 @@
  ifeq ($(have-thread-library),yes)
  
  CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions
---- glibc-2.13/intl/locale.alias
-+++ glibc-2.13-1/intl/locale.alias
+--- glibc-2.13-6-g3321010/intl/locale.alias
++++ glibc-2.13.90-1/intl/locale.alias
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -897,8 +881,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-2.13/libio/stdio.h
-+++ glibc-2.13-1/libio/stdio.h
+--- glibc-2.13-6-g3321010/libio/stdio.h
++++ glibc-2.13.90-1/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.  */
@@ -912,8 +896,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-2.13/locale/iso-4217.def
-+++ glibc-2.13-1/locale/iso-4217.def
+--- glibc-2.13-6-g3321010/locale/iso-4217.def
++++ glibc-2.13.90-1/locale/iso-4217.def
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -1005,8 +989,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-2.13/locale/programs/locarchive.c
-+++ glibc-2.13-1/locale/programs/locarchive.c
+--- glibc-2.13-6-g3321010/locale/programs/locarchive.c
++++ glibc-2.13.90-1/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;
@@ -1065,8 +1049,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-2.13/localedata/ChangeLog
-+++ glibc-2.13-1/localedata/ChangeLog
+--- glibc-2.13-6-g3321010/localedata/ChangeLog
++++ glibc-2.13.90-1/localedata/ChangeLog
 @@ -1,3 +1,8 @@
 +2010-12-08  Andreas Schwab  <schwab@redhat.com>
 +
@@ -1076,8 +1060,8 @@
  2010-05-17  Andreas Schwab  <schwab@redhat.com>
  
  	* locales/es_CR (LC_ADDRESS): Fix character names in lang_ab.
---- glibc-2.13/localedata/Makefile
-+++ glibc-2.13-1/localedata/Makefile
+--- glibc-2.13-6-g3321010/localedata/Makefile
++++ glibc-2.13.90-1/localedata/Makefile
 @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -1086,8 +1070,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-2.13/localedata/SUPPORTED
-+++ glibc-2.13-1/localedata/SUPPORTED
+--- glibc-2.13-6-g3321010/localedata/SUPPORTED
++++ glibc-2.13.90-1/localedata/SUPPORTED
 @@ -46,8 +46,8 @@ ar_TN.UTF-8/UTF-8 \
  ar_TN/ISO-8859-6 \
  ar_YE.UTF-8/UTF-8 \
@@ -1151,8 +1135,8 @@
  ug_CN/UTF-8 \
  uk_UA.UTF-8/UTF-8 \
  uk_UA/KOI8-U \
---- glibc-2.13/localedata/locales/cy_GB
-+++ glibc-2.13-1/localedata/locales/cy_GB
+--- glibc-2.13-6-g3321010/localedata/locales/cy_GB
++++ glibc-2.13.90-1/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>"
@@ -1167,8 +1151,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-2.13/localedata/locales/en_GB
-+++ glibc-2.13-1/localedata/locales/en_GB
+--- glibc-2.13-6-g3321010/localedata/locales/en_GB
++++ glibc-2.13.90-1/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>"
@@ -1180,8 +1164,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.13/localedata/locales/no_NO
-+++ glibc-2.13-1/localedata/locales/no_NO
+--- glibc-2.13-6-g3321010/localedata/locales/no_NO
++++ glibc-2.13.90-1/localedata/locales/no_NO
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -1252,8 +1236,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-2.13/localedata/locales/zh_TW
-+++ glibc-2.13-1/localedata/locales/zh_TW
+--- glibc-2.13-6-g3321010/localedata/locales/zh_TW
++++ glibc-2.13.90-1/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -1281,8 +1265,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-2.13/malloc/mcheck.c
-+++ glibc-2.13-1/malloc/mcheck.c
+--- glibc-2.13-6-g3321010/malloc/mcheck.c
++++ glibc-2.13.90-1/malloc/mcheck.c
 @@ -25,10 +25,26 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -1359,8 +1343,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-2.13/manual/libc.texinfo
-+++ glibc-2.13-1/manual/libc.texinfo
+--- glibc-2.13-6-g3321010/manual/libc.texinfo
++++ glibc-2.13.90-1/manual/libc.texinfo
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -1370,8 +1354,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-2.13/misc/sys/cdefs.h
-+++ glibc-2.13-1/misc/sys/cdefs.h
+--- glibc-2.13-6-g3321010/misc/sys/cdefs.h
++++ glibc-2.13.90-1/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)
@@ -1415,8 +1399,8 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-2.13/nis/Makefile
-+++ glibc-2.13-1/nis/Makefile
+--- glibc-2.13-6-g3321010/nis/Makefile
++++ glibc-2.13.90-1/nis/Makefile
 @@ -69,6 +69,8 @@ libnss_nisplus-inhibit-o = $(filter-out .os,$(object-suffixes))
  
  include ../Rules
@@ -1426,8 +1410,8 @@
  
  $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version)
  $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \
---- glibc-2.13/nis/nss
-+++ glibc-2.13-1/nis/nss
+--- glibc-2.13-6-g3321010/nis/nss
++++ glibc-2.13.90-1/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
@@ -1437,9 +1421,9 @@
  #
  # ADJUNCT_AS_SHADOW
  #  If set to TRUE, the passwd routines in the NIS NSS module will not
---- glibc-2.13/nptl/ChangeLog
-+++ glibc-2.13-1/nptl/ChangeLog
-@@ -3982,6 +3982,15 @@
+--- glibc-2.13-6-g3321010/nptl/ChangeLog
++++ glibc-2.13.90-1/nptl/ChangeLog
+@@ -3991,6 +3991,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1455,7 +1439,7 @@
  2005-07-11  Jakub Jelinek  <jakub@redhat.com>
  
  	[BZ #1102]
-@@ -4718,6 +4727,11 @@
+@@ -4727,6 +4736,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1467,7 +1451,7 @@
  2004-09-02  Ulrich Drepper  <drepper@redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -6792,6 +6806,11 @@
+@@ -6801,6 +6815,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1479,8 +1463,8 @@
  2003-07-25  Jakub Jelinek  <jakub@redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-2.13/nptl/Makefile
-+++ glibc-2.13-1/nptl/Makefile
+--- glibc-2.13-6-g3321010/nptl/Makefile
++++ glibc-2.13.90-1/nptl/Makefile
 @@ -342,7 +342,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1513,8 +1497,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-2.13/nptl/Versions
-+++ glibc-2.13-1/nptl/Versions
+--- glibc-2.13-6-g3321010/nptl/Versions
++++ glibc-2.13.90-1/nptl/Versions
 @@ -30,6 +30,7 @@ libc {
      __libc_alloca_cutoff;
      # Internal libc interface to libpthread
@@ -1523,8 +1507,8 @@
    }
  }
  
---- glibc-2.13/nptl/allocatestack.c
-+++ glibc-2.13-1/nptl/allocatestack.c
+--- glibc-2.13-6-g3321010/nptl/allocatestack.c
++++ glibc-2.13.90-1/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.  */
@@ -1543,8 +1527,8 @@
      }
    while (atomic_compare_and_exchange_bool_acq (&t->cancelhandling,
  					       ch | SETXID_BITMASK, ch));
---- glibc-2.13/nptl/nptl-init.c
-+++ glibc-2.13-1/nptl/nptl-init.c
+--- glibc-2.13-6-g3321010/nptl/nptl-init.c
++++ glibc-2.13.90-1/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.  */
@@ -1554,8 +1538,8 @@
        || limit.rlim_cur == RLIM_INFINITY)
      /* The system limit is not usable.  Use an architecture-specific
         default.  */
---- glibc-2.13/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
-+++ glibc-2.13-1/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+--- glibc-2.13-6-g3321010/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
++++ glibc-2.13.90-1/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
@@ -1564,8 +1548,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-2.13/nptl/sysdeps/unix/sysv/linux/i386/Versions
-+++ glibc-2.13-1/nptl/sysdeps/unix/sysv/linux/i386/Versions
+--- glibc-2.13-6-g3321010/nptl/sysdeps/unix/sysv/linux/i386/Versions
++++ glibc-2.13.90-1/nptl/sysdeps/unix/sysv/linux/i386/Versions
 @@ -0,0 +1,6 @@
 +libc {
 +  GLIBC_PRIVATE {
@@ -1573,8 +1557,8 @@
 +    __uname;
 +  }
 +}
---- glibc-2.13/nptl/sysdeps/unix/sysv/linux/i386/smp.h
-+++ glibc-2.13-1/nptl/sysdeps/unix/sysv/linux/i386/smp.h
+--- glibc-2.13-6-g3321010/nptl/sysdeps/unix/sysv/linux/i386/smp.h
++++ glibc-2.13.90-1/nptl/sysdeps/unix/sysv/linux/i386/smp.h
 @@ -37,7 +37,7 @@ is_smp_system (void)
    char *cp;
  
@@ -1584,8 +1568,8 @@
      cp = u.uts.version;
    else
      {
---- glibc-2.13/nptl/sysdeps/unix/sysv/linux/kernel-features.h
-+++ glibc-2.13-1/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.13-6-g3321010/nptl/sysdeps/unix/sysv/linux/kernel-features.h
++++ glibc-2.13.90-1/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1593,8 +1577,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-2.13/nptl/tst-stackguard1.c
-+++ glibc-2.13-1/nptl/tst-stackguard1.c
+--- glibc-2.13-6-g3321010/nptl/tst-stackguard1.c
++++ glibc-2.13.90-1/nptl/tst-stackguard1.c
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1619,8 +1603,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.13/nscd/nscd.conf
-+++ glibc-2.13-1/nscd/nscd.conf
+--- glibc-2.13-6-g3321010/nscd/nscd.conf
++++ glibc-2.13.90-1/nscd/nscd.conf
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1630,8 +1614,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-2.13/nscd/nscd.init
-+++ glibc-2.13-1/nscd/nscd.init
+--- glibc-2.13-6-g3321010/nscd/nscd.init
++++ glibc-2.13.90-1/nscd/nscd.init
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1708,8 +1692,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-2.13/nss/Makefile
-+++ glibc-2.13-1/nss/Makefile
+--- glibc-2.13-6-g3321010/nss/Makefile
++++ glibc-2.13.90-1/nss/Makefile
 @@ -75,6 +75,7 @@ endif
  
  include ../Rules
@@ -1718,8 +1702,8 @@
  
  ifeq (yes,$(build-static-nss))
  $(objpfx)getent: $(objpfx)libnss_files.a
---- glibc-2.13/nss/nss_files/files-XXX.c
-+++ glibc-2.13-1/nss/nss_files/files-XXX.c
+--- glibc-2.13-6-g3321010/nss/nss_files/files-XXX.c
++++ glibc-2.13.90-1/nss/nss_files/files-XXX.c
 @@ -1,5 +1,5 @@
  /* Common code for file-based databases in nss_files module.
 -   Copyright (C) 1996-1999,2001,2002,2004,2007,2008
@@ -1736,8 +1720,8 @@
    int parse_result;
  
    if (buflen < sizeof *data + 2)
---- glibc-2.13/posix/Makefile
-+++ glibc-2.13-1/posix/Makefile
+--- glibc-2.13-6-g3321010/posix/Makefile
++++ glibc-2.13.90-1/posix/Makefile
 @@ -325,15 +325,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1758,8 +1742,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-2.13/posix/gai.conf
-+++ glibc-2.13-1/posix/gai.conf
+--- glibc-2.13-6-g3321010/posix/gai.conf
++++ glibc-2.13.90-1/posix/gai.conf
 @@ -41,7 +41,7 @@
  #
  # precedence  <mask>   <value>
@@ -1784,8 +1768,8 @@
  #scopev4 ::ffff:0.0.0.0/96       14
 +#
 +#    This is what the Red Hat setting currently uses.
---- glibc-2.13/posix/getconf.speclist.h
-+++ glibc-2.13-1/posix/getconf.speclist.h
+--- glibc-2.13-6-g3321010/posix/getconf.speclist.h
++++ glibc-2.13.90-1/posix/getconf.speclist.h
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1826,8 +1810,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-2.13/posix/regcomp.c
-+++ glibc-2.13-1/posix/regcomp.c
+--- glibc-2.13-6-g3321010/posix/regcomp.c
++++ glibc-2.13.90-1/posix/regcomp.c
 @@ -2745,40 +2745,29 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
  
    /* Local function for parse_bracket_exp used in _LIBC environement.
@@ -1959,8 +1943,8 @@
  	    {
  	      /* No valid character, treat it as a normal
  		 character.  */
---- glibc-2.13/resolv/Makefile
-+++ glibc-2.13-1/resolv/Makefile
+--- glibc-2.13-6-g3321010/resolv/Makefile
++++ glibc-2.13.90-1/resolv/Makefile
 @@ -77,6 +77,7 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \
  	    -Dgetnetbyaddr=res_getnetbyaddr
  
@@ -1969,8 +1953,8 @@
  
  # The BIND code elicits some harmless warnings.
  +cflags += -Wno-strict-prototypes -Wno-write-strings
---- glibc-2.13/resource/getrlimit.c
-+++ glibc-2.13-1/resource/getrlimit.c
+--- glibc-2.13-6-g3321010/resource/getrlimit.c
++++ glibc-2.13.90-1/resource/getrlimit.c
 @@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
    __set_errno (ENOSYS);
    return -1;
@@ -1979,8 +1963,8 @@
  weak_alias (__getrlimit, getrlimit)
  
  stub_warning (getrlimit)
---- glibc-2.13/stdio-common/vfprintf.c
-+++ glibc-2.13-1/stdio-common/vfprintf.c
+--- glibc-2.13-6-g3321010/stdio-common/vfprintf.c
++++ glibc-2.13.90-1/stdio-common/vfprintf.c
 @@ -1160,41 +1160,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
  	else if (!is_long && spec != L_('S'))				      \
  	  {								      \
@@ -2026,8 +2010,8 @@
  	    else							      \
  	      len = strlen (string);					      \
  	  }								      \
---- glibc-2.13/streams/Makefile
-+++ glibc-2.13-1/streams/Makefile
+--- glibc-2.13-6-g3321010/streams/Makefile
++++ glibc-2.13.90-1/streams/Makefile
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -2037,8 +2021,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-2.13/sunrpc/Makefile
-+++ glibc-2.13-1/sunrpc/Makefile
+--- glibc-2.13-6-g3321010/sunrpc/Makefile
++++ glibc-2.13.90-1/sunrpc/Makefile
 @@ -129,6 +129,10 @@ CFLAGS-openchild.c = -fexceptions
  
  CPPFLAGS += -D_RPC_THREAD_SAFE_
@@ -2050,8 +2034,8 @@
  include ../Rules
  
  $(objpfx)rpcgen: $(addprefix $(objpfx),$(rpcgen-objs)) \
---- glibc-2.13/sysdeps/generic/dl-cache.h
-+++ glibc-2.13-1/sysdeps/generic/dl-cache.h
+--- glibc-2.13-6-g3321010/sysdeps/generic/dl-cache.h
++++ glibc-2.13.90-1/sysdeps/generic/dl-cache.h
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -2067,8 +2051,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.13/sysdeps/i386/Makefile
-+++ glibc-2.13-1/sysdeps/i386/Makefile
+--- glibc-2.13-6-g3321010/sysdeps/i386/Makefile
++++ glibc-2.13.90-1/sysdeps/i386/Makefile
 @@ -2,6 +2,8 @@
  # Every i386 port in use uses gas syntax (I think).
  asm-CPPFLAGS += -DGAS_SYNTAX
@@ -2093,30 +2077,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.13/sysdeps/i386/i686/Makefile
-+++ glibc-2.13-1/sysdeps/i386/i686/Makefile
-@@ -9,19 +9,3 @@ stack-align-test-flags += -msse
- ifeq ($(subdir),string)
- sysdep_routines += cacheinfo
- endif
--
--ifeq (yes,$(config-asflags-i686))
--CFLAGS-.o += -Wa,-mtune=i686
--CFLAGS-.os += -Wa,-mtune=i686
--CFLAGS-.op += -Wa,-mtune=i686
--CFLAGS-.og += -Wa,-mtune=i686
--CFLAGS-.ob += -Wa,-mtune=i686
--CFLAGS-.oS += -Wa,-mtune=i686
--
--ASFLAGS-.o += -Wa,-mtune=i686
--ASFLAGS-.os += -Wa,-mtune=i686
--ASFLAGS-.op += -Wa,-mtune=i686
--ASFLAGS-.og += -Wa,-mtune=i686
--ASFLAGS-.ob += -Wa,-mtune=i686
--ASFLAGS-.oS += -Wa,-mtune=i686
--endif
---- glibc-2.13/sysdeps/i386/i686/multiarch/strspn.S
-+++ glibc-2.13-1/sysdeps/i386/i686/multiarch/strspn.S
+--- glibc-2.13-6-g3321010/sysdeps/i386/i686/multiarch/strspn.S
++++ glibc-2.13.90-1/sysdeps/i386/i686/multiarch/strspn.S
 @@ -76,8 +76,8 @@ END(strspn)
  # define ENTRY(name) \
  	.type __strspn_ia32, @function; \
@@ -2128,8 +2090,8 @@
  	CALL_MCOUNT
  # undef END
  # define END(name) \
---- glibc-2.13/sysdeps/ia64/Makefile
-+++ glibc-2.13-1/sysdeps/ia64/Makefile
+--- glibc-2.13-6-g3321010/sysdeps/ia64/Makefile
++++ glibc-2.13.90-1/sysdeps/ia64/Makefile
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -2141,8 +2103,8 @@
  endif
  endif
  
---- glibc-2.13/sysdeps/ia64/ia64libgcc.S
-+++ glibc-2.13-1/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.13-6-g3321010/sysdeps/ia64/ia64libgcc.S
++++ glibc-2.13.90-1/sysdeps/ia64/ia64libgcc.S
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -2494,8 +2456,8 @@
 -	.symver	___multi3, __multi3@GLIBC_2.2
 -
 -#endif
---- glibc-2.13/sysdeps/ia64/libgcc-compat.c
-+++ glibc-2.13-1/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.13-6-g3321010/sysdeps/ia64/libgcc-compat.c
++++ glibc-2.13.90-1/sysdeps/ia64/libgcc-compat.c
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -2581,25 +2543,17 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-2.13/sysdeps/mach/hurd/getrlimit.c
-+++ glibc-2.13-1/sysdeps/mach/hurd/getrlimit.c
+--- glibc-2.13-6-g3321010/sysdeps/mach/hurd/getrlimit.c
++++ glibc-2.13.90-1/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.13/sysdeps/posix/getaddrinfo.c
-+++ glibc-2.13-1/sysdeps/posix/getaddrinfo.c
-@@ -965,6 +965,7 @@ gaih_inet (const char *name, const struct gaih_service *service,
- 		   make a copy.  */
- 		if (out == canon)
- 		  goto make_copy;
-+		canon = out;
- 	      }
- 	    else
- #endif
-@@ -1100,10 +1101,12 @@ static const struct scopeentry
+--- glibc-2.13-6-g3321010/sysdeps/posix/getaddrinfo.c
++++ glibc-2.13.90-1/sysdeps/posix/getaddrinfo.c
+@@ -1101,10 +1101,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 },
@@ -2612,8 +2566,8 @@
      /* Default: scope 14.  */
      { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 }
    };
---- glibc-2.13/sysdeps/powerpc/powerpc64/Makefile
-+++ glibc-2.13-1/sysdeps/powerpc/powerpc64/Makefile
+--- glibc-2.13-6-g3321010/sysdeps/powerpc/powerpc64/Makefile
++++ glibc-2.13.90-1/sysdeps/powerpc/powerpc64/Makefile
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -2622,16 +2576,16 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.13/sysdeps/powerpc/powerpc64/elf/Makefile
-+++ glibc-2.13-1/sysdeps/powerpc/powerpc64/elf/Makefile
+--- glibc-2.13-6-g3321010/sysdeps/powerpc/powerpc64/elf/Makefile
++++ glibc-2.13.90-1/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.13/sysdeps/unix/nice.c
-+++ glibc-2.13-1/sysdeps/unix/nice.c
+--- glibc-2.13-6-g3321010/sysdeps/unix/nice.c
++++ glibc-2.13.90-1/sysdeps/unix/nice.c
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -2646,8 +2600,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-2.13/sysdeps/unix/sysv/linux/check_pf.c
-+++ glibc-2.13-1/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.13-6-g3321010/sysdeps/unix/sysv/linux/check_pf.c
++++ glibc-2.13.90-1/sysdeps/unix/sysv/linux/check_pf.c
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -2663,8 +2617,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-2.13/sysdeps/unix/sysv/linux/dl-osinfo.h
-+++ glibc-2.13-1/sysdeps/unix/sysv/linux/dl-osinfo.h
+--- glibc-2.13-6-g3321010/sysdeps/unix/sysv/linux/dl-osinfo.h
++++ glibc-2.13.90-1/sysdeps/unix/sysv/linux/dl-osinfo.h
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -2712,8 +2666,8 @@
      }
    else
  #endif
---- glibc-2.13/sysdeps/unix/sysv/linux/futimesat.c
-+++ glibc-2.13-1/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.13-6-g3321010/sysdeps/unix/sysv/linux/futimesat.c
++++ glibc-2.13.90-1/sysdeps/unix/sysv/linux/futimesat.c
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -2756,8 +2710,8 @@
      {
        size_t filelen = strlen (file);
        if (__builtin_expect (filelen == 0, 0))
---- glibc-2.13/sysdeps/unix/sysv/linux/getpagesize.c
-+++ glibc-2.13-1/sysdeps/unix/sysv/linux/getpagesize.c
+--- glibc-2.13-6-g3321010/sysdeps/unix/sysv/linux/getpagesize.c
++++ glibc-2.13.90-1/sysdeps/unix/sysv/linux/getpagesize.c
 @@ -28,7 +28,7 @@
  int
  __getpagesize ()
@@ -2767,8 +2721,8 @@
    assert (GLRO(dl_pagesize) != 0);
    return GLRO(dl_pagesize);
  #else
---- glibc-2.13/sysdeps/unix/sysv/linux/i386/dl-cache.h
-+++ glibc-2.13-1/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.13-6-g3321010/sysdeps/unix/sysv/linux/i386/dl-cache.h
++++ glibc-2.13.90-1/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.
@@ -2829,16 +2783,16 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-2.13/sysdeps/unix/sysv/linux/i386/getrlimit.c
-+++ glibc-2.13-1/sysdeps/unix/sysv/linux/i386/getrlimit.c
+--- glibc-2.13-6-g3321010/sysdeps/unix/sysv/linux/i386/getrlimit.c
++++ glibc-2.13.90-1/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.13/sysdeps/unix/sysv/linux/ia64/dl-cache.h
-+++ glibc-2.13-1/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+--- glibc-2.13-6-g3321010/sysdeps/unix/sysv/linux/ia64/dl-cache.h
++++ glibc-2.13.90-1/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2871,29 +2825,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-2.13/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
-+++ glibc-2.13-1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.13-6-g3321010/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
++++ glibc-2.13.90-1/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.13/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
-+++ glibc-2.13-1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.13-6-g3321010/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
++++ glibc-2.13.90-1/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.13/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
-+++ glibc-2.13-1/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.13-6-g3321010/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
++++ glibc-2.13.90-1/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.13/sysdeps/unix/sysv/linux/netlinkaccess.h
-+++ glibc-2.13-1/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.13-6-g3321010/sysdeps/unix/sysv/linux/netlinkaccess.h
++++ glibc-2.13.90-1/sysdeps/unix/sysv/linux/netlinkaccess.h
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -2919,8 +2873,8 @@
  
  struct netlink_res
  {
---- glibc-2.13/sysdeps/unix/sysv/linux/paths.h
-+++ glibc-2.13-1/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.13-6-g3321010/sysdeps/unix/sysv/linux/paths.h
++++ glibc-2.13.90-1/sysdeps/unix/sysv/linux/paths.h
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -2930,8 +2884,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-2.13/sysdeps/unix/sysv/linux/tcsetattr.c
-+++ glibc-2.13-1/sysdeps/unix/sysv/linux/tcsetattr.c
+--- glibc-2.13-6-g3321010/sysdeps/unix/sysv/linux/tcsetattr.c
++++ glibc-2.13.90-1/sysdeps/unix/sysv/linux/tcsetattr.c
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
  {
    struct __kernel_termios k_termios;
@@ -2977,8 +2931,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-2.13/timezone/zic.c
-+++ glibc-2.13-1/timezone/zic.c
+--- glibc-2.13-6-g3321010/timezone/zic.c
++++ glibc-2.13.90-1/timezone/zic.c
 @@ -1921,7 +1921,7 @@ const int			zonecount;
  		if (stdrp != NULL && stdrp->r_hiyear == 2037)
  			return;
diff --git a/glibc.spec b/glibc.spec
index b7b710f..ce18382 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,5 +1,5 @@
-%define glibcsrcdir glibc-2.13
-%define glibcversion 2.13
+%define glibcsrcdir glibc-2.13-6-g3321010
+%define glibcversion 2.13.90
 %define glibcportsdir glibc-ports-2.12-54-gbd44238
 ### glibc.spec.in follows:
 %define run_glibc_tests 1
@@ -1034,6 +1034,11 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Tue Jan 25 2011 Andreas Schwab <schwab@redhat.com> - 2.13.90-1
+- Update from master
+  - Fix ordering of DSO constructors and destructors (BZ#11724)
+- Remove no longer needed assembler workaround
+
 * Tue Jan 18 2011 Andreas Schwab <schwab@redhat.com> - 2.13-1
 - Update to 2.13 release
   - Define AT_NO_AUTOMOUNT
diff --git a/sources b/sources
index 1df768f..8fafd7a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-3d1e20fbe27dde9a14fd577e5e7d68dc  glibc-2.13-fedora.tar.xz
-cc5d8b1b994fb3b870222565c79853ca  glibc-2.13.tar.xz
+11e71635dabc55410f7100fcd18fd47f  glibc-2.13-6-g3321010-fedora.tar.xz
+66c4127428843137291cb14fe0a19345  glibc-2.13-6-g3321010.tar.xz
 62a6f9e2a8d2afb66f7672a2b9a6315c  glibc-ports-2.12-54-gbd44238.tar.xz