From 9d45d8d1445fc822383b07454e268f7af3e2252a Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Tue, 9 Aug 2011 13:47:20 +0200 Subject: [PATCH] 2.14.90-4 --- .gitignore | 6 +- glibc-fedora.patch | 361 ++++++++++++++++++++++----------------------- glibc.spec | 33 +++-- sources | 6 +- 4 files changed, 202 insertions(+), 204 deletions(-) diff --git a/.gitignore b/.gitignore index 3fb530b..0ff8fc6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/glibc-ports-2.14-3-ge5cd24d.tar.xz -/glibc-2.14-121-g5551a7b-fedora.tar.xz -/glibc-2.14-121-g5551a7b.tar.xz +/glibc-2.14-151-g16292ed-fedora.tar.xz +/glibc-2.14-151-g16292ed.tar.xz +/glibc-ports-2.14-6-g3c6ac5c.tar.xz diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 3bfdc3e..2c79da7 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,10 +1,9 @@ ---- glibc-2.14-121-g5551a7b/ChangeLog +--- glibc-2.14-151-g16292ed/ChangeLog +++ glibc-2.14.90-3/ChangeLog -@@ -1,3 +1,15 @@ -+2011-07-09 Andreas Schwab -+ -+ * sysdeps/unix/sysv/linux/pathconf.c: Include . -+ +@@ -154,6 +154,14 @@ + * resolv/res_query.c (__libc_res_nquerydomain): Use size_t for + strlen results. + +2011-07-04 Aurelien Jarno + + * sysdeps/powerpc/dl-tls.h: Add _PPC_DL_TLS_H inclusion @@ -16,7 +15,7 @@ 2011-07-13 Andreas Krebbel * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h -@@ -374,6 +386,14 @@ +@@ -530,6 +538,14 @@ * config.make.in: Likewise. * malloc/Makefile: Likewise. @@ -31,7 +30,7 @@ 2011-06-27 Andreas Schwab * iconvdata/gb18030.c (BODY for TO_LOOP): Fix encoding of non-BMP -@@ -505,6 +525,10 @@ +@@ -661,6 +677,10 @@ * inet/getnetgrent_r.c: Use DL_CALL_FCT in several places. @@ -42,7 +41,7 @@ 2011-06-20 David S. Miller * sysdeps/sparc/sparc32/dl-plt.h: Protect against multiple -@@ -1127,6 +1151,13 @@ +@@ -1283,6 +1303,13 @@ * libio/Makefile (tests): Add bug-fclose1. * libio/bug-fclose1.c: New file. @@ -56,7 +55,7 @@ 2011-05-12 Ulrich Drepper [BZ #12511] -@@ -1404,13 +1435,6 @@ +@@ -1560,13 +1587,6 @@ * stdlib/bug-getcontext.c: New file. * stdlib/Makefile: Add rules to build and run bug-getcontext. @@ -70,7 +69,7 @@ 2011-04-11 Andreas Krebbel * sysdeps/s390/s390-32/elf/start.S (_start): Skip extra zeroes -@@ -1648,6 +1672,31 @@ +@@ -1804,6 +1824,31 @@ * sysdeps/unix/sysv/linux/Versions [GLIBC_2.14] (clock_adjtime): Export. @@ -102,7 +101,7 @@ 2011-03-22 Ulrich Drepper * sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Increment -@@ -1708,6 +1757,16 @@ +@@ -1864,6 +1909,16 @@ $LDFLAGS and -nostdlib -nostartfiles to linking step. Change main to _start. @@ -119,7 +118,7 @@ 2011-03-06 Ulrich Drepper * elf/dl-load.c (_dl_map_object): If we are looking for the first -@@ -1762,12 +1821,6 @@ +@@ -1918,12 +1973,6 @@ * elf/noload.c: Include . (main): Call mtrace. Close all opened handles. @@ -132,7 +131,7 @@ 2011-02-22 Samuel Thibault Fix __if_freereq crash: Unlike the generic version which uses free, -@@ -1924,6 +1977,12 @@ +@@ -2080,6 +2129,12 @@ * shadow/sgetspent.c: Check return value of __sgetspent_r instead of errno. @@ -145,7 +144,7 @@ 2011-01-19 Ulrich Drepper [BZ #11724] -@@ -2611,6 +2670,29 @@ +@@ -2767,6 +2822,29 @@ * sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS): Mask out sign-bit copies when constructing f_fsid. @@ -175,7 +174,7 @@ 2010-09-24 Petr Baudis * debug/stack_chk_fail_local.c: Add missing licence exception. -@@ -3403,6 +3485,32 @@ +@@ -3559,6 +3637,32 @@ call returning > 0 value. * sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise. @@ -208,7 +207,7 @@ 2010-06-07 Andreas Schwab * dlfcn/Makefile: Remove explicit dependencies on libc.so and -@@ -3455,6 +3563,24 @@ +@@ -3611,6 +3715,24 @@ * hurd/hurd/fd.h (__file_name_lookup_at): Update comment. * sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS. @@ -233,7 +232,7 @@ 2010-05-28 Luis Machado * sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi. ---- glibc-2.14-121-g5551a7b/ChangeLog.15 +--- glibc-2.14-151-g16292ed/ChangeLog.15 +++ glibc-2.14.90-3/ChangeLog.15 @@ -477,6 +477,14 @@ @@ -300,7 +299,7 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.14-121-g5551a7b/ChangeLog.16 +--- glibc-2.14-151-g16292ed/ChangeLog.16 +++ glibc-2.14.90-3/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT @@ -324,7 +323,7 @@ 2006-01-19 Thomas Schwinge * libio/genops.c: Include . ---- glibc-2.14-121-g5551a7b/ChangeLog.17 +--- glibc-2.14-151-g16292ed/ChangeLog.17 +++ glibc-2.14.90-3/ChangeLog.17 @@ -256,6 +256,12 @@ @@ -404,7 +403,7 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-2.14-121-g5551a7b/Makeconfig +--- glibc-2.14-151-g16292ed/Makeconfig +++ glibc-2.14.90-3/Makeconfig @@ -797,12 +797,12 @@ endif # The assembler can generate debug information too. @@ -422,7 +421,7 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.14-121-g5551a7b/NEWS +--- glibc-2.14-151-g16292ed/NEWS +++ glibc-2.14.90-3/NEWS @@ -42,16 +42,6 @@ Version 2.14 12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792, @@ -441,7 +440,7 @@ * New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at, syncfs, setns, sendmmsg ---- glibc-2.14-121-g5551a7b/config.h.in +--- glibc-2.14-151-g16292ed/config.h.in +++ glibc-2.14.90-3/config.h.in @@ -204,6 +204,9 @@ /* Define if `.ctors' and `.dtors' sections shouldn't be used. */ @@ -453,7 +452,7 @@ /* */ ---- glibc-2.14-121-g5551a7b/configure +--- glibc-2.14-151-g16292ed/configure +++ glibc-2.14.90-3/configure @@ -795,6 +795,7 @@ enable_kernel enable_all_warnings @@ -523,7 +522,7 @@ # The way shlib-versions is used to generate soversions.mk uses a # fairly simplistic model for name recognition that can't distinguish # i486-pc-linux-gnu fully from i486-pc-gnu. So we mutate a $host_os ---- glibc-2.14-121-g5551a7b/configure.in +--- glibc-2.14-151-g16292ed/configure.in +++ glibc-2.14.90-3/configure.in @@ -316,6 +316,29 @@ else fi @@ -555,7 +554,7 @@ # The way shlib-versions is used to generate soversions.mk uses a # fairly simplistic model for name recognition that can't distinguish # i486-pc-linux-gnu fully from i486-pc-gnu. So we mutate a $host_os ---- glibc-2.14-121-g5551a7b/csu/Makefile +--- glibc-2.14-151-g16292ed/csu/Makefile +++ glibc-2.14.90-3/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h @@ -567,7 +566,7 @@ vpath initfini.c $(sysdirs) ---- glibc-2.14-121-g5551a7b/csu/elf-init.c +--- glibc-2.14-151-g16292ed/csu/elf-init.c +++ glibc-2.14.90-3/csu/elf-init.c @@ -64,6 +64,23 @@ extern void (*__init_array_end []) (int, char **, char **) extern void (*__fini_array_start []) (void) attribute_hidden; @@ -593,7 +592,7 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.14-121-g5551a7b/debug/tst-chk1.c +--- glibc-2.14-151-g16292ed/debug/tst-chk1.c +++ glibc-2.14.90-3/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA @@ -623,7 +622,7 @@ # define O 0 # else # define O 1 ---- glibc-2.14-121-g5551a7b/elf/Makefile +--- glibc-2.14-151-g16292ed/elf/Makefile +++ glibc-2.14.90-3/elf/Makefile @@ -90,6 +90,7 @@ distribute := rtld-Rules \ unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \ @@ -688,7 +687,7 @@ 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.14-121-g5551a7b/elf/dl-close.c +--- glibc-2.14-151-g16292ed/elf/dl-close.c +++ glibc-2.14.90-3/elf/dl-close.c @@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map) if (map->l_direct_opencount > 0 || map->l_type != lt_loaded @@ -724,7 +723,7 @@ /* The loader is gone, so mark the object as not having one. Note: l_idx != IDX_STILL_USED -> object will be removed. */ ---- glibc-2.14-121-g5551a7b/elf/dl-deps.c +--- glibc-2.14-151-g16292ed/elf/dl-deps.c +++ glibc-2.14.90-3/elf/dl-deps.c @@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map, nneeded * sizeof needed[0]); @@ -764,7 +763,7 @@ + _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname, + NULL, errstring); } ---- glibc-2.14-121-g5551a7b/elf/dl-init.c +--- glibc-2.14-151-g16292ed/elf/dl-init.c +++ glibc-2.14.90-3/elf/dl-init.c @@ -24,11 +24,9 @@ /* Type of the initializer. */ @@ -788,7 +787,7 @@ -#endif } INTDEF (_dl_init) ---- glibc-2.14-121-g5551a7b/elf/dl-libc.c +--- glibc-2.14-151-g16292ed/elf/dl-libc.c +++ glibc-2.14.90-3/elf/dl-libc.c @@ -265,13 +265,13 @@ libc_freeres_fn (free_mem) @@ -816,7 +815,7 @@ } if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 ---- glibc-2.14-121-g5551a7b/elf/dl-load.c +--- glibc-2.14-151-g16292ed/elf/dl-load.c +++ glibc-2.14.90-3/elf/dl-load.c @@ -250,8 +250,7 @@ is_trusted_path_normalize (const char *path, size_t len) @@ -897,7 +896,7 @@ } else /* No DST we recognize. */ ---- glibc-2.14-121-g5551a7b/elf/dl-support.c +--- glibc-2.14-151-g16292ed/elf/dl-support.c +++ glibc-2.14.90-3/elf/dl-support.c @@ -81,10 +81,8 @@ unsigned long long _dl_load_adds; create a fake scope containing nothing. */ @@ -910,7 +909,7 @@ /* Random data provided by the kernel. */ void *_dl_random; ---- glibc-2.14-121-g5551a7b/elf/ldconfig.c +--- glibc-2.14-151-g16292ed/elf/ldconfig.c +++ glibc-2.14.90-3/elf/ldconfig.c @@ -1034,17 +1034,19 @@ search_dirs (void) @@ -993,7 +992,7 @@ } const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; ---- glibc-2.14-121-g5551a7b/elf/ldd.bash.in +--- glibc-2.14-151-g16292ed/elf/ldd.bash.in +++ glibc-2.14.90-3/elf/ldd.bash.in @@ -167,18 +167,6 @@ warning: you do not have execution permission for" "\`$file'" >&2 fi @@ -1023,7 +1022,7 @@ try_trace "$RTLD" "$file" || result=1 ;; *) ---- glibc-2.14-121-g5551a7b/elf/rtld-Rules +--- glibc-2.14-151-g16292ed/elf/rtld-Rules +++ glibc-2.14.90-3/elf/rtld-Rules @@ -1,7 +1,7 @@ # Subroutine makefile for compiling libc modules linked into dynamic linker. @@ -1042,7 +1041,7 @@ +rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld endif ---- glibc-2.14-121-g5551a7b/elf/rtld.c +--- glibc-2.14-151-g16292ed/elf/rtld.c +++ glibc-2.14.90-3/elf/rtld.c @@ -107,7 +107,6 @@ static struct audit_list struct audit_list *next; @@ -1087,7 +1086,7 @@ if (! prelinked && rtld_multiple_ref) { /* There was an explicit ref to the dynamic linker as a shared lib. ---- glibc-2.14-121-g5551a7b/elf/unload8.c +--- glibc-2.14-151-g16292ed/elf/unload8.c +++ glibc-2.14.90-3/elf/unload8.c @@ -0,0 +1,33 @@ +#include @@ -1123,7 +1122,7 @@ + + return 0; +} ---- glibc-2.14-121-g5551a7b/elf/unload8mod1.c +--- glibc-2.14-151-g16292ed/elf/unload8mod1.c +++ glibc-2.14.90-3/elf/unload8mod1.c @@ -0,0 +1,7 @@ +extern void mod2 (void); @@ -1133,11 +1132,11 @@ +{ + mod2 (); +} ---- glibc-2.14-121-g5551a7b/elf/unload8mod1x.c +--- glibc-2.14-151-g16292ed/elf/unload8mod1x.c +++ glibc-2.14.90-3/elf/unload8mod1x.c @@ -0,0 +1 @@ +int mod1x; ---- glibc-2.14-121-g5551a7b/elf/unload8mod2.c +--- glibc-2.14-151-g16292ed/elf/unload8mod2.c +++ glibc-2.14.90-3/elf/unload8mod2.c @@ -0,0 +1,7 @@ +extern void mod3 (void); @@ -1147,7 +1146,7 @@ +{ + mod3 (); +} ---- glibc-2.14-121-g5551a7b/elf/unload8mod3.c +--- glibc-2.14-151-g16292ed/elf/unload8mod3.c +++ glibc-2.14.90-3/elf/unload8mod3.c @@ -0,0 +1,27 @@ +#include @@ -1177,7 +1176,7 @@ + + atexit (mod3_fini); +} ---- glibc-2.14-121-g5551a7b/extra-lib.mk +--- glibc-2.14-151-g16292ed/extra-lib.mk +++ glibc-2.14.90-3/extra-lib.mk @@ -101,4 +101,4 @@ ifneq (,$(cpp-srcs-left)) include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) @@ -1185,15 +1184,15 @@ -CPPFLAGS-$(lib) := -DNOT_IN_libc=1 -DIS_IN_$(lib)=1 +CPPFLAGS-$(lib) := -DNOT_IN_libc=1 -DIS_IN_$(lib)=1 -DIN_LIB=$(lib) ---- glibc-2.14-121-g5551a7b/include/bits/stdlib-ldbl.h +--- glibc-2.14-151-g16292ed/include/bits/stdlib-ldbl.h +++ glibc-2.14.90-3/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.14-121-g5551a7b/include/bits/wchar-ldbl.h +--- glibc-2.14-151-g16292ed/include/bits/wchar-ldbl.h +++ glibc-2.14.90-3/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.14-121-g5551a7b/include/features.h +--- glibc-2.14-151-g16292ed/include/features.h +++ glibc-2.14.90-3/include/features.h @@ -310,8 +310,13 @@ #endif @@ -1211,7 +1210,7 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.14-121-g5551a7b/include/libc-symbols.h +--- glibc-2.14-151-g16292ed/include/libc-symbols.h +++ glibc-2.14.90-3/include/libc-symbols.h @@ -635,7 +635,7 @@ for linking") # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) @@ -1222,7 +1221,7 @@ # define libc_hidden_ver(local, name) hidden_ver (local, name) # define libc_hidden_data_def(name) hidden_data_def (name) # define libc_hidden_data_weak(name) hidden_data_weak (name) ---- glibc-2.14-121-g5551a7b/include/link.h +--- glibc-2.14-151-g16292ed/include/link.h +++ glibc-2.14.90-3/include/link.h @@ -1,6 +1,6 @@ /* Data structure for communication from the run-time dynamic linker for @@ -1252,7 +1251,7 @@ /* List of the dependencies introduced through symbol binding. */ struct link_map_reldeps ---- glibc-2.14-121-g5551a7b/include/stap-probe.h +--- glibc-2.14-151-g16292ed/include/stap-probe.h +++ glibc-2.14.90-3/include/stap-probe.h @@ -0,0 +1,140 @@ +/* Macros for defining Systemtap static probe points. @@ -1395,7 +1394,7 @@ +#endif /* USE_STAP_PROBE. */ + +#endif /* stap-probe.h */ ---- glibc-2.14-121-g5551a7b/include/sys/resource.h +--- glibc-2.14-151-g16292ed/include/sys/resource.h +++ glibc-2.14.90-3/include/sys/resource.h @@ -13,4 +13,5 @@ extern int __getrusage (enum __rusage_who __who, struct rusage *__usage) @@ -1403,7 +1402,7 @@ const struct rlimit *__rlimits); +libc_hidden_proto (__getrlimit) #endif ---- glibc-2.14-121-g5551a7b/inet/Makefile +--- glibc-2.14-151-g16292ed/inet/Makefile +++ glibc-2.14.90-3/inet/Makefile @@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \ @@ -1414,7 +1413,7 @@ ifeq ($(have-thread-library),yes) CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions ---- glibc-2.14-121-g5551a7b/intl/locale.alias +--- glibc-2.14-151-g16292ed/intl/locale.alias +++ glibc-2.14.90-3/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR @@ -1425,9 +1424,9 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.14-121-g5551a7b/libio/stdio.h +--- glibc-2.14-151-g16292ed/libio/stdio.h +++ glibc-2.14.90-3/libio/stdio.h -@@ -165,10 +165,12 @@ typedef _G_fpos64_t fpos64_t; +@@ -169,10 +169,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ extern struct _IO_FILE *stderr; /* Standard error output stream. */ @@ -1440,7 +1439,7 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.14-121-g5551a7b/locale/iso-4217.def +--- glibc-2.14-151-g16292ed/locale/iso-4217.def +++ glibc-2.14.90-3/locale/iso-4217.def @@ -8,6 +8,7 @@ * @@ -1533,7 +1532,7 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.14-121-g5551a7b/locale/programs/locarchive.c +--- glibc-2.14-151-g16292ed/locale/programs/locarchive.c +++ glibc-2.14.90-3/locale/programs/locarchive.c @@ -134,7 +134,7 @@ create_archive (const char *archivefname, struct locarhandle *ah) size_t reserved = RESERVE_MMAP_SIZE; @@ -1593,7 +1592,7 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.14-121-g5551a7b/localedata/ChangeLog +--- glibc-2.14-151-g16292ed/localedata/ChangeLog +++ glibc-2.14.90-3/localedata/ChangeLog @@ -3,6 +3,14 @@ * tests-mbwc/tst_funcs.h (TST_DECL_VARS, TST_HEAD_LOCALE): @@ -1610,7 +1609,7 @@ 2011-05-21 Ulrich Drepper [BZ #12788] ---- glibc-2.14-121-g5551a7b/localedata/Makefile +--- glibc-2.14-151-g16292ed/localedata/Makefile +++ glibc-2.14.90-3/localedata/Makefile @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ @@ -1620,7 +1619,7 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.14-121-g5551a7b/localedata/SUPPORTED +--- glibc-2.14-151-g16292ed/localedata/SUPPORTED +++ glibc-2.14.90-3/localedata/SUPPORTED @@ -86,6 +86,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ @@ -1663,7 +1662,7 @@ sw_KE/UTF-8 \ sw_TZ/UTF-8 \ ta_IN/UTF-8 \ ---- glibc-2.14-121-g5551a7b/localedata/locales/cy_GB +--- glibc-2.14-151-g16292ed/localedata/locales/cy_GB +++ glibc-2.14.90-3/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" @@ -1679,7 +1678,7 @@ END LC_TIME LC_MESSAGES ---- glibc-2.14-121-g5551a7b/localedata/locales/en_GB +--- glibc-2.14-151-g16292ed/localedata/locales/en_GB +++ glibc-2.14.90-3/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" @@ -1692,7 +1691,7 @@ date_fmt "/ / " ---- glibc-2.14-121-g5551a7b/localedata/locales/no_NO +--- glibc-2.14-151-g16292ed/localedata/locales/no_NO +++ glibc-2.14.90-3/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / @@ -1764,7 +1763,7 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.14-121-g5551a7b/localedata/locales/zh_TW +--- glibc-2.14-151-g16292ed/localedata/locales/zh_TW +++ glibc-2.14.90-3/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % @@ -1793,7 +1792,7 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.14-121-g5551a7b/login/programs/pt_chown.c +--- glibc-2.14-151-g16292ed/login/programs/pt_chown.c +++ glibc-2.14.90-3/login/programs/pt_chown.c @@ -29,6 +29,7 @@ #include @@ -1836,7 +1835,7 @@ - return EXIT_SUCCESS; } ---- glibc-2.14-121-g5551a7b/malloc/mcheck.c +--- glibc-2.14-151-g16292ed/malloc/mcheck.c +++ glibc-2.14.90-3/malloc/mcheck.c @@ -25,10 +25,26 @@ # include @@ -1914,7 +1913,7 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.14-121-g5551a7b/manual/libc.texinfo +--- glibc-2.14-151-g16292ed/manual/libc.texinfo +++ glibc-2.14.90-3/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -1925,7 +1924,7 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.14-121-g5551a7b/misc/sys/cdefs.h +--- glibc-2.14-151-g16292ed/misc/sys/cdefs.h +++ glibc-2.14.90-3/misc/sys/cdefs.h @@ -132,7 +132,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) @@ -1939,7 +1938,7 @@ # define __warndecl(name, msg) \ extern void name (void) __attribute__((__warning__ (msg))) # define __warnattr(msg) __attribute__((__warning__ (msg))) -@@ -291,10 +294,16 @@ +@@ -298,10 +301,16 @@ /* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 inline semantics, unless -fgnu89-inline is used. */ @@ -1958,7 +1957,7 @@ # define __extern_always_inline \ extern __always_inline __attribute__ ((__gnu_inline__, __artificial__)) # else -@@ -314,7 +323,10 @@ +@@ -321,7 +330,10 @@ /* GCC 4.3 and above allow passing all anonymous arguments of an __extern_always_inline function to some other vararg function. */ @@ -1970,7 +1969,7 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.14-121-g5551a7b/nis/Makefile +--- glibc-2.14-151-g16292ed/nis/Makefile +++ glibc-2.14.90-3/nis/Makefile @@ -23,9 +23,9 @@ subdir := nis @@ -1993,7 +1992,7 @@ $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version) $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \ ---- glibc-2.14-121-g5551a7b/nis/nss +--- glibc-2.14-151-g16292ed/nis/nss +++ glibc-2.14.90-3/nis/nss @@ -25,7 +25,7 @@ # memory with every getXXent() call. Otherwise each getXXent() call @@ -2004,9 +2003,9 @@ # # ADJUNCT_AS_SHADOW # If set to TRUE, the passwd routines in the NIS NSS module will not ---- glibc-2.14-121-g5551a7b/nptl/ChangeLog +--- glibc-2.14-151-g16292ed/nptl/ChangeLog +++ glibc-2.14.90-3/nptl/ChangeLog -@@ -29,6 +29,51 @@ +@@ -37,6 +37,51 @@ clearing memory. Patch partly by Robert Rex . @@ -2058,7 +2057,7 @@ 2011-01-19 Roland McGrath * pthread_cond_wait.c (__pthread_cond_wait): Fix comment typo. -@@ -4758,6 +4803,11 @@ +@@ -4766,6 +4811,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -2070,7 +2069,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -6832,6 +6882,11 @@ +@@ -6840,6 +6890,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -2082,7 +2081,7 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.14-121-g5551a7b/nptl/DESIGN-systemtap-probes.txt +--- glibc-2.14-151-g16292ed/nptl/DESIGN-systemtap-probes.txt +++ glibc-2.14.90-3/nptl/DESIGN-systemtap-probes.txt @@ -0,0 +1,89 @@ +Systemtap is a dynamic tracing/instrumenting tool available on Linux. Probes @@ -2174,7 +2173,7 @@ + arg1 = condition +cond_broadcast - probe for pthread_cond_broadcast + arg1 = condition ---- glibc-2.14-121-g5551a7b/nptl/Makefile +--- glibc-2.14-151-g16292ed/nptl/Makefile +++ glibc-2.14.90-3/nptl/Makefile @@ -342,7 +342,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) @@ -2208,7 +2207,7 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.14-121-g5551a7b/nptl/Versions +--- glibc-2.14-151-g16292ed/nptl/Versions +++ glibc-2.14.90-3/nptl/Versions @@ -30,6 +30,7 @@ libc { __libc_alloca_cutoff; @@ -2218,7 +2217,7 @@ } } ---- glibc-2.14-121-g5551a7b/nptl/allocatestack.c +--- glibc-2.14-151-g16292ed/nptl/allocatestack.c +++ glibc-2.14.90-3/nptl/allocatestack.c @@ -999,7 +999,16 @@ setxid_mark_thread (struct xid_command *cmdp, struct pthread *t) @@ -2238,7 +2237,7 @@ } while (atomic_compare_and_exchange_bool_acq (&t->cancelhandling, ch | SETXID_BITMASK, ch)); ---- glibc-2.14-121-g5551a7b/nptl/nptl-init.c +--- glibc-2.14-151-g16292ed/nptl/nptl-init.c +++ glibc-2.14.90-3/nptl/nptl-init.c @@ -414,7 +414,7 @@ __pthread_initialize_minimal_internal (void) /* Determine the default allowed stack size. This is the size used @@ -2249,7 +2248,7 @@ || limit.rlim_cur == RLIM_INFINITY) /* The system limit is not usable. Use an architecture-specific default. */ ---- glibc-2.14-121-g5551a7b/nptl/pthread_cond_broadcast.c +--- glibc-2.14-151-g16292ed/nptl/pthread_cond_broadcast.c +++ glibc-2.14.90-3/nptl/pthread_cond_broadcast.c @@ -23,6 +23,7 @@ #include @@ -2268,7 +2267,7 @@ int pshared = (cond->__data.__mutex == (void *) ~0l) ? LLL_SHARED : LLL_PRIVATE; /* Make sure we are alone. */ ---- glibc-2.14-121-g5551a7b/nptl/pthread_cond_destroy.c +--- glibc-2.14-151-g16292ed/nptl/pthread_cond_destroy.c +++ glibc-2.14.90-3/nptl/pthread_cond_destroy.c @@ -20,6 +20,7 @@ #include @@ -2287,7 +2286,7 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-121-g5551a7b/nptl/pthread_cond_init.c +--- glibc-2.14-151-g16292ed/nptl/pthread_cond_init.c +++ glibc-2.14.90-3/nptl/pthread_cond_init.c @@ -20,6 +20,7 @@ @@ -2306,7 +2305,7 @@ return 0; } versioned_symbol (libpthread, __pthread_cond_init, ---- glibc-2.14-121-g5551a7b/nptl/pthread_cond_signal.c +--- glibc-2.14-151-g16292ed/nptl/pthread_cond_signal.c +++ glibc-2.14.90-3/nptl/pthread_cond_signal.c @@ -26,6 +26,7 @@ @@ -2325,7 +2324,7 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-121-g5551a7b/nptl/pthread_cond_wait.c +--- glibc-2.14-151-g16292ed/nptl/pthread_cond_wait.c +++ glibc-2.14.90-3/nptl/pthread_cond_wait.c @@ -25,6 +25,7 @@ #include @@ -2344,7 +2343,7 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-121-g5551a7b/nptl/pthread_create.c +--- glibc-2.14-151-g16292ed/nptl/pthread_create.c +++ glibc-2.14.90-3/nptl/pthread_create.c @@ -31,6 +31,8 @@ @@ -2373,7 +2372,7 @@ /* Start the thread. */ return create_thread (pd, iattr, STACK_VARIABLES_ARGS); } ---- glibc-2.14-121-g5551a7b/nptl/pthread_join.c +--- glibc-2.14-151-g16292ed/nptl/pthread_join.c +++ glibc-2.14.90-3/nptl/pthread_join.c @@ -23,6 +23,8 @@ #include @@ -2401,7 +2400,7 @@ + return result; } ---- glibc-2.14-121-g5551a7b/nptl/pthread_mutex_destroy.c +--- glibc-2.14-151-g16292ed/nptl/pthread_mutex_destroy.c +++ glibc-2.14.90-3/nptl/pthread_mutex_destroy.c @@ -20,11 +20,15 @@ #include @@ -2419,7 +2418,7 @@ if ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) == 0 && mutex->__data.__nusers != 0) return EBUSY; ---- glibc-2.14-121-g5551a7b/nptl/pthread_mutex_init.c +--- glibc-2.14-151-g16292ed/nptl/pthread_mutex_init.c +++ glibc-2.14.90-3/nptl/pthread_mutex_init.c @@ -24,6 +24,8 @@ #include @@ -2439,7 +2438,7 @@ return 0; } strong_alias (__pthread_mutex_init, pthread_mutex_init) ---- glibc-2.14-121-g5551a7b/nptl/pthread_mutex_lock.c +--- glibc-2.14-151-g16292ed/nptl/pthread_mutex_lock.c +++ glibc-2.14.90-3/nptl/pthread_mutex_lock.c @@ -24,6 +24,7 @@ #include @@ -2477,7 +2476,7 @@ return 0; } #ifndef __pthread_mutex_lock ---- glibc-2.14-121-g5551a7b/nptl/pthread_mutex_timedlock.c +--- glibc-2.14-151-g16292ed/nptl/pthread_mutex_timedlock.c +++ glibc-2.14.90-3/nptl/pthread_mutex_timedlock.c @@ -24,6 +24,8 @@ #include @@ -2533,7 +2532,7 @@ } out: ---- glibc-2.14-121-g5551a7b/nptl/pthread_mutex_unlock.c +--- glibc-2.14-151-g16292ed/nptl/pthread_mutex_unlock.c +++ glibc-2.14.90-3/nptl/pthread_mutex_unlock.c @@ -22,6 +22,7 @@ #include @@ -2571,7 +2570,7 @@ return 0; } ---- glibc-2.14-121-g5551a7b/nptl/pthread_rwlock_destroy.c +--- glibc-2.14-151-g16292ed/nptl/pthread_rwlock_destroy.c +++ glibc-2.14.90-3/nptl/pthread_rwlock_destroy.c @@ -18,12 +18,15 @@ 02111-1307 USA. */ @@ -2589,7 +2588,7 @@ /* Nothing to be done. For now. */ return 0; } ---- glibc-2.14-121-g5551a7b/nptl/pthread_rwlock_rdlock.c +--- glibc-2.14-151-g16292ed/nptl/pthread_rwlock_rdlock.c +++ glibc-2.14.90-3/nptl/pthread_rwlock_rdlock.c @@ -22,6 +22,7 @@ #include @@ -2617,7 +2616,7 @@ break; } ---- glibc-2.14-121-g5551a7b/nptl/pthread_rwlock_unlock.c +--- glibc-2.14-151-g16292ed/nptl/pthread_rwlock_unlock.c +++ glibc-2.14.90-3/nptl/pthread_rwlock_unlock.c @@ -22,11 +22,14 @@ #include @@ -2634,7 +2633,7 @@ lll_lock (rwlock->__data.__lock, rwlock->__data.__shared); if (rwlock->__data.__writer) rwlock->__data.__writer = 0; ---- glibc-2.14-121-g5551a7b/nptl/pthread_rwlock_wrlock.c +--- glibc-2.14-151-g16292ed/nptl/pthread_rwlock_wrlock.c +++ glibc-2.14.90-3/nptl/pthread_rwlock_wrlock.c @@ -22,6 +22,7 @@ #include @@ -2662,7 +2661,7 @@ break; } ---- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.14-151-g16292ed/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h @@ -189,4 +189,7 @@ /* Typed memory objects are not available. */ @@ -2672,7 +2671,7 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/i386/Versions +--- glibc-2.14-151-g16292ed/nptl/sysdeps/unix/sysv/linux/i386/Versions +++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/i386/Versions @@ -0,0 +1,6 @@ +libc { @@ -2681,7 +2680,7 @@ + __uname; + } +} ---- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S +--- glibc-2.14-151-g16292ed/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S +++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S @@ -22,6 +22,8 @@ #include @@ -2702,7 +2701,7 @@ ENTER_KERNEL 2: movl %edx, %eax ---- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S +--- glibc-2.14-151-g16292ed/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S +++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S @@ -24,6 +24,7 @@ #include @@ -2721,7 +2720,7 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S +--- glibc-2.14-151-g16292ed/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S +++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S @@ -24,7 +24,7 @@ #include @@ -2741,7 +2740,7 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S +--- glibc-2.14-151-g16292ed/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S +++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S @@ -24,7 +24,7 @@ #include @@ -2761,7 +2760,7 @@ cmpl $1000000000, 4(%ebp) movl $EINVAL, %eax jae 18f ---- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S +--- glibc-2.14-151-g16292ed/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S +++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S @@ -25,6 +25,7 @@ #include @@ -2780,7 +2779,7 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S +--- glibc-2.14-151-g16292ed/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S +++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S @@ -23,6 +23,7 @@ #include @@ -2799,7 +2798,7 @@ /* Get the lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S +--- glibc-2.14-151-g16292ed/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S +++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S @@ -23,6 +23,7 @@ #include @@ -2818,7 +2817,7 @@ /* Get the lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h +--- glibc-2.14-151-g16292ed/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h +++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H @@ -2837,7 +2836,7 @@ __asm __volatile (LLL_EBX_LOAD \ LLL_ENTER_KERNEL \ LLL_EBX_LOAD \ ---- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/i386/smp.h +--- glibc-2.14-151-g16292ed/nptl/sysdeps/unix/sysv/linux/i386/smp.h +++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/i386/smp.h @@ -37,7 +37,7 @@ is_smp_system (void) char *cp; @@ -2848,7 +2847,7 @@ cp = u.uts.version; else { ---- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.14-151-g16292ed/nptl/sysdeps/unix/sysv/linux/kernel-features.h +++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next @@ -2857,7 +2856,7 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S +--- glibc-2.14-151-g16292ed/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S +++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S @@ -22,6 +22,8 @@ #include @@ -2888,7 +2887,7 @@ syscall 2: movl %edx, %eax ---- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h +--- glibc-2.14-151-g16292ed/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h +++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H @@ -2907,7 +2906,7 @@ __asm __volatile ("syscall" \ : "=a" (__ignore) \ : "0" (SYS_futex), "D" (futex), \ ---- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S +--- glibc-2.14-151-g16292ed/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S +++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S @@ -25,7 +25,7 @@ #include @@ -2927,7 +2926,7 @@ /* Get internal lock. */ movl $1, %esi xorl %eax, %eax ---- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S +--- glibc-2.14-151-g16292ed/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S +++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S @@ -24,6 +24,7 @@ #include @@ -2946,7 +2945,7 @@ /* Get internal lock. */ movq %rdi, %r8 movl $1, %esi ---- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S +--- glibc-2.14-151-g16292ed/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S +++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S @@ -23,6 +23,7 @@ #include @@ -2965,7 +2964,7 @@ cmpq $1000000000, 8(%rdx) movl $EINVAL, %eax jae 48f ---- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S +--- glibc-2.14-151-g16292ed/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S +++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S @@ -23,6 +23,7 @@ #include @@ -2984,7 +2983,7 @@ cmpq $-1, dep_mutex(%rdi) /* Prepare structure passed to cancellation handler. */ ---- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S +--- glibc-2.14-151-g16292ed/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S +++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S @@ -22,7 +22,7 @@ #include @@ -3005,7 +3004,7 @@ xorq %r10, %r10 /* Get the lock. */ ---- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S +--- glibc-2.14-151-g16292ed/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S +++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S @@ -22,7 +22,7 @@ #include @@ -3026,7 +3025,7 @@ xorq %r10, %r10 /* Get the lock. */ ---- glibc-2.14-121-g5551a7b/nscd/nscd.conf +--- glibc-2.14-151-g16292ed/nscd/nscd.conf +++ glibc-2.14.90-3/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log @@ -3037,7 +3036,7 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.14-121-g5551a7b/nscd/nscd.init +--- glibc-2.14-151-g16292ed/nscd/nscd.init +++ glibc-2.14.90-3/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. @@ -3115,7 +3114,7 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.14-121-g5551a7b/nss/Makefile +--- glibc-2.14-151-g16292ed/nss/Makefile +++ glibc-2.14.90-3/nss/Makefile @@ -88,6 +88,7 @@ endif @@ -3125,7 +3124,7 @@ ifeq (yes,$(build-static-nss)) $(objpfx)getent: $(objpfx)libnss_files.a ---- glibc-2.14-121-g5551a7b/nss/nss_files/files-XXX.c +--- glibc-2.14-151-g16292ed/nss/nss_files/files-XXX.c +++ glibc-2.14.90-3/nss/nss_files/files-XXX.c @@ -190,7 +190,7 @@ internal_getent (struct STRUCTURE *result, { @@ -3136,7 +3135,7 @@ int parse_result; if (buflen < sizeof *data + 2) ---- glibc-2.14-121-g5551a7b/posix/Makefile +--- glibc-2.14-151-g16292ed/posix/Makefile +++ glibc-2.14.90-3/posix/Makefile @@ -325,15 +325,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ @@ -3155,10 +3154,10 @@ -endif +$(objpfx)getconf.speclist: getconf.speclist.h + $(CC) -E $(CFLAGS) $(CPPFLAGS) $< \ -+ | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ ++ | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.14-121-g5551a7b/posix/gai.conf +--- glibc-2.14-151-g16292ed/posix/gai.conf +++ glibc-2.14.90-3/posix/gai.conf @@ -41,7 +41,7 @@ # @@ -3184,7 +3183,7 @@ #scopev4 ::ffff:0.0.0.0/96 14 +# +# This is what the Red Hat setting currently uses. ---- glibc-2.14-121-g5551a7b/posix/getconf.speclist.h +--- glibc-2.14-151-g16292ed/posix/getconf.speclist.h +++ glibc-2.14.90-3/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include @@ -3226,7 +3225,7 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.14-121-g5551a7b/posix/regcomp.c +--- glibc-2.14-151-g16292ed/posix/regcomp.c +++ glibc-2.14.90-3/posix/regcomp.c @@ -2745,40 +2745,29 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, @@ -3359,7 +3358,7 @@ { /* No valid character, treat it as a normal character. */ ---- glibc-2.14-121-g5551a7b/resolv/Makefile +--- glibc-2.14-151-g16292ed/resolv/Makefile +++ glibc-2.14.90-3/resolv/Makefile @@ -77,6 +77,7 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \ -Dgetnetbyaddr=res_getnetbyaddr @@ -3369,7 +3368,7 @@ # The BIND code elicits some harmless warnings. +cflags += -Wno-strict-prototypes -Wno-write-strings ---- glibc-2.14-121-g5551a7b/resource/getrlimit.c +--- glibc-2.14-151-g16292ed/resource/getrlimit.c +++ glibc-2.14.90-3/resource/getrlimit.c @@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) __set_errno (ENOSYS); @@ -3379,7 +3378,7 @@ weak_alias (__getrlimit, getrlimit) stub_warning (getrlimit) ---- glibc-2.14-121-g5551a7b/scripts/check-local-headers.sh +--- glibc-2.14-151-g16292ed/scripts/check-local-headers.sh +++ glibc-2.14.90-3/scripts/check-local-headers.sh @@ -29,7 +29,7 @@ exec ${AWK} -v includedir="$includedir" ' BEGIN { @@ -3390,7 +3389,7 @@ } /^[^ ]/ && $1 ~ /.*:/ { obj = $1 } { ---- glibc-2.14-121-g5551a7b/stdio-common/vfprintf.c +--- glibc-2.14-151-g16292ed/stdio-common/vfprintf.c +++ glibc-2.14.90-3/stdio-common/vfprintf.c @@ -1161,41 +1161,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) else if (!is_long && spec != L_('S')) \ @@ -3437,7 +3436,7 @@ else \ len = strlen (string); \ } \ ---- glibc-2.14-121-g5551a7b/streams/Makefile +--- glibc-2.14-151-g16292ed/streams/Makefile +++ glibc-2.14.90-3/streams/Makefile @@ -21,7 +21,7 @@ # @@ -3448,7 +3447,7 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.14-121-g5551a7b/sunrpc/Makefile +--- glibc-2.14-151-g16292ed/sunrpc/Makefile +++ glibc-2.14.90-3/sunrpc/Makefile @@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ des_crypt.h) @@ -3470,7 +3469,7 @@ $(objpfx)tst-getmyaddr: $(common-objpfx)linkobj/libc.so $(objpfx)tst-xdrmem: $(common-objpfx)linkobj/libc.so $(objpfx)tst-xdrmem2: $(common-objpfx)linkobj/libc.so ---- glibc-2.14-121-g5551a7b/sysdeps/generic/dl-cache.h +--- glibc-2.14-151-g16292ed/sysdeps/generic/dl-cache.h +++ glibc-2.14.90-3/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) @@ -3487,7 +3486,7 @@ #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.14-121-g5551a7b/sysdeps/i386/Makefile +--- glibc-2.14-151-g16292ed/sysdeps/i386/Makefile +++ glibc-2.14.90-3/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). @@ -3513,7 +3512,7 @@ endif ifeq ($(subdir),elf) ---- glibc-2.14-121-g5551a7b/sysdeps/i386/__longjmp.S +--- glibc-2.14-151-g16292ed/sysdeps/i386/__longjmp.S +++ glibc-2.14.90-3/sysdeps/i386/__longjmp.S @@ -1,5 +1,5 @@ /* longjmp for i386. @@ -3561,7 +3560,7 @@ #endif /* Jump to saved PC. */ jmp *%edx ---- glibc-2.14-121-g5551a7b/sysdeps/i386/bsd-_setjmp.S +--- glibc-2.14-151-g16292ed/sysdeps/i386/bsd-_setjmp.S +++ glibc-2.14.90-3/sysdeps/i386/bsd-_setjmp.S @@ -1,5 +1,6 @@ /* BSD `_setjmp' entry point to `sigsetjmp (..., 0)'. i386 version. @@ -3587,7 +3586,7 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-121-g5551a7b/sysdeps/i386/bsd-setjmp.S +--- glibc-2.14-151-g16292ed/sysdeps/i386/bsd-setjmp.S +++ glibc-2.14.90-3/sysdeps/i386/bsd-setjmp.S @@ -1,5 +1,6 @@ /* BSD `setjmp' entry point to `sigsetjmp (..., 1)'. i386 version. @@ -3613,7 +3612,7 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-121-g5551a7b/sysdeps/i386/i686/Makefile +--- glibc-2.14-151-g16292ed/sysdeps/i386/i686/Makefile +++ glibc-2.14.90-3/sysdeps/i386/i686/Makefile @@ -9,19 +9,3 @@ stack-align-test-flags += -msse ifeq ($(subdir),string) @@ -3635,7 +3634,7 @@ -ASFLAGS-.ob += -Wa,-mtune=i686 -ASFLAGS-.oS += -Wa,-mtune=i686 -endif ---- glibc-2.14-121-g5551a7b/sysdeps/i386/i686/multiarch/strspn.S +--- glibc-2.14-151-g16292ed/sysdeps/i386/i686/multiarch/strspn.S +++ glibc-2.14.90-3/sysdeps/i386/i686/multiarch/strspn.S @@ -76,8 +76,8 @@ END(strspn) # define ENTRY(name) \ @@ -3648,7 +3647,7 @@ CALL_MCOUNT # undef END # define END(name) \ ---- glibc-2.14-121-g5551a7b/sysdeps/i386/setjmp.S +--- glibc-2.14-151-g16292ed/sysdeps/i386/setjmp.S +++ glibc-2.14.90-3/sysdeps/i386/setjmp.S @@ -1,5 +1,5 @@ /* setjmp for i386. @@ -3673,7 +3672,7 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-121-g5551a7b/sysdeps/ia64/Makefile +--- glibc-2.14-151-g16292ed/sysdeps/ia64/Makefile +++ glibc-2.14.90-3/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing @@ -3686,7 +3685,7 @@ endif endif ---- glibc-2.14-121-g5551a7b/sysdeps/ia64/ia64libgcc.S +--- glibc-2.14-151-g16292ed/sysdeps/ia64/ia64libgcc.S +++ glibc-2.14.90-3/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency @@ -4039,7 +4038,7 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.14-121-g5551a7b/sysdeps/ia64/libgcc-compat.c +--- glibc-2.14-151-g16292ed/sysdeps/ia64/libgcc-compat.c +++ glibc-2.14.90-3/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility @@ -4126,7 +4125,7 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.14-121-g5551a7b/sysdeps/mach/hurd/getrlimit.c +--- glibc-2.14-151-g16292ed/sysdeps/mach/hurd/getrlimit.c +++ glibc-2.14.90-3/sysdeps/mach/hurd/getrlimit.c @@ -44,4 +44,5 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) @@ -4134,9 +4133,9 @@ } +libc_hidden_def (__getrlimit) weak_alias (__getrlimit, getrlimit) ---- glibc-2.14-121-g5551a7b/sysdeps/posix/getaddrinfo.c +--- glibc-2.14-151-g16292ed/sysdeps/posix/getaddrinfo.c +++ glibc-2.14.90-3/sysdeps/posix/getaddrinfo.c -@@ -562,8 +562,8 @@ gaih_inet (const char *name, const struct gaih_service *service, +@@ -565,8 +565,8 @@ gaih_inet (const char *name, const struct gaih_service *service, /* If we do not have to look for IPv6 addresses, use the simple, old functions, which do not support @@ -4147,7 +4146,7 @@ { size_t tmpbuflen = 512; assert (tmpbuf == NULL); -@@ -1102,68 +1102,10 @@ gaih_inet (const char *name, const struct gaih_service *service, +@@ -1105,68 +1105,10 @@ gaih_inet (const char *name, const struct gaih_service *service, /* Only the first entry gets the canonical name. */ if (at2 == at && (req->ai_flags & AI_CANONNAME) != 0) { @@ -4219,7 +4218,7 @@ #ifdef HAVE_LIBIDN if (req->ai_flags & AI_CANONIDN) -@@ -1178,9 +1120,6 @@ gaih_inet (const char *name, const struct gaih_service *service, +@@ -1181,9 +1123,6 @@ gaih_inet (const char *name, const struct gaih_service *service, int rc = __idna_to_unicode_lzlz (canon, &out, idn_flags); if (rc != IDNA_SUCCESS) { @@ -4229,7 +4228,7 @@ if (rc == IDNA_MALLOC_ERROR) result = -EAI_MEMORY; else if (rc == IDNA_DLOPEN_ERROR) -@@ -1210,17 +1149,11 @@ gaih_inet (const char *name, const struct gaih_service *service, +@@ -1213,17 +1152,11 @@ gaih_inet (const char *name, const struct gaih_service *service, canon = strdup (canon); if (canon == NULL) { @@ -4247,7 +4246,7 @@ } family = at2->family; -@@ -1357,10 +1290,12 @@ static const struct scopeentry +@@ -1360,10 +1293,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 }, @@ -4260,7 +4259,7 @@ /* Default: scope 14. */ { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 } }; ---- glibc-2.14-121-g5551a7b/sysdeps/powerpc/dl-tls.h +--- glibc-2.14-151-g16292ed/sysdeps/powerpc/dl-tls.h +++ glibc-2.14.90-3/sysdeps/powerpc/dl-tls.h @@ -17,6 +17,8 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA @@ -4277,7 +4276,7 @@ #define TLS_DTV_UNALLOCATED ((void *) -1l) + +#endif /* dl-tls.h */ ---- glibc-2.14-121-g5551a7b/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.14-151-g16292ed/sysdeps/powerpc/powerpc64/Makefile +++ glibc-2.14.90-3/sysdeps/powerpc/powerpc64/Makefile @@ -33,6 +33,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. @@ -4287,7 +4286,7 @@ endif ifeq ($(subdir),elf) ---- glibc-2.14-121-g5551a7b/sysdeps/powerpc/powerpc64/dl-irel.h +--- glibc-2.14-151-g16292ed/sysdeps/powerpc/powerpc64/dl-irel.h +++ glibc-2.14.90-3/sysdeps/powerpc/powerpc64/dl-irel.h @@ -23,16 +23,11 @@ @@ -4308,7 +4307,7 @@ static inline Elf64_Addr __attribute ((always_inline)) elf_ifunc_invoke (Elf64_Addr addr) ---- glibc-2.14-121-g5551a7b/sysdeps/powerpc/powerpc64/elf/Makefile +--- glibc-2.14-151-g16292ed/sysdeps/powerpc/powerpc64/elf/Makefile +++ glibc-2.14.90-3/sysdeps/powerpc/powerpc64/elf/Makefile @@ -9,3 +9,5 @@ CFLAGS-rtld-mempcpy.os = $(no-special-regs) CFLAGS-rtld-memmove.os = $(no-special-regs) @@ -4316,7 +4315,7 @@ CFLAGS-rtld-strnlen.os = $(no-special-regs) + +CFLAGS-gmon-start.c = -fno-strict-aliasing ---- glibc-2.14-121-g5551a7b/sysdeps/s390/s390-64/utf16-utf32-z9.c +--- glibc-2.14-151-g16292ed/sysdeps/s390/s390-64/utf16-utf32-z9.c +++ glibc-2.14.90-3/sysdeps/s390/s390-64/utf16-utf32-z9.c @@ -169,10 +169,7 @@ gconv_end (struct __gconv_step *data) register unsigned long long outlen asm("11") = outend - outptr; \ @@ -4330,7 +4329,7 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-121-g5551a7b/sysdeps/s390/s390-64/utf8-utf16-z9.c +--- glibc-2.14-151-g16292ed/sysdeps/s390/s390-64/utf8-utf16-z9.c +++ glibc-2.14.90-3/sysdeps/s390/s390-64/utf8-utf16-z9.c @@ -151,10 +151,7 @@ gconv_end (struct __gconv_step *data) register unsigned long long outlen asm("11") = outend - outptr; \ @@ -4344,7 +4343,7 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-121-g5551a7b/sysdeps/s390/s390-64/utf8-utf32-z9.c +--- glibc-2.14-151-g16292ed/sysdeps/s390/s390-64/utf8-utf32-z9.c +++ glibc-2.14.90-3/sysdeps/s390/s390-64/utf8-utf32-z9.c @@ -155,10 +155,7 @@ gconv_end (struct __gconv_step *data) register unsigned long long outlen asm("11") = outend - outptr; \ @@ -4358,7 +4357,7 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-121-g5551a7b/sysdeps/unix/nice.c +--- glibc-2.14-151-g16292ed/sysdeps/unix/nice.c +++ glibc-2.14.90-3/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); @@ -4374,7 +4373,7 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/check_pf.c +--- glibc-2.14-151-g16292ed/sysdeps/unix/sysv/linux/check_pf.c +++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include @@ -4391,7 +4390,7 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.14-151-g16292ed/sysdeps/unix/sysv/linux/futimesat.c +++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { @@ -4435,7 +4434,7 @@ { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) ---- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/getpagesize.c +--- glibc-2.14-151-g16292ed/sysdeps/unix/sysv/linux/getpagesize.c +++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/getpagesize.c @@ -28,7 +28,7 @@ int @@ -4446,7 +4445,7 @@ assert (GLRO(dl_pagesize) != 0); return GLRO(dl_pagesize); #else ---- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S +--- glibc-2.14-151-g16292ed/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S +++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S @@ -1,4 +1,5 @@ -/* Copyright (C) 2001,2004,2005,2006,2009 Free Software Foundation, Inc. @@ -4481,7 +4480,7 @@ + LIBC_PROBE (longjmp_target, 3, 4@%ecx, -4@%eax, 4@%edx) jmp *%edx END (____longjmp_chk) ---- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.14-151-g16292ed/sysdeps/unix/sysv/linux/i386/dl-cache.h +++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/i386/dl-cache.h @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. @@ -4543,7 +4542,7 @@ + } while (0) + +#include_next ---- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/i386/getrlimit.c +--- glibc-2.14-151-g16292ed/sysdeps/unix/sysv/linux/i386/getrlimit.c +++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/i386/getrlimit.c @@ -79,4 +79,5 @@ __new_getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) } @@ -4551,7 +4550,7 @@ weak_alias (__new_getrlimit, __getrlimit); +libc_hidden_weak (__getrlimit) versioned_symbol (libc, __new_getrlimit, getrlimit, GLIBC_2_2); ---- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.14-151-g16292ed/sysdeps/unix/sysv/linux/ia64/dl-cache.h +++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ @@ -4585,7 +4584,7 @@ + } while (0) + #include_next ---- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.14-151-g16292ed/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig @@ -4593,7 +4592,7 @@ +#else +#include +#endif ---- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.14-151-g16292ed/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig @@ -4601,12 +4600,12 @@ +#else +#include +#endif ---- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.14-151-g16292ed/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +++ glibc-2.14.90-3/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.14-121-g5551a7b/sysdeps/unix/sysv/linux/netlinkaccess.h +--- glibc-2.14-151-g16292ed/sysdeps/unix/sysv/linux/netlinkaccess.h +++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ @@ -4633,17 +4632,7 @@ struct netlink_res { ---- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/pathconf.c -+++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/pathconf.c -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include - #include - ---- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.14-151-g16292ed/sysdeps/unix/sysv/linux/paths.h +++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" @@ -4654,7 +4643,7 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.14-151-g16292ed/sysdeps/unix/sysv/linux/tcsetattr.c +++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { @@ -4701,7 +4690,7 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S +--- glibc-2.14-151-g16292ed/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S +++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S @@ -19,6 +19,7 @@ #include @@ -4729,7 +4718,7 @@ + LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx) jmpq *%rdx END (____longjmp_chk) ---- glibc-2.14-121-g5551a7b/sysdeps/x86_64/__longjmp.S +--- glibc-2.14-151-g16292ed/sysdeps/x86_64/__longjmp.S +++ glibc-2.14.90-3/sysdeps/x86_64/__longjmp.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2001,2004,2005,2006,2009 Free Software Foundation, Inc. @@ -4760,7 +4749,7 @@ + LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx) jmpq *%rdx END (__longjmp) ---- glibc-2.14-121-g5551a7b/sysdeps/x86_64/setjmp.S +--- glibc-2.14-151-g16292ed/sysdeps/x86_64/setjmp.S +++ glibc-2.14.90-3/sysdeps/x86_64/setjmp.S @@ -1,5 +1,5 @@ /* setjmp for x86-64. @@ -4785,7 +4774,7 @@ #ifdef PTR_MANGLE PTR_MANGLE (%rax) #endif ---- glibc-2.14-121-g5551a7b/timezone/zic.c +--- glibc-2.14-151-g16292ed/timezone/zic.c +++ glibc-2.14.90-3/timezone/zic.c @@ -1921,7 +1921,7 @@ const int zonecount; if (stdrp != NULL && stdrp->r_hiyear == 2037) diff --git a/glibc.spec b/glibc.spec index 124f683..2f58548 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ -%define glibcsrcdir glibc-2.14-121-g5551a7b +%define glibcsrcdir glibc-2.14-151-g16292ed %define glibcversion 2.14.90 -%define glibcportsdir glibc-ports-2.14-3-ge5cd24d +%define glibcportsdir glibc-ports-2.14-6-g3c6ac5c ### glibc.spec.in follows: %define run_glibc_tests 1 %define auxarches athlon alphaev6 @@ -92,8 +92,9 @@ BuildRequires: gcc >= 4.1.0-0.17 BuildRequires: elfutils >= 0.72 BuildRequires: rpm >= 4.2-0.56 %endif -%define __find_provides %{_builddir}/%{glibcsrcdir}/find_provides.sh -%define _filter_GLIBC_PRIVATE 1 +%filter_from_provides /GLIBC_PRIVATE/d +%filter_from_requires /GLIBC_PRIVATE/d +%filter_setup %description The glibc package contains standard libraries which are used by @@ -271,12 +272,6 @@ rm -f sysdeps/powerpc/powerpc32/power4/hp-timing.[ch] %endif find . -type f -size 0 -o -name "*.orig" -exec rm -f {} \; -cat > find_provides.sh < - 2.14.90-4 -- rebuild (fix prior broken rpm in buildroot) +* Tue Aug 9 2011 Andreas Schwab - 2.14.90-4 +- Update from master + - Properly tokenize nameserver line for servers with IPv6 address + - Fix encoding name for IDN in getaddrinfo (#725755) + - Fix inline strncat/strncmp on x86 + - Define SEEK_DATA and SEEK_HOLE + - Define AF_NFC and PF_NFC + - Update ptrace constants + - Add read barriers in cancellation initialization + - Add read barrier protecting DES initialization + - Fix overflow bug in optimized strncat for x86-64 + - Check for overflows in expressions (BZ#12852) + - Fix check for AVX enablement (BZ#13007) + - Force La_x86_64_ymm to be 16-byte aligned + - Add const attr to gnu_dev_{major,minor,makedev} +- Filter out GLIBC_PRIVATE symbols again * Wed Jul 20 2011 Andreas Schwab - 2.14.90-3 - Update from master diff --git a/sources b/sources index f4388d2..455a708 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -cf35ba5c4f96868e2307ec80cf449d35 glibc-2.14-121-g5551a7b-fedora.tar.xz -0021ec019a82b738e02c1c31b76fdfd5 glibc-2.14-121-g5551a7b.tar.xz -e7ea1c6c9428ed5c2473d38092f28762 glibc-ports-2.14-3-ge5cd24d.tar.xz +26ea02e38514eca7771bb0874bfa8ce9 glibc-2.14-151-g16292ed-fedora.tar.xz +89bc560153e41f475171a0ab036cbdc9 glibc-2.14-151-g16292ed.tar.xz +474e55eeff731fe283dd66c4deb29274 glibc-ports-2.14-6-g3c6ac5c.tar.xz