From 1efe5c5ba4580d2533180700f1e5ee8251a765f9 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Fri, 5 Aug 2011 13:01:14 +0200 Subject: [PATCH] 2.13-2 --- .gitignore | 6 +- glibc-fedora.patch | 448 +++++++++++++++++++++------------------------ glibc.spec | 79 ++++---- sources | 6 +- 4 files changed, 253 insertions(+), 286 deletions(-) diff --git a/.gitignore b/.gitignore index fa75199..a4ffff3 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-13-g943515f-fedora.tar.xz +/glibc-2.13-13-g943515f.tar.xz +/glibc-ports-2.13-5-g4f32a56.tar.xz diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 5d66794..57fe05f 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-13-g943515f/ChangeLog ++++ glibc-2.13-2/ChangeLog +@@ -376,6 +376,11 @@ * sysdeps/unix/sysv/linux/sys/swap.h (SWAP_FLAG_DISCARD): Define. @@ -12,7 +12,7 @@ 2010-11-11 Andreas Schwab * posix/fnmatch_loop.c (NEW_PATTERN): Fix use of alloca. -@@ -606,6 +611,11 @@ +@@ -697,6 +702,11 @@ * string/str-two-way.h (two_way_long_needle): Always clear memory when skipping input due to the shift table. @@ -24,7 +24,7 @@ 2010-10-03 Ulrich Drepper [BZ #12005] -@@ -648,6 +658,34 @@ +@@ -739,6 +749,34 @@ * sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS): Mask out sign-bit copies when constructing f_fsid. @@ -59,7 +59,7 @@ 2010-09-24 Petr Baudis * debug/stack_chk_fail_local.c: Add missing licence exception. -@@ -1439,6 +1477,32 @@ +@@ -1530,6 +1568,32 @@ call returning > 0 value. * sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise. @@ -92,7 +92,7 @@ 2010-06-07 Andreas Schwab * dlfcn/Makefile: Remove explicit dependencies on libc.so and -@@ -1491,6 +1555,24 @@ +@@ -1582,6 +1646,24 @@ * hurd/hurd/fd.h (__file_name_lookup_at): Update comment. * sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS. @@ -117,8 +117,8 @@ 2010-05-28 Luis Machado * sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi. ---- glibc-2.13/ChangeLog.15 -+++ glibc-2.13-1/ChangeLog.15 +--- glibc-2.13-13-g943515f/ChangeLog.15 ++++ glibc-2.13-2/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -184,8 +184,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.13/ChangeLog.16 -+++ glibc-2.13-1/ChangeLog.16 +--- glibc-2.13-13-g943515f/ChangeLog.16 ++++ glibc-2.13-2/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -239,8 +239,8 @@ 2005-07-28 Thomas Schwinge [BZ #1137] ---- glibc-2.13/ChangeLog.17 -+++ glibc-2.13-1/ChangeLog.17 +--- glibc-2.13-13-g943515f/ChangeLog.17 ++++ glibc-2.13-2/ChangeLog.17 @@ -256,6 +256,12 @@ * Makerules (libc-abis): Fix search for libc-abis in add-ons. @@ -319,8 +319,8 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-2.13/Makeconfig -+++ glibc-2.13-1/Makeconfig +--- glibc-2.13-13-g943515f/Makeconfig ++++ glibc-2.13-2/Makeconfig @@ -789,12 +789,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -337,8 +337,8 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.13/csu/Makefile -+++ glibc-2.13-1/csu/Makefile +--- glibc-2.13-13-g943515f/csu/Makefile ++++ glibc-2.13-2/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 +349,8 @@ vpath initfini.c $(sysdirs) ---- glibc-2.13/csu/elf-init.c -+++ glibc-2.13-1/csu/elf-init.c +--- glibc-2.13-13-g943515f/csu/elf-init.c ++++ glibc-2.13-2/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 +375,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-13-g943515f/debug/tst-chk1.c ++++ glibc-2.13-2/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -405,8 +405,8 @@ # define O 0 # else # define O 1 ---- glibc-2.13/elf/Makefile -+++ glibc-2.13-1/elf/Makefile +--- glibc-2.13-13-g943515f/elf/Makefile ++++ glibc-2.13-2/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 +415,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 +423,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 +431,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 +460,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-13-g943515f/elf/dl-close.c ++++ glibc-2.13-2/elf/dl-close.c @@ -421,6 +421,13 @@ _dl_close_worker (struct link_map *map) imap->l_scope_max = new_size; @@ -476,8 +476,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-13-g943515f/elf/dl-deps.c ++++ glibc-2.13-2/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 +486,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")); +@@ -677,6 +678,7 @@ Filters not supported with LD_TRACE_PRELINKING")); l_initfini[nlist] = NULL; atomic_write_barrier (); map->l_initfini = l_initfini; @@ -494,8 +494,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-13-g943515f/elf/dl-init.c ++++ glibc-2.13-2/elf/dl-init.c @@ -24,11 +24,9 @@ /* Type of the initializer. */ typedef void (*init_t) (int, char **, char **); @@ -518,8 +518,8 @@ -#endif } INTDEF (_dl_init) ---- glibc-2.13/elf/dl-libc.c -+++ glibc-2.13-1/elf/dl-libc.c +--- glibc-2.13-13-g943515f/elf/dl-libc.c ++++ glibc-2.13-2/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 +546,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-13-g943515f/elf/dl-object.c ++++ glibc-2.13-2/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 +558,8 @@ return new; } ---- glibc-2.13/elf/dl-support.c -+++ glibc-2.13-1/elf/dl-support.c +--- glibc-2.13-13-g943515f/elf/dl-support.c ++++ glibc-2.13-2/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 +571,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-13-g943515f/elf/ldconfig.c ++++ glibc-2.13-2/elf/ldconfig.c @@ -1031,17 +1031,19 @@ search_dirs (void) @@ -654,8 +654,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-13-g943515f/elf/rtld.c ++++ glibc-2.13-2/elf/rtld.c @@ -107,7 +107,6 @@ static struct audit_list struct audit_list *next; } *audit_list; @@ -683,18 +683,7 @@ if (*user_entry == (ElfW(Addr)) ENTRY_POINT) { -@@ -2179,6 +2175,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", - we need it in the memory handling later. */ - GLRO(dl_initial_searchlist) = *GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist; - -+ /* Remember the last search directory added at startup, now that -+ malloc will no longer be the one from dl-minimal.c. */ -+ GLRO(dl_init_all_dirs) = GL(dl_all_dirs); -+ - if (prelinked) - { - if (main_map->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL) -@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", +@@ -2255,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", lnp->dont_free = 1; lnp = lnp->next; } @@ -702,19 +691,8 @@ if (l != &GL(dl_rtld_map)) _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0, -@@ -2298,10 +2299,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", - lossage); - } - -- /* Remember the last search directory added at startup, now that -- malloc will no longer be the one from dl-minimal.c. */ -- GLRO(dl_init_all_dirs) = GL(dl_all_dirs); -- - 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-13-g943515f/elf/tst-stackguard1.c ++++ glibc-2.13-2/elf/tst-stackguard1.c @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -739,8 +717,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-13-g943515f/elf/unload8.c ++++ glibc-2.13-2/elf/unload8.c @@ -0,0 +1,33 @@ +#include +#include @@ -775,8 +753,8 @@ + + return 0; +} ---- glibc-2.13/elf/unload8mod1.c -+++ glibc-2.13-1/elf/unload8mod1.c +--- glibc-2.13-13-g943515f/elf/unload8mod1.c ++++ glibc-2.13-2/elf/unload8mod1.c @@ -0,0 +1,7 @@ +extern void mod2 (void); + @@ -785,12 +763,12 @@ +{ + mod2 (); +} ---- glibc-2.13/elf/unload8mod1x.c -+++ glibc-2.13-1/elf/unload8mod1x.c +--- glibc-2.13-13-g943515f/elf/unload8mod1x.c ++++ glibc-2.13-2/elf/unload8mod1x.c @@ -0,0 +1 @@ +int mod1x; ---- glibc-2.13/elf/unload8mod2.c -+++ glibc-2.13-1/elf/unload8mod2.c +--- glibc-2.13-13-g943515f/elf/unload8mod2.c ++++ glibc-2.13-2/elf/unload8mod2.c @@ -0,0 +1,7 @@ +extern void mod3 (void); + @@ -799,8 +777,8 @@ +{ + mod3 (); +} ---- glibc-2.13/elf/unload8mod3.c -+++ glibc-2.13-1/elf/unload8mod3.c +--- glibc-2.13-13-g943515f/elf/unload8mod3.c ++++ glibc-2.13-2/elf/unload8mod3.c @@ -0,0 +1,27 @@ +#include +#include @@ -829,16 +807,16 @@ + + atexit (mod3_fini); +} ---- glibc-2.13/include/bits/stdlib-ldbl.h -+++ glibc-2.13-1/include/bits/stdlib-ldbl.h +--- glibc-2.13-13-g943515f/include/bits/stdlib-ldbl.h ++++ glibc-2.13-2/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.13/include/bits/wchar-ldbl.h -+++ glibc-2.13-1/include/bits/wchar-ldbl.h +--- glibc-2.13-13-g943515f/include/bits/wchar-ldbl.h ++++ glibc-2.13-2/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.13/include/features.h -+++ glibc-2.13-1/include/features.h +--- glibc-2.13-13-g943515f/include/features.h ++++ glibc-2.13-2/include/features.h @@ -309,8 +309,13 @@ #endif @@ -855,8 +833,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-13-g943515f/include/link.h ++++ glibc-2.13-2/include/link.h @@ -192,6 +192,9 @@ struct link_map during LD_TRACE_PRELINKING=1 contains any DT_SYMBOLIC @@ -867,16 +845,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-13-g943515f/include/sys/resource.h ++++ glibc-2.13-2/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-13-g943515f/inet/Makefile ++++ glibc-2.13-2/inet/Makefile @@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \ include ../Rules @@ -886,8 +864,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-13-g943515f/intl/locale.alias ++++ glibc-2.13-2/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -897,8 +875,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-13-g943515f/libio/stdio.h ++++ glibc-2.13-2/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 +890,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-13-g943515f/locale/iso-4217.def ++++ glibc-2.13-2/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -1005,8 +983,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-13-g943515f/locale/programs/locarchive.c ++++ glibc-2.13-2/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 +1043,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-13-g943515f/localedata/ChangeLog ++++ glibc-2.13-2/localedata/ChangeLog @@ -1,3 +1,8 @@ +2010-12-08 Andreas Schwab + @@ -1076,8 +1054,8 @@ 2010-05-17 Andreas Schwab * 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-13-g943515f/localedata/Makefile ++++ glibc-2.13-2/localedata/Makefile @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -1086,8 +1064,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-13-g943515f/localedata/SUPPORTED ++++ glibc-2.13-2/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 +1129,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-13-g943515f/localedata/locales/cy_GB ++++ glibc-2.13-2/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1167,8 +1145,8 @@ END LC_TIME LC_MESSAGES ---- glibc-2.13/localedata/locales/en_GB -+++ glibc-2.13-1/localedata/locales/en_GB +--- glibc-2.13-13-g943515f/localedata/locales/en_GB ++++ glibc-2.13-2/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1180,8 +1158,8 @@ date_fmt "/ / " ---- glibc-2.13/localedata/locales/no_NO -+++ glibc-2.13-1/localedata/locales/no_NO +--- glibc-2.13-13-g943515f/localedata/locales/no_NO ++++ glibc-2.13-2/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1252,8 +1230,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-13-g943515f/localedata/locales/zh_TW ++++ glibc-2.13-2/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1281,8 +1259,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.13/malloc/mcheck.c -+++ glibc-2.13-1/malloc/mcheck.c +--- glibc-2.13-13-g943515f/malloc/mcheck.c ++++ glibc-2.13-2/malloc/mcheck.c @@ -25,10 +25,26 @@ # include # include @@ -1359,8 +1337,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-13-g943515f/manual/libc.texinfo ++++ glibc-2.13-2/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -1370,8 +1348,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-13-g943515f/misc/sys/cdefs.h ++++ glibc-2.13-2/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 +1393,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-13-g943515f/nis/Makefile ++++ glibc-2.13-2/nis/Makefile @@ -69,6 +69,8 @@ libnss_nisplus-inhibit-o = $(filter-out .os,$(object-suffixes)) include ../Rules @@ -1426,8 +1404,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-13-g943515f/nis/nss ++++ glibc-2.13-2/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 +1415,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-13-g943515f/nptl/ChangeLog ++++ glibc-2.13-2/nptl/ChangeLog +@@ -3991,6 +3991,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1455,7 +1433,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -4718,6 +4727,11 @@ +@@ -4727,6 +4736,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1467,7 +1445,7 @@ 2004-09-02 Ulrich Drepper * 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 +1457,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.13/nptl/Makefile -+++ glibc-2.13-1/nptl/Makefile +--- glibc-2.13-13-g943515f/nptl/Makefile ++++ glibc-2.13-2/nptl/Makefile @@ -342,7 +342,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1513,8 +1491,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-13-g943515f/nptl/Versions ++++ glibc-2.13-2/nptl/Versions @@ -30,6 +30,7 @@ libc { __libc_alloca_cutoff; # Internal libc interface to libpthread @@ -1523,8 +1501,8 @@ } } ---- glibc-2.13/nptl/allocatestack.c -+++ glibc-2.13-1/nptl/allocatestack.c +--- glibc-2.13-13-g943515f/nptl/allocatestack.c ++++ glibc-2.13-2/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 +1521,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-13-g943515f/nptl/nptl-init.c ++++ glibc-2.13-2/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 +1532,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-13-g943515f/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.13-2/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 +1542,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-13-g943515f/nptl/sysdeps/unix/sysv/linux/i386/Versions ++++ glibc-2.13-2/nptl/sysdeps/unix/sysv/linux/i386/Versions @@ -0,0 +1,6 @@ +libc { + GLIBC_PRIVATE { @@ -1573,8 +1551,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-13-g943515f/nptl/sysdeps/unix/sysv/linux/i386/smp.h ++++ glibc-2.13-2/nptl/sysdeps/unix/sysv/linux/i386/smp.h @@ -37,7 +37,7 @@ is_smp_system (void) char *cp; @@ -1584,8 +1562,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-13-g943515f/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.13-2/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -1593,8 +1571,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-13-g943515f/nptl/tst-stackguard1.c ++++ glibc-2.13-2/nptl/tst-stackguard1.c @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1619,8 +1597,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-13-g943515f/nscd/nscd.conf ++++ glibc-2.13-2/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -1630,8 +1608,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-13-g943515f/nscd/nscd.init ++++ glibc-2.13-2/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1708,8 +1686,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.13/nss/Makefile -+++ glibc-2.13-1/nss/Makefile +--- glibc-2.13-13-g943515f/nss/Makefile ++++ glibc-2.13-2/nss/Makefile @@ -75,6 +75,7 @@ endif include ../Rules @@ -1718,8 +1696,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-13-g943515f/nss/nss_files/files-XXX.c ++++ glibc-2.13-2/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 +1714,8 @@ int parse_result; if (buflen < sizeof *data + 2) ---- glibc-2.13/posix/Makefile -+++ glibc-2.13-1/posix/Makefile +--- glibc-2.13-13-g943515f/posix/Makefile ++++ glibc-2.13-2/posix/Makefile @@ -325,15 +325,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1758,8 +1736,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-13-g943515f/posix/gai.conf ++++ glibc-2.13-2/posix/gai.conf @@ -41,7 +41,7 @@ # # precedence @@ -1784,8 +1762,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-13-g943515f/posix/getconf.speclist.h ++++ glibc-2.13-2/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -1826,8 +1804,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.13/posix/regcomp.c -+++ glibc-2.13-1/posix/regcomp.c +--- glibc-2.13-13-g943515f/posix/regcomp.c ++++ glibc-2.13-2/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 +1937,8 @@ { /* No valid character, treat it as a normal character. */ ---- glibc-2.13/resolv/Makefile -+++ glibc-2.13-1/resolv/Makefile +--- glibc-2.13-13-g943515f/resolv/Makefile ++++ glibc-2.13-2/resolv/Makefile @@ -77,6 +77,7 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \ -Dgetnetbyaddr=res_getnetbyaddr @@ -1969,8 +1947,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-13-g943515f/resource/getrlimit.c ++++ glibc-2.13-2/resource/getrlimit.c @@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) __set_errno (ENOSYS); return -1; @@ -1979,8 +1957,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-13-g943515f/stdio-common/vfprintf.c ++++ glibc-2.13-2/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 +2004,8 @@ else \ len = strlen (string); \ } \ ---- glibc-2.13/streams/Makefile -+++ glibc-2.13-1/streams/Makefile +--- glibc-2.13-13-g943515f/streams/Makefile ++++ glibc-2.13-2/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -2037,8 +2015,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-13-g943515f/sunrpc/Makefile ++++ glibc-2.13-2/sunrpc/Makefile @@ -129,6 +129,10 @@ CFLAGS-openchild.c = -fexceptions CPPFLAGS += -D_RPC_THREAD_SAFE_ @@ -2050,8 +2028,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-13-g943515f/sysdeps/generic/dl-cache.h ++++ glibc-2.13-2/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -2067,8 +2045,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-13-g943515f/sysdeps/i386/Makefile ++++ glibc-2.13-2/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -2093,8 +2071,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.13/sysdeps/i386/i686/Makefile -+++ glibc-2.13-1/sysdeps/i386/i686/Makefile +--- glibc-2.13-13-g943515f/sysdeps/i386/i686/Makefile ++++ glibc-2.13-2/sysdeps/i386/i686/Makefile @@ -9,19 +9,3 @@ stack-align-test-flags += -msse ifeq ($(subdir),string) sysdep_routines += cacheinfo @@ -2115,8 +2093,8 @@ -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-13-g943515f/sysdeps/i386/i686/multiarch/strspn.S ++++ glibc-2.13-2/sysdeps/i386/i686/multiarch/strspn.S @@ -76,8 +76,8 @@ END(strspn) # define ENTRY(name) \ .type __strspn_ia32, @function; \ @@ -2128,8 +2106,8 @@ CALL_MCOUNT # undef END # define END(name) \ ---- glibc-2.13/sysdeps/ia64/Makefile -+++ glibc-2.13-1/sysdeps/ia64/Makefile +--- glibc-2.13-13-g943515f/sysdeps/ia64/Makefile ++++ glibc-2.13-2/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -2141,8 +2119,8 @@ endif endif ---- glibc-2.13/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.13-1/sysdeps/ia64/ia64libgcc.S +--- glibc-2.13-13-g943515f/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.13-2/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -2494,8 +2472,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-13-g943515f/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.13-2/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -2581,25 +2559,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-13-g943515f/sysdeps/mach/hurd/getrlimit.c ++++ glibc-2.13-2/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-13-g943515f/sysdeps/posix/getaddrinfo.c ++++ glibc-2.13-2/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 +2582,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-13-g943515f/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.13-2/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 +2592,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-13-g943515f/sysdeps/powerpc/powerpc64/elf/Makefile ++++ glibc-2.13-2/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-13-g943515f/sysdeps/unix/nice.c ++++ glibc-2.13-2/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -2646,8 +2616,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-13-g943515f/sysdeps/unix/sysv/linux/check_pf.c ++++ glibc-2.13-2/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include #include @@ -2663,8 +2633,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-13-g943515f/sysdeps/unix/sysv/linux/dl-osinfo.h ++++ glibc-2.13-2/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 +2682,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-13-g943515f/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.13-2/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -2756,8 +2726,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-13-g943515f/sysdeps/unix/sysv/linux/getpagesize.c ++++ glibc-2.13-2/sysdeps/unix/sysv/linux/getpagesize.c @@ -28,7 +28,7 @@ int __getpagesize () @@ -2767,8 +2737,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-13-g943515f/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.13-2/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 +2799,16 @@ + } while (0) + +#include_next ---- glibc-2.13/sysdeps/unix/sysv/linux/i386/getrlimit.c -+++ glibc-2.13-1/sysdeps/unix/sysv/linux/i386/getrlimit.c +--- glibc-2.13-13-g943515f/sysdeps/unix/sysv/linux/i386/getrlimit.c ++++ glibc-2.13-2/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-13-g943515f/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.13-2/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 +2841,29 @@ + } while (0) + #include_next ---- 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-13-g943515f/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.13-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#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-13-g943515f/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.13-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#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-13-g943515f/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.13-2/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-13-g943515f/sysdeps/unix/sysv/linux/netlinkaccess.h ++++ glibc-2.13-2/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ #include @@ -2919,8 +2889,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-13-g943515f/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.13-2/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -2930,8 +2900,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-13-g943515f/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.13-2/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -2977,8 +2947,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.13/timezone/zic.c -+++ glibc-2.13-1/timezone/zic.c +--- glibc-2.13-13-g943515f/timezone/zic.c ++++ glibc-2.13-2/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 af0ebb7..69efe6e 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ -%define glibcsrcdir glibc-2.13 +%define glibcsrcdir glibc-2.13-13-g943515f %define glibcversion 2.13 -%define glibcportsdir glibc-ports-2.12-54-gbd44238 +%define glibcportsdir glibc-ports-2.13-5-g4f32a56 ### glibc.spec.in follows: %define run_glibc_tests 1 %define auxarches athlon alphaev6 @@ -56,10 +56,9 @@ BuildRequires: /bin/ps, /bin/kill, /bin/awk BuildRequires: gcc >= 3.2 %define enablekernel 2.6.32 Conflicts: kernel < %{enablekernel} -%ifarch i386 -%define nptl_target_cpu i486 -%else -%define nptl_target_cpu %{_target_cpu} +%define target %{_target_cpu}-redhat-linux +%ifarch %{arm} +%define target %{_target_cpu}-redhat-linuxeabi %endif %ifarch %{multiarcharches} # Need STT_IFUNC support @@ -277,7 +276,7 @@ touch locale/programs/*-kw.h GCC=gcc GXX=g++ %ifarch %{ix86} -BuildFlags="-march=%{nptl_target_cpu} -mtune=generic" +BuildFlags="-march=%{_target_cpu} -mtune=generic" %endif %ifarch i686 BuildFlags="-march=i686 -mtune=generic" @@ -337,10 +336,10 @@ AddOns=`echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkai AddOns=,rtkaio$AddOns %endif -build_nptl() +build() { -builddir=build-%{nptl_target_cpu}-$1 -shift +builddir=build-%{target}${1:+-$1} +${1+shift} rm -rf $builddir mkdir $builddir ; cd $builddir build_CFLAGS="$BuildFlags -g -O3 $*" @@ -351,14 +350,7 @@ configure_CFLAGS="$build_CFLAGS -fno-asynchronous-unwind-tables" --prefix=%{_prefix} \ --enable-add-ons=../%{glibcportsdir},nptl$AddOns \ --with-headers=%{_prefix}/include $EnableKernel --enable-bind-now \ - --with-tls --with-__thread \ -%ifarch %{arm} - --build %{nptl_target_cpu}-redhat-linux-gnueabi \ - --host %{nptl_target_cpu}-redhat-linux-gnueabi \ -%else - --build %{nptl_target_cpu}-redhat-linux \ - --host %{nptl_target_cpu}-redhat-linux \ -%endif + --with-tls --with-__thread --build=%{target} \ %ifarch %{multiarcharches} --enable-multi-arch \ %endif @@ -370,10 +362,10 @@ make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s cd .. } -build_nptl linuxnptl +build %if %{buildxen} -build_nptl linuxnptl-nosegneg -mno-tls-direct-seg-refs +build nosegneg -mno-tls-direct-seg-refs %endif %if %{buildpower6} @@ -393,11 +385,11 @@ fi AddOns="$AddOns --with-cpu=power6" GCC="$GCC -mcpu=power6" GXX="$GXX -mcpu=power6" -build_nptl linuxnptl-power6 +build power6 ) %endif -cd build-%{nptl_target_cpu}-linuxnptl +cd build-%{target} $GCC -static -L. -Os -g ../fedora/glibc_post_upgrade.c -o glibc_post_upgrade.%{_target_cpu} \ -DNO_SIZE_OPTIMIZATION \ '-DLIBTLS="/%{_lib}/tls/"' \ @@ -411,9 +403,9 @@ GCC=`cat Gcc` rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT -make -j1 install_root=$RPM_BUILD_ROOT install -C build-%{nptl_target_cpu}-linuxnptl PARALLELMFLAGS=-s +make -j1 install_root=$RPM_BUILD_ROOT install -C build-%{target} PARALLELMFLAGS=-s %ifnarch %{auxarches} -cd build-%{nptl_target_cpu}-linuxnptl && \ +cd build-%{target} && \ make %{?_smp_mflags} install_root=$RPM_BUILD_ROOT install-locales -C ../localedata objdir=`pwd` && \ cd .. %endif @@ -434,7 +426,7 @@ ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/rtkaio/librtkaio-*.so` $RPM_BUILD_ROOT/ %define nosegneg_subdir_base i686 %define nosegneg_subdir i686/nosegneg %define nosegneg_subdir_up ../.. -cd build-%{nptl_target_cpu}-linuxnptl-nosegneg +cd build-%{target}-nosegneg destdir=$RPM_BUILD_ROOT/%{_lib}/%{nosegneg_subdir} mkdir -p $destdir for lib in libc math/libm nptl/libpthread rt/librt nptl_db/libthread_db @@ -442,7 +434,7 @@ do libbase=${lib#*/} libbaseso=$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}-*.so) # Only install if different from base lib - if cmp -s ${lib}.so ../build-%{nptl_target_cpu}-linuxnptl/${lib}.so; then + if cmp -s ${lib}.so ../build-%{target}/${lib}.so; then ln -sf %{nosegneg_subdir_up}/$libbaseso $destdir/$libbaseso else cp -a ${lib}.so $destdir/$libbaseso @@ -453,7 +445,7 @@ done destdir=$RPM_BUILD_ROOT/%{_lib}/rtkaio/%{nosegneg_subdir} mkdir -p $destdir librtkaioso=$(basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/) -if cmp -s rtkaio/librtkaio.so ../build-%{nptl_target_cpu}-linuxnptl/rtkaio/librtkaio.so; then +if cmp -s rtkaio/librtkaio.so ../build-%{target}/rtkaio/librtkaio.so; then ln -s %{nosegneg_subdir_up}/$librtkaioso $destdir/$librtkaioso else cp -a rtkaio/librtkaio.so $destdir/$librtkaioso @@ -464,7 +456,7 @@ cd .. %endif %if %{buildpower6} -cd build-%{nptl_target_cpu}-linuxnptl-power6 +cd build-%{target}-power6 destdir=$RPM_BUILD_ROOT/%{_lib}/power6 mkdir -p ${destdir} for lib in libc math/libm nptl/libpthread rt/librt nptl_db/libthread_db @@ -542,7 +534,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/sysconfig chmod 644 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gconv/gconv-modules.cache # Install the upgrade program -install -m 700 build-%{nptl_target_cpu}-linuxnptl/glibc_post_upgrade.%{_target_cpu} \ +install -m 700 build-%{target}/glibc_post_upgrade.%{_target_cpu} \ $RPM_BUILD_ROOT/usr/sbin/glibc_post_upgrade.%{_target_cpu} strip -g $RPM_BUILD_ROOT%{_prefix}/%{_lib}/*.o @@ -564,9 +556,9 @@ pushd ${RPM_BUILD_ROOT}%{_prefix}/lib/locale rm locale-archive || : # Intentionally we do not pass --alias-file=, aliases will be added # by build-locale-archive. -$olddir/build-%{nptl_target_cpu}-linuxnptl/elf/ld.so \ - --library-path $olddir/build-%{nptl_target_cpu}-linuxnptl/ \ - $olddir/build-%{nptl_target_cpu}-linuxnptl/locale/localedef \ +$olddir/build-%{target}/elf/ld.so \ + --library-path $olddir/build-%{target}/ \ + $olddir/build-%{target}/locale/localedef \ --prefix ${RPM_BUILD_ROOT} --add-to-archive \ *_* rm -rf *_* @@ -694,13 +686,13 @@ touch -r sunrpc/etc.rpc $RPM_BUILD_ROOT/etc/rpc cd fedora $GCC -Os -g -static -o build-locale-archive build-locale-archive.c \ - ../build-%{nptl_target_cpu}-linuxnptl/locale/locarchive.o \ - ../build-%{nptl_target_cpu}-linuxnptl/locale/md5.o \ + ../build-%{target}/locale/locarchive.o \ + ../build-%{target}/locale/md5.o \ -DDATADIR=\"%{_datadir}\" -DPREFIX=\"%{_prefix}\" \ - -L../build-%{nptl_target_cpu}-linuxnptl + -L../build-%{target} install -m 700 build-locale-archive $RPM_BUILD_ROOT/usr/sbin/build-locale-archive $GCC -Os -g -static -o tzdata-update tzdata-update.c \ - -L../build-%{nptl_target_cpu}-linuxnptl + -L../build-%{target} install -m 700 tzdata-update $RPM_BUILD_ROOT/usr/sbin/tzdata-update cd .. @@ -732,7 +724,7 @@ ln -sf /%{_lib}/ld-linux-ia64.so.2 $RPM_BUILD_ROOT/lib/ld-linux-ia64.so.2 export TIMEOUTFACTOR=16 parent=$$ echo ====================TESTING========================= -cd build-%{nptl_target_cpu}-linuxnptl +cd build-%{target} ( make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1 sleep 10s teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`" @@ -741,7 +733,7 @@ cd build-%{nptl_target_cpu}-linuxnptl cd .. %if %{buildxen} echo ====================TESTING -mno-tls-direct-seg-refs============= -cd build-%{nptl_target_cpu}-linuxnptl-nosegneg +cd build-%{target}-nosegneg ( make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1 sleep 10s teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`" @@ -751,7 +743,7 @@ cd .. %endif %if %{buildpower6} echo ====================TESTING -mcpu=power6============= -cd build-%{nptl_target_cpu}-linuxnptl-power6 +cd build-%{target}-power6 ( if [ -d ../power6emul ]; then export LD_PRELOAD=`cd ../power6emul; pwd`/\$LIB/power6emul.so fi @@ -1040,8 +1032,13 @@ rm -f *.filelist* %endif %changelog -* Sat May 04 2011 Dennis Gilmore - 2.13-2 -- build for redhat-linux-gnueabi on arm arches +* Thu Aug 4 2011 Andreas Schwab - 2.13-2 +- Update from 2.13 branch + - Fix static linking with checking x86/x86-64 memcpy (BZ#12653) + - Fix passing symbol value to pltexit callbacks when ld.so auditing + - Fix range error handling in sgetspent + - Fix ordering of DSO constructors and destructors (BZ#11724) +- Use eabi for arm * Tue Jan 18 2011 Andreas Schwab - 2.13-1 - Update to 2.13 release diff --git a/sources b/sources index 1df768f..c90a4af 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -3d1e20fbe27dde9a14fd577e5e7d68dc glibc-2.13-fedora.tar.xz -cc5d8b1b994fb3b870222565c79853ca glibc-2.13.tar.xz -62a6f9e2a8d2afb66f7672a2b9a6315c glibc-ports-2.12-54-gbd44238.tar.xz +7007d80c5f3662144ed3c6b9c3b5ca7b glibc-2.13-13-g943515f-fedora.tar.xz +031fd2f729b8d82d785e4836ca3f1b11 glibc-2.13-13-g943515f.tar.xz +df0232b232d7f9b3b2e9882fb85b611c glibc-ports-2.13-5-g4f32a56.tar.xz