[glibc/f15] 2.14-6
Andreas Schwab
schwab at fedoraproject.org
Mon Aug 15 13:56:05 UTC 2011
commit 4e4cfa13887c685f1d21b77828406fec196961bd
Author: Andreas Schwab <schwab at redhat.com>
Date: Mon Aug 15 15:55:25 2011 +0200
2.14-6
.gitignore | 4 +-
glibc-fedora.patch | 322 ++++++++++++++++++++++++++--------------------------
glibc.spec | 19 ++--
sources | 4 +-
4 files changed, 174 insertions(+), 175 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index df2ca73..8313080 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/glibc-2.14-34-ge2a3090-fedora.tar.xz
-/glibc-2.14-34-ge2a3090.tar.xz
/glibc-ports-2.14-1-g2408627.tar.xz
+/glibc-2.14-38-g4eddf93-fedora.tar.xz
+/glibc-2.14-38-g4eddf93.tar.xz
diff --git a/glibc-fedora.patch b/glibc-fedora.patch
index 7481bcb..0aede87 100644
--- a/glibc-fedora.patch
+++ b/glibc-fedora.patch
@@ -1,6 +1,6 @@
---- glibc-2.14-34-ge2a3090/ChangeLog
+--- glibc-2.14-38-g4eddf93/ChangeLog
+++ glibc-2.14-5/ChangeLog
-@@ -103,6 +103,14 @@
+@@ -124,6 +124,14 @@
* malloc/memusage.sh: Fix quoting in message.
* debug/xtrace.sh: Likewise.
@@ -15,7 +15,7 @@
2011-06-27 Andreas Schwab <schwab at redhat.com>
* iconvdata/gb18030.c (BODY for TO_LOOP): Fix encoding of non-BMP
-@@ -118,6 +126,10 @@
+@@ -139,6 +147,10 @@
* sysdeps/posix/getaddrinfo.c (gaih_inet): When looking up only IPv6
addresses using gethostbyname4_r ignore IPv4 addresses.
@@ -26,7 +26,7 @@
2011-06-15 Ulrich Drepper <drepper at gmail.com>
* resolv/res_send.c (__libc_res_nsend): Fix typos in last patch. We
-@@ -595,6 +607,13 @@
+@@ -616,6 +628,13 @@
* libio/Makefile (tests): Add bug-fclose1.
* libio/bug-fclose1.c: New file.
@@ -40,7 +40,7 @@
2011-05-12 Ulrich Drepper <drepper at gmail.com>
[BZ #12511]
-@@ -872,13 +891,6 @@
+@@ -893,13 +912,6 @@
* stdlib/bug-getcontext.c: New file.
* stdlib/Makefile: Add rules to build and run bug-getcontext.
@@ -54,7 +54,7 @@
2011-04-11 Andreas Krebbel <Andreas.Krebbel at de.ibm.com>
* sysdeps/s390/s390-32/elf/start.S (_start): Skip extra zeroes
-@@ -1116,6 +1128,31 @@
+@@ -1137,6 +1149,31 @@
* sysdeps/unix/sysv/linux/Versions [GLIBC_2.14] (clock_adjtime):
Export.
@@ -86,7 +86,7 @@
2011-03-22 Ulrich Drepper <drepper at gmail.com>
* sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Increment
-@@ -1176,6 +1213,16 @@
+@@ -1197,6 +1234,16 @@
$LDFLAGS and -nostdlib -nostartfiles to linking step. Change main
to _start.
@@ -103,7 +103,7 @@
2011-03-06 Ulrich Drepper <drepper at gmail.com>
* elf/dl-load.c (_dl_map_object): If we are looking for the first
-@@ -1230,12 +1277,6 @@
+@@ -1251,12 +1298,6 @@
* elf/noload.c: Include <memcheck.h>.
(main): Call mtrace. Close all opened handles.
@@ -116,7 +116,7 @@
2011-02-22 Samuel Thibault <samuel.thibault at ens-lyon.org>
Fix __if_freereq crash: Unlike the generic version which uses free,
-@@ -1392,6 +1433,12 @@
+@@ -1413,6 +1454,12 @@
* shadow/sgetspent.c: Check return value of __sgetspent_r instead
of errno.
@@ -129,7 +129,7 @@
2011-01-19 Ulrich Drepper <drepper at gmail.com>
[BZ #11724]
-@@ -2079,6 +2126,29 @@
+@@ -2100,6 +2147,29 @@
* sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS):
Mask out sign-bit copies when constructing f_fsid.
@@ -159,7 +159,7 @@
2010-09-24 Petr Baudis <pasky at suse.cz>
* debug/stack_chk_fail_local.c: Add missing licence exception.
-@@ -2871,6 +2941,32 @@
+@@ -2892,6 +2962,32 @@
call returning > 0 value.
* sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise.
@@ -192,7 +192,7 @@
2010-06-07 Andreas Schwab <schwab at redhat.com>
* dlfcn/Makefile: Remove explicit dependencies on libc.so and
-@@ -2923,6 +3019,24 @@
+@@ -2944,6 +3040,24 @@
* hurd/hurd/fd.h (__file_name_lookup_at): Update comment.
* sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS.
@@ -217,7 +217,7 @@
2010-05-28 Luis Machado <luisgpm at br.ibm.com>
* sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi.
---- glibc-2.14-34-ge2a3090/ChangeLog.15
+--- glibc-2.14-38-g4eddf93/ChangeLog.15
+++ glibc-2.14-5/ChangeLog.15
@@ -477,6 +477,14 @@
@@ -284,7 +284,7 @@
2004-08-30 Roland McGrath <roland at frob.com>
* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-2.14-34-ge2a3090/ChangeLog.16
+--- glibc-2.14-38-g4eddf93/ChangeLog.16
+++ glibc-2.14-5/ChangeLog.16
@@ -2042,6 +2042,9 @@
(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
@@ -308,7 +308,7 @@
2006-01-19 Thomas Schwinge <tschwinge at gnu.org>
* libio/genops.c: Include <stdbool.h>.
---- glibc-2.14-34-ge2a3090/ChangeLog.17
+--- glibc-2.14-38-g4eddf93/ChangeLog.17
+++ glibc-2.14-5/ChangeLog.17
@@ -256,6 +256,12 @@
@@ -388,7 +388,7 @@
2006-12-09 Ulrich Drepper <drepper at redhat.com>
[BZ #3632]
---- glibc-2.14-34-ge2a3090/Makeconfig
+--- glibc-2.14-38-g4eddf93/Makeconfig
+++ glibc-2.14-5/Makeconfig
@@ -791,12 +791,12 @@ endif
# The assembler can generate debug information too.
@@ -406,7 +406,7 @@
ifndef BUILD_CC
BUILD_CC = $(CC)
---- glibc-2.14-34-ge2a3090/NEWS
+--- glibc-2.14-38-g4eddf93/NEWS
+++ glibc-2.14-5/NEWS
@@ -20,16 +20,6 @@ Version 2.14
12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792,
@@ -425,7 +425,7 @@
* New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at,
syncfs, setns, sendmmsg
---- glibc-2.14-34-ge2a3090/config.h.in
+--- glibc-2.14-38-g4eddf93/config.h.in
+++ glibc-2.14-5/config.h.in
@@ -204,6 +204,9 @@
/* Define if `.ctors' and `.dtors' sections shouldn't be used. */
@@ -437,7 +437,7 @@
/*
*/
---- glibc-2.14-34-ge2a3090/configure
+--- glibc-2.14-38-g4eddf93/configure
+++ glibc-2.14-5/configure
@@ -784,6 +784,7 @@ enable_all_warnings
enable_multi_arch
@@ -507,7 +507,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-34-ge2a3090/configure.in
+--- glibc-2.14-38-g4eddf93/configure.in
+++ glibc-2.14-5/configure.in
@@ -316,6 +316,29 @@ else
fi
@@ -539,7 +539,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-34-ge2a3090/csu/Makefile
+--- glibc-2.14-38-g4eddf93/csu/Makefile
+++ glibc-2.14-5/csu/Makefile
@@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
$(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
@@ -551,7 +551,7 @@
vpath initfini.c $(sysdirs)
---- glibc-2.14-34-ge2a3090/csu/elf-init.c
+--- glibc-2.14-38-g4eddf93/csu/elf-init.c
+++ glibc-2.14-5/csu/elf-init.c
@@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **)
extern void (*__fini_array_start []) (void) attribute_hidden;
@@ -577,7 +577,7 @@
/* These function symbols are provided for the .init/.fini section entry
points automagically by the linker. */
---- glibc-2.14-34-ge2a3090/debug/tst-chk1.c
+--- glibc-2.14-38-g4eddf93/debug/tst-chk1.c
+++ glibc-2.14-5/debug/tst-chk1.c
@@ -17,6 +17,9 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
@@ -607,7 +607,7 @@
# define O 0
# else
# define O 1
---- glibc-2.14-34-ge2a3090/elf/Makefile
+--- glibc-2.14-38-g4eddf93/elf/Makefile
+++ glibc-2.14-5/elf/Makefile
@@ -90,6 +90,7 @@ distribute := rtld-Rules \
unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \
@@ -672,7 +672,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-34-ge2a3090/elf/dl-close.c
+--- glibc-2.14-38-g4eddf93/elf/dl-close.c
+++ glibc-2.14-5/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
@@ -708,7 +708,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-34-ge2a3090/elf/dl-deps.c
+--- glibc-2.14-38-g4eddf93/elf/dl-deps.c
+++ glibc-2.14-5/elf/dl-deps.c
@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
nneeded * sizeof needed[0]);
@@ -748,7 +748,7 @@
+ _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
+ NULL, errstring);
}
---- glibc-2.14-34-ge2a3090/elf/dl-init.c
+--- glibc-2.14-38-g4eddf93/elf/dl-init.c
+++ glibc-2.14-5/elf/dl-init.c
@@ -24,11 +24,9 @@
/* Type of the initializer. */
@@ -772,7 +772,7 @@
-#endif
}
INTDEF (_dl_init)
---- glibc-2.14-34-ge2a3090/elf/dl-libc.c
+--- glibc-2.14-38-g4eddf93/elf/dl-libc.c
+++ glibc-2.14-5/elf/dl-libc.c
@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
@@ -800,7 +800,7 @@
}
if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
---- glibc-2.14-34-ge2a3090/elf/dl-load.c
+--- glibc-2.14-38-g4eddf93/elf/dl-load.c
+++ glibc-2.14-5/elf/dl-load.c
@@ -250,8 +250,7 @@ is_trusted_path_normalize (const char *path, size_t len)
@@ -881,7 +881,7 @@
}
else
/* No DST we recognize. */
---- glibc-2.14-34-ge2a3090/elf/dl-support.c
+--- glibc-2.14-38-g4eddf93/elf/dl-support.c
+++ glibc-2.14-5/elf/dl-support.c
@@ -81,10 +81,8 @@ unsigned long long _dl_load_adds;
create a fake scope containing nothing. */
@@ -894,7 +894,7 @@
/* Random data provided by the kernel. */
void *_dl_random;
---- glibc-2.14-34-ge2a3090/elf/ldconfig.c
+--- glibc-2.14-38-g4eddf93/elf/ldconfig.c
+++ glibc-2.14-5/elf/ldconfig.c
@@ -1034,17 +1034,19 @@ search_dirs (void)
@@ -977,7 +977,7 @@
}
const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;
---- glibc-2.14-34-ge2a3090/elf/ldd.bash.in
+--- glibc-2.14-38-g4eddf93/elf/ldd.bash.in
+++ glibc-2.14-5/elf/ldd.bash.in
@@ -167,18 +167,6 @@ warning: you do not have execution permission for" "\`$file'" >&2
fi
@@ -1007,7 +1007,7 @@
try_trace "$RTLD" "$file" || result=1
;;
*)
---- glibc-2.14-34-ge2a3090/elf/rtld-Rules
+--- glibc-2.14-38-g4eddf93/elf/rtld-Rules
+++ glibc-2.14-5/elf/rtld-Rules
@@ -1,7 +1,7 @@
# Subroutine makefile for compiling libc modules linked into dynamic linker.
@@ -1026,7 +1026,7 @@
+rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld
endif
---- glibc-2.14-34-ge2a3090/elf/rtld.c
+--- glibc-2.14-38-g4eddf93/elf/rtld.c
+++ glibc-2.14-5/elf/rtld.c
@@ -107,7 +107,6 @@ static struct audit_list
struct audit_list *next;
@@ -1071,7 +1071,7 @@
if (! prelinked && rtld_multiple_ref)
{
/* There was an explicit ref to the dynamic linker as a shared lib.
---- glibc-2.14-34-ge2a3090/elf/unload8.c
+--- glibc-2.14-38-g4eddf93/elf/unload8.c
+++ glibc-2.14-5/elf/unload8.c
@@ -0,0 +1,33 @@
+#include <dlfcn.h>
@@ -1107,7 +1107,7 @@
+
+ return 0;
+}
---- glibc-2.14-34-ge2a3090/elf/unload8mod1.c
+--- glibc-2.14-38-g4eddf93/elf/unload8mod1.c
+++ glibc-2.14-5/elf/unload8mod1.c
@@ -0,0 +1,7 @@
+extern void mod2 (void);
@@ -1117,11 +1117,11 @@
+{
+ mod2 ();
+}
---- glibc-2.14-34-ge2a3090/elf/unload8mod1x.c
+--- glibc-2.14-38-g4eddf93/elf/unload8mod1x.c
+++ glibc-2.14-5/elf/unload8mod1x.c
@@ -0,0 +1 @@
+int mod1x;
---- glibc-2.14-34-ge2a3090/elf/unload8mod2.c
+--- glibc-2.14-38-g4eddf93/elf/unload8mod2.c
+++ glibc-2.14-5/elf/unload8mod2.c
@@ -0,0 +1,7 @@
+extern void mod3 (void);
@@ -1131,7 +1131,7 @@
+{
+ mod3 ();
+}
---- glibc-2.14-34-ge2a3090/elf/unload8mod3.c
+--- glibc-2.14-38-g4eddf93/elf/unload8mod3.c
+++ glibc-2.14-5/elf/unload8mod3.c
@@ -0,0 +1,27 @@
+#include <dlfcn.h>
@@ -1161,7 +1161,7 @@
+
+ atexit (mod3_fini);
+}
---- glibc-2.14-34-ge2a3090/extra-lib.mk
+--- glibc-2.14-38-g4eddf93/extra-lib.mk
+++ glibc-2.14-5/extra-lib.mk
@@ -101,4 +101,4 @@ ifneq (,$(cpp-srcs-left))
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
@@ -1169,15 +1169,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-34-ge2a3090/include/bits/stdlib-ldbl.h
+--- glibc-2.14-38-g4eddf93/include/bits/stdlib-ldbl.h
+++ glibc-2.14-5/include/bits/stdlib-ldbl.h
@@ -0,0 +1 @@
+#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-2.14-34-ge2a3090/include/bits/wchar-ldbl.h
+--- glibc-2.14-38-g4eddf93/include/bits/wchar-ldbl.h
+++ glibc-2.14-5/include/bits/wchar-ldbl.h
@@ -0,0 +1 @@
+#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-2.14-34-ge2a3090/include/features.h
+--- glibc-2.14-38-g4eddf93/include/features.h
+++ glibc-2.14-5/include/features.h
@@ -310,8 +310,13 @@
#endif
@@ -1195,7 +1195,7 @@
# define __USE_FORTIFY_LEVEL 2
# else
# define __USE_FORTIFY_LEVEL 1
---- glibc-2.14-34-ge2a3090/include/libc-symbols.h
+--- glibc-2.14-38-g4eddf93/include/libc-symbols.h
+++ glibc-2.14-5/include/libc-symbols.h
@@ -635,7 +635,7 @@ for linking")
# define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
@@ -1206,7 +1206,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-34-ge2a3090/include/link.h
+--- glibc-2.14-38-g4eddf93/include/link.h
+++ glibc-2.14-5/include/link.h
@@ -1,6 +1,6 @@
/* Data structure for communication from the run-time dynamic linker for
@@ -1236,7 +1236,7 @@
/* List of the dependencies introduced through symbol binding. */
struct link_map_reldeps
---- glibc-2.14-34-ge2a3090/include/stap-probe.h
+--- glibc-2.14-38-g4eddf93/include/stap-probe.h
+++ glibc-2.14-5/include/stap-probe.h
@@ -0,0 +1,140 @@
+/* Macros for defining Systemtap <sys/sdt.h> static probe points.
@@ -1379,7 +1379,7 @@
+#endif /* USE_STAP_PROBE. */
+
+#endif /* stap-probe.h */
---- glibc-2.14-34-ge2a3090/include/sys/resource.h
+--- glibc-2.14-38-g4eddf93/include/sys/resource.h
+++ glibc-2.14-5/include/sys/resource.h
@@ -13,4 +13,5 @@ extern int __getrusage (enum __rusage_who __who, struct rusage *__usage)
@@ -1387,7 +1387,7 @@
const struct rlimit *__rlimits);
+libc_hidden_proto (__getrlimit)
#endif
---- glibc-2.14-34-ge2a3090/inet/Makefile
+--- glibc-2.14-38-g4eddf93/inet/Makefile
+++ glibc-2.14-5/inet/Makefile
@@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \
@@ -1398,7 +1398,7 @@
ifeq ($(have-thread-library),yes)
CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions
---- glibc-2.14-34-ge2a3090/intl/locale.alias
+--- glibc-2.14-38-g4eddf93/intl/locale.alias
+++ glibc-2.14-5/intl/locale.alias
@@ -57,8 +57,6 @@ korean ko_KR.eucKR
korean.euc ko_KR.eucKR
@@ -1409,7 +1409,7 @@
norwegian nb_NO.ISO-8859-1
nynorsk nn_NO.ISO-8859-1
polish pl_PL.ISO-8859-2
---- glibc-2.14-34-ge2a3090/libio/stdio.h
+--- glibc-2.14-38-g4eddf93/libio/stdio.h
+++ glibc-2.14-5/libio/stdio.h
@@ -165,10 +165,12 @@ typedef _G_fpos64_t fpos64_t;
extern struct _IO_FILE *stdin; /* Standard input stream. */
@@ -1424,7 +1424,7 @@
__BEGIN_NAMESPACE_STD
/* Remove file FILENAME. */
---- glibc-2.14-34-ge2a3090/locale/iso-4217.def
+--- glibc-2.14-38-g4eddf93/locale/iso-4217.def
+++ glibc-2.14-5/locale/iso-4217.def
@@ -8,6 +8,7 @@
*
@@ -1517,7 +1517,7 @@
DEFINE_INT_CURR("PYG") /* Paraguay Guarani */
DEFINE_INT_CURR("QAR") /* Qatar Rial */
DEFINE_INT_CURR("ROL") /* Romanian Leu */
---- glibc-2.14-34-ge2a3090/locale/programs/locarchive.c
+--- glibc-2.14-38-g4eddf93/locale/programs/locarchive.c
+++ glibc-2.14-5/locale/programs/locarchive.c
@@ -134,7 +134,7 @@ create_archive (const char *archivefname, struct locarhandle *ah)
size_t reserved = RESERVE_MMAP_SIZE;
@@ -1577,7 +1577,7 @@
add_alias (struct locarhandle *ah, const char *alias, bool replace,
const char *oldname, uint32_t *locrec_offset_p)
{
---- glibc-2.14-34-ge2a3090/localedata/ChangeLog
+--- glibc-2.14-38-g4eddf93/localedata/ChangeLog
+++ glibc-2.14-5/localedata/ChangeLog
@@ -1,3 +1,11 @@
+2011-06-28 Andreas Schwab <schwab at redhat.com>
@@ -1591,7 +1591,7 @@
2011-05-21 Ulrich Drepper <drepper at gmail.com>
[BZ #12788]
---- glibc-2.14-34-ge2a3090/localedata/Makefile
+--- glibc-2.14-38-g4eddf93/localedata/Makefile
+++ glibc-2.14-5/localedata/Makefile
@@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
echo -n '...'; \
@@ -1601,7 +1601,7 @@
-i locales/$$input -c -f charmaps/$$charset \
$(addprefix --prefix=,$(install_root)) $$locale; \
echo ' done'; \
---- glibc-2.14-34-ge2a3090/localedata/SUPPORTED
+--- glibc-2.14-38-g4eddf93/localedata/SUPPORTED
+++ glibc-2.14-5/localedata/SUPPORTED
@@ -86,6 +86,7 @@ cy_GB.UTF-8/UTF-8 \
cy_GB/ISO-8859-14 \
@@ -1644,7 +1644,7 @@
sw_KE/UTF-8 \
sw_TZ/UTF-8 \
ta_IN/UTF-8 \
---- glibc-2.14-34-ge2a3090/localedata/locales/cy_GB
+--- glibc-2.14-38-g4eddf93/localedata/locales/cy_GB
+++ glibc-2.14-5/localedata/locales/cy_GB
@@ -248,8 +248,11 @@ mon "<U0049><U006F><U006E><U0061><U0077><U0072>";/
d_t_fmt "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
@@ -1660,7 +1660,7 @@
END LC_TIME
LC_MESSAGES
---- glibc-2.14-34-ge2a3090/localedata/locales/en_GB
+--- glibc-2.14-38-g4eddf93/localedata/locales/en_GB
+++ glibc-2.14-5/localedata/locales/en_GB
@@ -116,8 +116,8 @@ mon "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/
d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
@@ -1673,7 +1673,7 @@
date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
<U0025><U005A><U0020><U0025><U0059>"
---- glibc-2.14-34-ge2a3090/localedata/locales/no_NO
+--- glibc-2.14-38-g4eddf93/localedata/locales/no_NO
+++ glibc-2.14-5/localedata/locales/no_NO
@@ -0,0 +1,69 @@
+escape_char /
@@ -1745,7 +1745,7 @@
+LC_ADDRESS
+copy "nb_NO"
+END LC_ADDRESS
---- glibc-2.14-34-ge2a3090/localedata/locales/zh_TW
+--- glibc-2.14-38-g4eddf93/localedata/locales/zh_TW
+++ glibc-2.14-5/localedata/locales/zh_TW
@@ -1,7 +1,7 @@
comment_char %
@@ -1774,7 +1774,7 @@
revision "0.2"
date "2000-08-02"
%
---- glibc-2.14-34-ge2a3090/login/programs/pt_chown.c
+--- glibc-2.14-38-g4eddf93/login/programs/pt_chown.c
+++ glibc-2.14-5/login/programs/pt_chown.c
@@ -29,6 +29,7 @@
#include <string.h>
@@ -1817,7 +1817,7 @@
-
return EXIT_SUCCESS;
}
---- glibc-2.14-34-ge2a3090/malloc/mcheck.c
+--- glibc-2.14-38-g4eddf93/malloc/mcheck.c
+++ glibc-2.14-5/malloc/mcheck.c
@@ -25,10 +25,26 @@
# include <mcheck.h>
@@ -1895,7 +1895,7 @@
old_free_hook = __free_hook;
__free_hook = freehook;
---- glibc-2.14-34-ge2a3090/manual/libc.texinfo
+--- glibc-2.14-38-g4eddf93/manual/libc.texinfo
+++ glibc-2.14-5/manual/libc.texinfo
@@ -5,7 +5,7 @@
@c setchapternewpage odd
@@ -1906,7 +1906,7 @@
@direntry
* Libc: (libc). C library.
@end direntry
---- glibc-2.14-34-ge2a3090/misc/sys/cdefs.h
+--- glibc-2.14-38-g4eddf93/misc/sys/cdefs.h
+++ glibc-2.14-5/misc/sys/cdefs.h
@@ -132,7 +132,10 @@
#define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
@@ -1951,7 +1951,7 @@
# define __va_arg_pack() __builtin_va_arg_pack ()
# define __va_arg_pack_len() __builtin_va_arg_pack_len ()
#endif
---- glibc-2.14-34-ge2a3090/nis/Makefile
+--- glibc-2.14-38-g4eddf93/nis/Makefile
+++ glibc-2.14-5/nis/Makefile
@@ -23,9 +23,9 @@ subdir := nis
@@ -1974,7 +1974,7 @@
$(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version)
$(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \
---- glibc-2.14-34-ge2a3090/nis/nss
+--- glibc-2.14-38-g4eddf93/nis/nss
+++ glibc-2.14-5/nis/nss
@@ -25,7 +25,7 @@
# memory with every getXXent() call. Otherwise each getXXent() call
@@ -1985,9 +1985,9 @@
#
# ADJUNCT_AS_SHADOW
# If set to TRUE, the passwd routines in the NIS NSS module will not
---- glibc-2.14-34-ge2a3090/nptl/ChangeLog
+--- glibc-2.14-38-g4eddf93/nptl/ChangeLog
+++ glibc-2.14-5/nptl/ChangeLog
-@@ -24,6 +24,51 @@
+@@ -31,6 +31,51 @@
clearing memory.
Patch partly by Robert Rex <robert.rex at exasol.com>.
@@ -2039,7 +2039,7 @@
2011-01-19 Roland McGrath <roland at redhat.com>
* pthread_cond_wait.c (__pthread_cond_wait): Fix comment typo.
-@@ -4753,6 +4798,11 @@
+@@ -4760,6 +4805,11 @@
Move definition inside libpthread, libc, librt check. Provide
definition for rtld.
@@ -2051,7 +2051,7 @@
2004-09-02 Ulrich Drepper <drepper at redhat.com>
* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -6827,6 +6877,11 @@
+@@ -6834,6 +6884,11 @@
* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
@@ -2063,7 +2063,7 @@
2003-07-25 Jakub Jelinek <jakub at redhat.com>
* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-2.14-34-ge2a3090/nptl/DESIGN-systemtap-probes.txt
+--- glibc-2.14-38-g4eddf93/nptl/DESIGN-systemtap-probes.txt
+++ glibc-2.14-5/nptl/DESIGN-systemtap-probes.txt
@@ -0,0 +1,89 @@
+Systemtap is a dynamic tracing/instrumenting tool available on Linux. Probes
@@ -2155,7 +2155,7 @@
+ arg1 = condition
+cond_broadcast - probe for pthread_cond_broadcast
+ arg1 = condition
---- glibc-2.14-34-ge2a3090/nptl/Makefile
+--- glibc-2.14-38-g4eddf93/nptl/Makefile
+++ glibc-2.14-5/nptl/Makefile
@@ -342,7 +342,8 @@ endif
extra-objs += $(crti-objs) $(crtn-objs)
@@ -2189,7 +2189,7 @@
else
$(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
endif
---- glibc-2.14-34-ge2a3090/nptl/Versions
+--- glibc-2.14-38-g4eddf93/nptl/Versions
+++ glibc-2.14-5/nptl/Versions
@@ -30,6 +30,7 @@ libc {
__libc_alloca_cutoff;
@@ -2199,7 +2199,7 @@
}
}
---- glibc-2.14-34-ge2a3090/nptl/allocatestack.c
+--- glibc-2.14-38-g4eddf93/nptl/allocatestack.c
+++ glibc-2.14-5/nptl/allocatestack.c
@@ -999,7 +999,16 @@ setxid_mark_thread (struct xid_command *cmdp, struct pthread *t)
@@ -2219,7 +2219,7 @@
}
while (atomic_compare_and_exchange_bool_acq (&t->cancelhandling,
ch | SETXID_BITMASK, ch));
---- glibc-2.14-34-ge2a3090/nptl/nptl-init.c
+--- glibc-2.14-38-g4eddf93/nptl/nptl-init.c
+++ glibc-2.14-5/nptl/nptl-init.c
@@ -414,7 +414,7 @@ __pthread_initialize_minimal_internal (void)
/* Determine the default allowed stack size. This is the size used
@@ -2230,7 +2230,7 @@
|| limit.rlim_cur == RLIM_INFINITY)
/* The system limit is not usable. Use an architecture-specific
default. */
---- glibc-2.14-34-ge2a3090/nptl/pthread_cond_broadcast.c
+--- glibc-2.14-38-g4eddf93/nptl/pthread_cond_broadcast.c
+++ glibc-2.14-5/nptl/pthread_cond_broadcast.c
@@ -23,6 +23,7 @@
#include <lowlevellock.h>
@@ -2249,7 +2249,7 @@
int pshared = (cond->__data.__mutex == (void *) ~0l)
? LLL_SHARED : LLL_PRIVATE;
/* Make sure we are alone. */
---- glibc-2.14-34-ge2a3090/nptl/pthread_cond_destroy.c
+--- glibc-2.14-38-g4eddf93/nptl/pthread_cond_destroy.c
+++ glibc-2.14-5/nptl/pthread_cond_destroy.c
@@ -20,6 +20,7 @@
#include <errno.h>
@@ -2268,7 +2268,7 @@
/* Make sure we are alone. */
lll_lock (cond->__data.__lock, pshared);
---- glibc-2.14-34-ge2a3090/nptl/pthread_cond_init.c
+--- glibc-2.14-38-g4eddf93/nptl/pthread_cond_init.c
+++ glibc-2.14-5/nptl/pthread_cond_init.c
@@ -20,6 +20,7 @@
@@ -2287,7 +2287,7 @@
return 0;
}
versioned_symbol (libpthread, __pthread_cond_init,
---- glibc-2.14-34-ge2a3090/nptl/pthread_cond_signal.c
+--- glibc-2.14-38-g4eddf93/nptl/pthread_cond_signal.c
+++ glibc-2.14-5/nptl/pthread_cond_signal.c
@@ -26,6 +26,7 @@
@@ -2306,7 +2306,7 @@
/* Make sure we are alone. */
lll_lock (cond->__data.__lock, pshared);
---- glibc-2.14-34-ge2a3090/nptl/pthread_cond_wait.c
+--- glibc-2.14-38-g4eddf93/nptl/pthread_cond_wait.c
+++ glibc-2.14-5/nptl/pthread_cond_wait.c
@@ -25,6 +25,7 @@
#include <pthreadP.h>
@@ -2325,7 +2325,7 @@
/* Make sure we are alone. */
lll_lock (cond->__data.__lock, pshared);
---- glibc-2.14-34-ge2a3090/nptl/pthread_create.c
+--- glibc-2.14-38-g4eddf93/nptl/pthread_create.c
+++ glibc-2.14-5/nptl/pthread_create.c
@@ -31,6 +31,8 @@
@@ -2354,7 +2354,7 @@
/* Start the thread. */
return create_thread (pd, iattr, STACK_VARIABLES_ARGS);
}
---- glibc-2.14-34-ge2a3090/nptl/pthread_join.c
+--- glibc-2.14-38-g4eddf93/nptl/pthread_join.c
+++ glibc-2.14-5/nptl/pthread_join.c
@@ -23,6 +23,8 @@
#include <atomic.h>
@@ -2382,7 +2382,7 @@
+
return result;
}
---- glibc-2.14-34-ge2a3090/nptl/pthread_mutex_destroy.c
+--- glibc-2.14-38-g4eddf93/nptl/pthread_mutex_destroy.c
+++ glibc-2.14-5/nptl/pthread_mutex_destroy.c
@@ -20,11 +20,15 @@
#include <errno.h>
@@ -2400,7 +2400,7 @@
if ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) == 0
&& mutex->__data.__nusers != 0)
return EBUSY;
---- glibc-2.14-34-ge2a3090/nptl/pthread_mutex_init.c
+--- glibc-2.14-38-g4eddf93/nptl/pthread_mutex_init.c
+++ glibc-2.14-5/nptl/pthread_mutex_init.c
@@ -24,6 +24,8 @@
#include <kernel-features.h>
@@ -2420,7 +2420,7 @@
return 0;
}
strong_alias (__pthread_mutex_init, pthread_mutex_init)
---- glibc-2.14-34-ge2a3090/nptl/pthread_mutex_lock.c
+--- glibc-2.14-38-g4eddf93/nptl/pthread_mutex_lock.c
+++ glibc-2.14-5/nptl/pthread_mutex_lock.c
@@ -24,6 +24,7 @@
#include <not-cancel.h>
@@ -2458,7 +2458,7 @@
return 0;
}
#ifndef __pthread_mutex_lock
---- glibc-2.14-34-ge2a3090/nptl/pthread_mutex_timedlock.c
+--- glibc-2.14-38-g4eddf93/nptl/pthread_mutex_timedlock.c
+++ glibc-2.14-5/nptl/pthread_mutex_timedlock.c
@@ -24,6 +24,8 @@
#include <lowlevellock.h>
@@ -2514,7 +2514,7 @@
}
out:
---- glibc-2.14-34-ge2a3090/nptl/pthread_mutex_unlock.c
+--- glibc-2.14-38-g4eddf93/nptl/pthread_mutex_unlock.c
+++ glibc-2.14-5/nptl/pthread_mutex_unlock.c
@@ -22,6 +22,7 @@
#include <stdlib.h>
@@ -2552,7 +2552,7 @@
return 0;
}
---- glibc-2.14-34-ge2a3090/nptl/pthread_rwlock_destroy.c
+--- glibc-2.14-38-g4eddf93/nptl/pthread_rwlock_destroy.c
+++ glibc-2.14-5/nptl/pthread_rwlock_destroy.c
@@ -18,12 +18,15 @@
02111-1307 USA. */
@@ -2570,7 +2570,7 @@
/* Nothing to be done. For now. */
return 0;
}
---- glibc-2.14-34-ge2a3090/nptl/pthread_rwlock_rdlock.c
+--- glibc-2.14-38-g4eddf93/nptl/pthread_rwlock_rdlock.c
+++ glibc-2.14-5/nptl/pthread_rwlock_rdlock.c
@@ -22,6 +22,7 @@
#include <lowlevellock.h>
@@ -2598,7 +2598,7 @@
break;
}
---- glibc-2.14-34-ge2a3090/nptl/pthread_rwlock_unlock.c
+--- glibc-2.14-38-g4eddf93/nptl/pthread_rwlock_unlock.c
+++ glibc-2.14-5/nptl/pthread_rwlock_unlock.c
@@ -22,11 +22,14 @@
#include <lowlevellock.h>
@@ -2615,7 +2615,7 @@
lll_lock (rwlock->__data.__lock, rwlock->__data.__shared);
if (rwlock->__data.__writer)
rwlock->__data.__writer = 0;
---- glibc-2.14-34-ge2a3090/nptl/pthread_rwlock_wrlock.c
+--- glibc-2.14-38-g4eddf93/nptl/pthread_rwlock_wrlock.c
+++ glibc-2.14-5/nptl/pthread_rwlock_wrlock.c
@@ -22,6 +22,7 @@
#include <lowlevellock.h>
@@ -2643,7 +2643,7 @@
break;
}
---- glibc-2.14-34-ge2a3090/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+--- glibc-2.14-38-g4eddf93/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+++ glibc-2.14-5/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
@@ -189,4 +189,7 @@
/* Typed memory objects are not available. */
@@ -2653,7 +2653,7 @@
+#define _XOPEN_STREAMS -1
+
#endif /* bits/posix_opt.h */
---- glibc-2.14-34-ge2a3090/nptl/sysdeps/unix/sysv/linux/i386/Versions
+--- glibc-2.14-38-g4eddf93/nptl/sysdeps/unix/sysv/linux/i386/Versions
+++ glibc-2.14-5/nptl/sysdeps/unix/sysv/linux/i386/Versions
@@ -0,0 +1,6 @@
+libc {
@@ -2662,7 +2662,7 @@
+ __uname;
+ }
+}
---- glibc-2.14-34-ge2a3090/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
+--- glibc-2.14-38-g4eddf93/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
+++ glibc-2.14-5/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
@@ -22,6 +22,8 @@
#include <kernel-features.h>
@@ -2683,7 +2683,7 @@
ENTER_KERNEL
2: movl %edx, %eax
---- glibc-2.14-34-ge2a3090/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
+--- glibc-2.14-38-g4eddf93/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
+++ glibc-2.14-5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
@@ -24,6 +24,7 @@
#include <kernel-features.h>
@@ -2702,7 +2702,7 @@
/* Get internal lock. */
movl $1, %edx
xorl %eax, %eax
---- glibc-2.14-34-ge2a3090/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
+--- glibc-2.14-38-g4eddf93/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
+++ glibc-2.14-5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
@@ -24,7 +24,7 @@
#include <kernel-features.h>
@@ -2722,7 +2722,7 @@
/* Get internal lock. */
movl $1, %edx
xorl %eax, %eax
---- glibc-2.14-34-ge2a3090/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
+--- glibc-2.14-38-g4eddf93/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
+++ glibc-2.14-5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
@@ -24,7 +24,7 @@
#include <pthread-errnos.h>
@@ -2742,7 +2742,7 @@
cmpl $1000000000, 4(%ebp)
movl $EINVAL, %eax
jae 18f
---- glibc-2.14-34-ge2a3090/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
+--- glibc-2.14-38-g4eddf93/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
+++ glibc-2.14-5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
@@ -25,6 +25,7 @@
#include <pthread-errnos.h>
@@ -2761,7 +2761,7 @@
/* Get internal lock. */
movl $1, %edx
xorl %eax, %eax
---- glibc-2.14-34-ge2a3090/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
+--- glibc-2.14-38-g4eddf93/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
+++ glibc-2.14-5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
@@ -23,6 +23,7 @@
#include <pthread-errnos.h>
@@ -2780,7 +2780,7 @@
/* Get the lock. */
movl $1, %edx
xorl %eax, %eax
---- glibc-2.14-34-ge2a3090/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
+--- glibc-2.14-38-g4eddf93/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
+++ glibc-2.14-5/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
@@ -23,6 +23,7 @@
#include <pthread-errnos.h>
@@ -2799,7 +2799,7 @@
/* Get the lock. */
movl $1, %edx
xorl %eax, %eax
---- glibc-2.14-34-ge2a3090/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
+--- glibc-2.14-38-g4eddf93/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
+++ glibc-2.14-5/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
@@ -20,6 +20,8 @@
#ifndef _LOWLEVELLOCK_H
@@ -2818,7 +2818,7 @@
__asm __volatile (LLL_EBX_LOAD \
LLL_ENTER_KERNEL \
LLL_EBX_LOAD \
---- glibc-2.14-34-ge2a3090/nptl/sysdeps/unix/sysv/linux/i386/smp.h
+--- glibc-2.14-38-g4eddf93/nptl/sysdeps/unix/sysv/linux/i386/smp.h
+++ glibc-2.14-5/nptl/sysdeps/unix/sysv/linux/i386/smp.h
@@ -37,7 +37,7 @@ is_smp_system (void)
char *cp;
@@ -2829,7 +2829,7 @@
cp = u.uts.version;
else
{
---- glibc-2.14-34-ge2a3090/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.14-38-g4eddf93/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+++ glibc-2.14-5/nptl/sysdeps/unix/sysv/linux/kernel-features.h
@@ -0,0 +1,6 @@
+#include_next <kernel-features.h>
@@ -2838,7 +2838,7 @@
+#ifndef __ASSUME_CLONE_THREAD_FLAGS
+# define __ASSUME_CLONE_THREAD_FLAGS 1
+#endif
---- glibc-2.14-34-ge2a3090/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
+--- glibc-2.14-38-g4eddf93/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
+++ glibc-2.14-5/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
@@ -22,6 +22,8 @@
#include <kernel-features.h>
@@ -2869,7 +2869,7 @@
syscall
2: movl %edx, %eax
---- glibc-2.14-34-ge2a3090/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
+--- glibc-2.14-38-g4eddf93/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
+++ glibc-2.14-5/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
@@ -20,6 +20,8 @@
#ifndef _LOWLEVELLOCK_H
@@ -2888,7 +2888,7 @@
__asm __volatile ("syscall" \
: "=a" (__ignore) \
: "0" (SYS_futex), "D" (futex), \
---- glibc-2.14-34-ge2a3090/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S
+--- glibc-2.14-38-g4eddf93/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S
+++ glibc-2.14-5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S
@@ -25,7 +25,7 @@
#include <kernel-features.h>
@@ -2908,7 +2908,7 @@
/* Get internal lock. */
movl $1, %esi
xorl %eax, %eax
---- glibc-2.14-34-ge2a3090/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S
+--- glibc-2.14-38-g4eddf93/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S
+++ glibc-2.14-5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S
@@ -24,6 +24,7 @@
#include <pthread-pi-defines.h>
@@ -2927,7 +2927,7 @@
/* Get internal lock. */
movq %rdi, %r8
movl $1, %esi
---- glibc-2.14-34-ge2a3090/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
+--- glibc-2.14-38-g4eddf93/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
+++ glibc-2.14-5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
@@ -23,6 +23,7 @@
#include <lowlevelcond.h>
@@ -2946,7 +2946,7 @@
cmpq $1000000000, 8(%rdx)
movl $EINVAL, %eax
jae 48f
---- glibc-2.14-34-ge2a3090/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
+--- glibc-2.14-38-g4eddf93/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
+++ glibc-2.14-5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
@@ -23,6 +23,7 @@
#include <lowlevelcond.h>
@@ -2965,7 +2965,7 @@
cmpq $-1, dep_mutex(%rdi)
/* Prepare structure passed to cancellation handler. */
---- glibc-2.14-34-ge2a3090/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
+--- glibc-2.14-38-g4eddf93/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
+++ glibc-2.14-5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
@@ -22,7 +22,7 @@
#include <lowlevelrwlock.h>
@@ -2986,7 +2986,7 @@
xorq %r10, %r10
/* Get the lock. */
---- glibc-2.14-34-ge2a3090/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
+--- glibc-2.14-38-g4eddf93/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
+++ glibc-2.14-5/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
@@ -22,7 +22,7 @@
#include <lowlevelrwlock.h>
@@ -3007,7 +3007,7 @@
xorq %r10, %r10
/* Get the lock. */
---- glibc-2.14-34-ge2a3090/nscd/nscd.conf
+--- glibc-2.14-38-g4eddf93/nscd/nscd.conf
+++ glibc-2.14-5/nscd/nscd.conf
@@ -33,7 +33,7 @@
# logfile /var/log/nscd.log
@@ -3018,7 +3018,7 @@
# stat-user somebody
debug-level 0
# reload-count 5
---- glibc-2.14-34-ge2a3090/nscd/nscd.init
+--- glibc-2.14-38-g4eddf93/nscd/nscd.init
+++ glibc-2.14-5/nscd/nscd.init
@@ -9,6 +9,7 @@
# slow naming services like NIS, NIS+, LDAP, or hesiod.
@@ -3096,7 +3096,7 @@
;;
*)
echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-2.14-34-ge2a3090/nss/Makefile
+--- glibc-2.14-38-g4eddf93/nss/Makefile
+++ glibc-2.14-5/nss/Makefile
@@ -75,6 +75,7 @@ endif
@@ -3106,7 +3106,7 @@
ifeq (yes,$(build-static-nss))
$(objpfx)getent: $(objpfx)libnss_files.a
---- glibc-2.14-34-ge2a3090/nss/nss_files/files-XXX.c
+--- glibc-2.14-38-g4eddf93/nss/nss_files/files-XXX.c
+++ glibc-2.14-5/nss/nss_files/files-XXX.c
@@ -1,5 +1,5 @@
/* Common code for file-based databases in nss_files module.
@@ -3124,7 +3124,7 @@
int parse_result;
if (buflen < sizeof *data + 2)
---- glibc-2.14-34-ge2a3090/posix/Makefile
+--- glibc-2.14-38-g4eddf93/posix/Makefile
+++ glibc-2.14-5/posix/Makefile
@@ -325,15 +325,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
mv -f $@/$$spec.new $@/$$spec; \
@@ -3143,10 +3143,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-34-ge2a3090/posix/gai.conf
+--- glibc-2.14-38-g4eddf93/posix/gai.conf
+++ glibc-2.14-5/posix/gai.conf
@@ -41,7 +41,7 @@
#
@@ -3172,7 +3172,7 @@
#scopev4 ::ffff:0.0.0.0/96 14
+#
+# This is what the Red Hat setting currently uses.
---- glibc-2.14-34-ge2a3090/posix/getconf.speclist.h
+--- glibc-2.14-38-g4eddf93/posix/getconf.speclist.h
+++ glibc-2.14-5/posix/getconf.speclist.h
@@ -0,0 +1,39 @@
+#include <unistd.h>
@@ -3214,7 +3214,7 @@
+"XBS5_LPBIG_OFFBIG"
+#endif
+"";
---- glibc-2.14-34-ge2a3090/posix/regcomp.c
+--- glibc-2.14-38-g4eddf93/posix/regcomp.c
+++ glibc-2.14-5/posix/regcomp.c
@@ -2745,40 +2745,29 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
@@ -3347,7 +3347,7 @@
{
/* No valid character, treat it as a normal
character. */
---- glibc-2.14-34-ge2a3090/resolv/Makefile
+--- glibc-2.14-38-g4eddf93/resolv/Makefile
+++ glibc-2.14-5/resolv/Makefile
@@ -77,6 +77,7 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \
-Dgetnetbyaddr=res_getnetbyaddr
@@ -3357,7 +3357,7 @@
# The BIND code elicits some harmless warnings.
+cflags += -Wno-strict-prototypes -Wno-write-strings
---- glibc-2.14-34-ge2a3090/resource/getrlimit.c
+--- glibc-2.14-38-g4eddf93/resource/getrlimit.c
+++ glibc-2.14-5/resource/getrlimit.c
@@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
__set_errno (ENOSYS);
@@ -3367,7 +3367,7 @@
weak_alias (__getrlimit, getrlimit)
stub_warning (getrlimit)
---- glibc-2.14-34-ge2a3090/scripts/check-local-headers.sh
+--- glibc-2.14-38-g4eddf93/scripts/check-local-headers.sh
+++ glibc-2.14-5/scripts/check-local-headers.sh
@@ -31,6 +31,8 @@ fgrep -v "$includedir/asm" |
fgrep -v "$includedir/linux" |
@@ -3378,7 +3378,7 @@
fgrep -v "$includedir/gd" |
fgrep -v "$includedir/nss3"; then
# If we found a match something is wrong.
---- glibc-2.14-34-ge2a3090/stdio-common/vfprintf.c
+--- glibc-2.14-38-g4eddf93/stdio-common/vfprintf.c
+++ glibc-2.14-5/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')) \
@@ -3425,7 +3425,7 @@
else \
len = strlen (string); \
} \
---- glibc-2.14-34-ge2a3090/streams/Makefile
+--- glibc-2.14-38-g4eddf93/streams/Makefile
+++ glibc-2.14-5/streams/Makefile
@@ -21,7 +21,7 @@
#
@@ -3436,7 +3436,7 @@
routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach
include ../Rules
---- glibc-2.14-34-ge2a3090/sunrpc/Makefile
+--- glibc-2.14-38-g4eddf93/sunrpc/Makefile
+++ glibc-2.14-5/sunrpc/Makefile
@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \
des_crypt.h)
@@ -3458,7 +3458,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-34-ge2a3090/sysdeps/generic/dl-cache.h
+--- glibc-2.14-38-g4eddf93/sysdeps/generic/dl-cache.h
+++ glibc-2.14-5/sysdeps/generic/dl-cache.h
@@ -36,6 +36,14 @@
# define add_system_dir(dir) add_dir (dir)
@@ -3475,7 +3475,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-34-ge2a3090/sysdeps/i386/Makefile
+--- glibc-2.14-38-g4eddf93/sysdeps/i386/Makefile
+++ glibc-2.14-5/sysdeps/i386/Makefile
@@ -2,6 +2,8 @@
# Every i386 port in use uses gas syntax (I think).
@@ -3501,7 +3501,7 @@
endif
ifeq ($(subdir),elf)
---- glibc-2.14-34-ge2a3090/sysdeps/i386/__longjmp.S
+--- glibc-2.14-38-g4eddf93/sysdeps/i386/__longjmp.S
+++ glibc-2.14-5/sysdeps/i386/__longjmp.S
@@ -1,5 +1,5 @@
/* longjmp for i386.
@@ -3549,7 +3549,7 @@
#endif
/* Jump to saved PC. */
jmp *%edx
---- glibc-2.14-34-ge2a3090/sysdeps/i386/bsd-_setjmp.S
+--- glibc-2.14-38-g4eddf93/sysdeps/i386/bsd-_setjmp.S
+++ glibc-2.14-5/sysdeps/i386/bsd-_setjmp.S
@@ -1,5 +1,6 @@
/* BSD `_setjmp' entry point to `sigsetjmp (..., 0)'. i386 version.
@@ -3575,7 +3575,7 @@
#ifdef PTR_MANGLE
PTR_MANGLE (%ecx)
#endif
---- glibc-2.14-34-ge2a3090/sysdeps/i386/bsd-setjmp.S
+--- glibc-2.14-38-g4eddf93/sysdeps/i386/bsd-setjmp.S
+++ glibc-2.14-5/sysdeps/i386/bsd-setjmp.S
@@ -1,5 +1,6 @@
/* BSD `setjmp' entry point to `sigsetjmp (..., 1)'. i386 version.
@@ -3601,7 +3601,7 @@
#ifdef PTR_MANGLE
PTR_MANGLE (%ecx)
#endif
---- glibc-2.14-34-ge2a3090/sysdeps/i386/i686/Makefile
+--- glibc-2.14-38-g4eddf93/sysdeps/i386/i686/Makefile
+++ glibc-2.14-5/sysdeps/i386/i686/Makefile
@@ -9,19 +9,3 @@ stack-align-test-flags += -msse
ifeq ($(subdir),string)
@@ -3623,7 +3623,7 @@
-ASFLAGS-.ob += -Wa,-mtune=i686
-ASFLAGS-.oS += -Wa,-mtune=i686
-endif
---- glibc-2.14-34-ge2a3090/sysdeps/i386/i686/multiarch/strspn.S
+--- glibc-2.14-38-g4eddf93/sysdeps/i386/i686/multiarch/strspn.S
+++ glibc-2.14-5/sysdeps/i386/i686/multiarch/strspn.S
@@ -76,8 +76,8 @@ END(strspn)
# define ENTRY(name) \
@@ -3636,7 +3636,7 @@
CALL_MCOUNT
# undef END
# define END(name) \
---- glibc-2.14-34-ge2a3090/sysdeps/i386/setjmp.S
+--- glibc-2.14-38-g4eddf93/sysdeps/i386/setjmp.S
+++ glibc-2.14-5/sysdeps/i386/setjmp.S
@@ -1,5 +1,5 @@
/* setjmp for i386.
@@ -3661,7 +3661,7 @@
#ifdef PTR_MANGLE
PTR_MANGLE (%ecx)
#endif
---- glibc-2.14-34-ge2a3090/sysdeps/ia64/Makefile
+--- glibc-2.14-38-g4eddf93/sysdeps/ia64/Makefile
+++ glibc-2.14-5/sysdeps/ia64/Makefile
@@ -12,8 +12,8 @@ elide-routines.os += hp-timing
@@ -3674,7 +3674,7 @@
endif
endif
---- glibc-2.14-34-ge2a3090/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.14-38-g4eddf93/sysdeps/ia64/ia64libgcc.S
+++ glibc-2.14-5/sysdeps/ia64/ia64libgcc.S
@@ -1,350 +0,0 @@
-/* From the Intel IA-64 Optimization Guide, choose the minimum latency
@@ -4027,7 +4027,7 @@
- .symver ___multi3, __multi3 at GLIBC_2.2
-
-#endif
---- glibc-2.14-34-ge2a3090/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.14-38-g4eddf93/sysdeps/ia64/libgcc-compat.c
+++ glibc-2.14-5/sysdeps/ia64/libgcc-compat.c
@@ -0,0 +1,84 @@
+/* pre-.hidden libgcc compatibility
@@ -4114,7 +4114,7 @@
+symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
+
+#endif
---- glibc-2.14-34-ge2a3090/sysdeps/mach/hurd/getrlimit.c
+--- glibc-2.14-38-g4eddf93/sysdeps/mach/hurd/getrlimit.c
+++ glibc-2.14-5/sysdeps/mach/hurd/getrlimit.c
@@ -44,4 +44,5 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
@@ -4122,7 +4122,7 @@
}
+libc_hidden_def (__getrlimit)
weak_alias (__getrlimit, getrlimit)
---- glibc-2.14-34-ge2a3090/sysdeps/posix/getaddrinfo.c
+--- glibc-2.14-38-g4eddf93/sysdeps/posix/getaddrinfo.c
+++ glibc-2.14-5/sysdeps/posix/getaddrinfo.c
@@ -565,8 +565,8 @@ gaih_inet (const char *name, const struct gaih_service *service,
@@ -4248,7 +4248,7 @@
/* Default: scope 14. */
{ { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 }
};
---- glibc-2.14-34-ge2a3090/sysdeps/powerpc/powerpc64/Makefile
+--- glibc-2.14-38-g4eddf93/sysdeps/powerpc/powerpc64/Makefile
+++ glibc-2.14-5/sysdeps/powerpc/powerpc64/Makefile
@@ -33,6 +33,7 @@ ifneq ($(elf),no)
# we use -fpic instead which is much better.
@@ -4258,7 +4258,7 @@
endif
ifeq ($(subdir),elf)
---- glibc-2.14-34-ge2a3090/sysdeps/powerpc/powerpc64/elf/Makefile
+--- glibc-2.14-38-g4eddf93/sysdeps/powerpc/powerpc64/elf/Makefile
+++ glibc-2.14-5/sysdeps/powerpc/powerpc64/elf/Makefile
@@ -9,3 +9,5 @@ CFLAGS-rtld-mempcpy.os = $(no-special-regs)
CFLAGS-rtld-memmove.os = $(no-special-regs)
@@ -4266,7 +4266,7 @@
CFLAGS-rtld-strnlen.os = $(no-special-regs)
+
+CFLAGS-gmon-start.c = -fno-strict-aliasing
---- glibc-2.14-34-ge2a3090/sysdeps/s390/s390-64/utf16-utf32-z9.c
+--- glibc-2.14-38-g4eddf93/sysdeps/s390/s390-64/utf16-utf32-z9.c
+++ glibc-2.14-5/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; \
@@ -4280,7 +4280,7 @@
" jo 0b \n\t" \
" ipm %2 \n" \
: "+a" (pOutput), "+a" (pInput), "+d" (cc), \
---- glibc-2.14-34-ge2a3090/sysdeps/s390/s390-64/utf8-utf16-z9.c
+--- glibc-2.14-38-g4eddf93/sysdeps/s390/s390-64/utf8-utf16-z9.c
+++ glibc-2.14-5/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; \
@@ -4294,7 +4294,7 @@
" jo 0b \n\t" \
" ipm %2 \n" \
: "+a" (pOutput), "+a" (pInput), "+d" (cc), \
---- glibc-2.14-34-ge2a3090/sysdeps/s390/s390-64/utf8-utf32-z9.c
+--- glibc-2.14-38-g4eddf93/sysdeps/s390/s390-64/utf8-utf32-z9.c
+++ glibc-2.14-5/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; \
@@ -4308,7 +4308,7 @@
" jo 0b \n\t" \
" ipm %2 \n" \
: "+a" (pOutput), "+a" (pInput), "+d" (cc), \
---- glibc-2.14-34-ge2a3090/sysdeps/unix/nice.c
+--- glibc-2.14-38-g4eddf93/sysdeps/unix/nice.c
+++ glibc-2.14-5/sysdeps/unix/nice.c
@@ -42,7 +42,12 @@ nice (int incr)
__set_errno (save);
@@ -4324,7 +4324,7 @@
if (result == -1)
{
if (errno == EACCES)
---- glibc-2.14-34-ge2a3090/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.14-38-g4eddf93/sysdeps/unix/sysv/linux/check_pf.c
+++ glibc-2.14-5/sysdeps/unix/sysv/linux/check_pf.c
@@ -27,13 +27,10 @@
#include <unistd.h>
@@ -4341,7 +4341,7 @@
#ifndef IFA_F_HOMEADDRESS
# define IFA_F_HOMEADDRESS 0
---- glibc-2.14-34-ge2a3090/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.14-38-g4eddf93/sysdeps/unix/sysv/linux/futimesat.c
+++ glibc-2.14-5/sysdeps/unix/sysv/linux/futimesat.c
@@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
{
@@ -4385,7 +4385,7 @@
{
size_t filelen = strlen (file);
if (__builtin_expect (filelen == 0, 0))
---- glibc-2.14-34-ge2a3090/sysdeps/unix/sysv/linux/getpagesize.c
+--- glibc-2.14-38-g4eddf93/sysdeps/unix/sysv/linux/getpagesize.c
+++ glibc-2.14-5/sysdeps/unix/sysv/linux/getpagesize.c
@@ -28,7 +28,7 @@
int
@@ -4396,7 +4396,7 @@
assert (GLRO(dl_pagesize) != 0);
return GLRO(dl_pagesize);
#else
---- glibc-2.14-34-ge2a3090/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S
+--- glibc-2.14-38-g4eddf93/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S
+++ glibc-2.14-5/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S
@@ -1,4 +1,5 @@
-/* Copyright (C) 2001,2004,2005,2006,2009 Free Software Foundation, Inc.
@@ -4431,7 +4431,7 @@
+ LIBC_PROBE (longjmp_target, 3, 4@%ecx, -4@%eax, 4@%edx)
jmp *%edx
END (____longjmp_chk)
---- glibc-2.14-34-ge2a3090/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.14-38-g4eddf93/sysdeps/unix/sysv/linux/i386/dl-cache.h
+++ glibc-2.14-5/sysdeps/unix/sysv/linux/i386/dl-cache.h
@@ -0,0 +1,59 @@
+/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
@@ -4493,7 +4493,7 @@
+ } while (0)
+
+#include_next <dl-cache.h>
---- glibc-2.14-34-ge2a3090/sysdeps/unix/sysv/linux/i386/getrlimit.c
+--- glibc-2.14-38-g4eddf93/sysdeps/unix/sysv/linux/i386/getrlimit.c
+++ glibc-2.14-5/sysdeps/unix/sysv/linux/i386/getrlimit.c
@@ -79,4 +79,5 @@ __new_getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
}
@@ -4501,7 +4501,7 @@
weak_alias (__new_getrlimit, __getrlimit);
+libc_hidden_weak (__getrlimit)
versioned_symbol (libc, __new_getrlimit, getrlimit, GLIBC_2_2);
---- glibc-2.14-34-ge2a3090/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+--- glibc-2.14-38-g4eddf93/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+++ glibc-2.14-5/sysdeps/unix/sysv/linux/ia64/dl-cache.h
@@ -22,4 +22,31 @@
#define _dl_cache_check_flags(flags) \
@@ -4535,7 +4535,7 @@
+ } while (0)
+
#include_next <dl-cache.h>
---- glibc-2.14-34-ge2a3090/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.14-38-g4eddf93/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+++ glibc-2.14-5/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
@@ -0,0 +1,5 @@
+#ifdef IS_IN_ldconfig
@@ -4543,7 +4543,7 @@
+#else
+#include <sysdeps/generic/dl-procinfo.c>
+#endif
---- glibc-2.14-34-ge2a3090/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.14-38-g4eddf93/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+++ glibc-2.14-5/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
@@ -0,0 +1,5 @@
+#ifdef IS_IN_ldconfig
@@ -4551,12 +4551,12 @@
+#else
+#include <sysdeps/generic/dl-procinfo.h>
+#endif
---- glibc-2.14-34-ge2a3090/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.14-38-g4eddf93/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+++ glibc-2.14-5/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-34-ge2a3090/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.14-38-g4eddf93/sysdeps/unix/sysv/linux/netlinkaccess.h
+++ glibc-2.14-5/sysdeps/unix/sysv/linux/netlinkaccess.h
@@ -25,6 +25,24 @@
@@ -4583,7 +4583,7 @@
struct netlink_res
{
---- glibc-2.14-34-ge2a3090/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.14-38-g4eddf93/sysdeps/unix/sysv/linux/paths.h
+++ glibc-2.14-5/sysdeps/unix/sysv/linux/paths.h
@@ -62,7 +62,7 @@
#define _PATH_TTY "/dev/tty"
@@ -4594,7 +4594,7 @@
#define _PATH_WTMP "/var/log/wtmp"
/* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-2.14-34-ge2a3090/sysdeps/unix/sysv/linux/tcsetattr.c
+--- glibc-2.14-38-g4eddf93/sysdeps/unix/sysv/linux/tcsetattr.c
+++ glibc-2.14-5/sysdeps/unix/sysv/linux/tcsetattr.c
@@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
{
@@ -4641,7 +4641,7 @@
+ return retval;
}
libc_hidden_def (tcsetattr)
---- glibc-2.14-34-ge2a3090/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
+--- glibc-2.14-38-g4eddf93/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
+++ glibc-2.14-5/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
@@ -19,6 +19,7 @@
#include <sysdep.h>
@@ -4669,7 +4669,7 @@
+ LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx)
jmpq *%rdx
END (____longjmp_chk)
---- glibc-2.14-34-ge2a3090/sysdeps/x86_64/__longjmp.S
+--- glibc-2.14-38-g4eddf93/sysdeps/x86_64/__longjmp.S
+++ glibc-2.14-5/sysdeps/x86_64/__longjmp.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001,2004,2005,2006,2009 Free Software Foundation, Inc.
@@ -4700,7 +4700,7 @@
+ LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx)
jmpq *%rdx
END (__longjmp)
---- glibc-2.14-34-ge2a3090/sysdeps/x86_64/setjmp.S
+--- glibc-2.14-38-g4eddf93/sysdeps/x86_64/setjmp.S
+++ glibc-2.14-5/sysdeps/x86_64/setjmp.S
@@ -1,5 +1,5 @@
/* setjmp for x86-64.
@@ -4725,7 +4725,7 @@
#ifdef PTR_MANGLE
PTR_MANGLE (%rax)
#endif
---- glibc-2.14-34-ge2a3090/timezone/zic.c
+--- glibc-2.14-38-g4eddf93/timezone/zic.c
+++ glibc-2.14-5/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 6eafc0b..4de9e8a 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.14-34-ge2a3090
+%define glibcsrcdir glibc-2.14-38-g4eddf93
%define glibcversion 2.14
%define glibcportsdir glibc-ports-2.14-1-g2408627
### glibc.spec.in follows:
@@ -27,7 +27,7 @@
Summary: The GNU libc libraries
Name: glibc
Version: %{glibcversion}
-Release: 5
+Release: 6
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
# Things that are linked directly into dynamically linked programs
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -90,8 +90,7 @@ 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
+%global __filter_GLIBC_PRIVATE 1
%description
The glibc package contains standard libraries which are used by
@@ -269,12 +268,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 <<EOF
-#!/bin/sh
-/usr/lib/rpm/find-provides | grep -v GLIBC_PRIVATE
-exit 0
-EOF
-chmod +x find_provides.sh
touch `find . -name configure`
touch locale/programs/*-kw.h
@@ -1049,6 +1042,12 @@ rm -f *.filelist*
%endif
%changelog
+* Mon Aug 15 2011 Andreas Schwab <schwab at redhat.com> - 2.14-6
+- Update from 2.14 branch
+ - Locale-independent parsing in libintl (#726536)
+ - Fix stack alignment on x86_64 (#728762)
+- Filter out GLIBC_PRIVATE symbols again
+
* Fri Aug 5 2011 Andreas Schwab <schwab at redhat.com> - 2.14-5
- Update from 2.14 branch
- Properly tokenize nameserver line for servers with IPv6 address
diff --git a/sources b/sources
index 0ee6759..070a378 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-1e75689d975749ac6243ad006851ec08 glibc-2.14-34-ge2a3090-fedora.tar.xz
-47a1971272a8be4f2f6437ab2061ab9d glibc-2.14-34-ge2a3090.tar.xz
+6ddf3d4d3820f61caed1bf1dbf264380 glibc-2.14-38-g4eddf93-fedora.tar.xz
+883eb0cc67581c650f3e52da416fd41a glibc-2.14-38-g4eddf93.tar.xz
069f0c4e41686838aa9bdd9700fcf52b glibc-ports-2.14-1-g2408627.tar.xz
More information about the scm-commits
mailing list