[glibc/f15] 2.13.90-14
Andreas Schwab
schwab at fedoraproject.org
Fri May 27 14:20:14 UTC 2011
commit d297ec7b522edcf73bb6b0c443da0bcd61c52fc7
Author: Andreas Schwab <schwab at redhat.com>
Date: Fri May 27 16:19:02 2011 +0200
2.13.90-14
.gitignore | 6 +-
glibc-fedora.patch | 616 ++++++++++++++++++++++++++--------------------------
glibc.spec | 29 +++-
sources | 6 +-
4 files changed, 340 insertions(+), 317 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ecbeef0..f066dd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/glibc-ports-2.13-34-gf1d4d4b.tar.xz
-/glibc-2.13-200-g0a197a9-fedora.tar.xz
-/glibc-2.13-200-g0a197a9.tar.xz
+/glibc-2.13-225-gfdc2fef-fedora.tar.xz
+/glibc-2.13-225-gfdc2fef.tar.xz
+/glibc-ports-2.13-35-g8969f4d.tar.xz
diff --git a/glibc-fedora.patch b/glibc-fedora.patch
index c80857f..be2ae47 100644
--- a/glibc-fedora.patch
+++ b/glibc-fedora.patch
@@ -1,6 +1,6 @@
---- glibc-2.13-200-g0a197a9/ChangeLog
-+++ glibc-2.13.90-13/ChangeLog
-@@ -172,6 +172,13 @@
+--- glibc-2.13-225-gfdc2fef/ChangeLog
++++ glibc-2.13.90-14/ChangeLog
+@@ -292,6 +292,13 @@
* libio/Makefile (tests): Add bug-fclose1.
* libio/bug-fclose1.c: New file.
@@ -14,7 +14,7 @@
2011-05-12 Ulrich Drepper <drepper at gmail.com>
[BZ #12511]
-@@ -693,6 +700,31 @@
+@@ -813,6 +820,31 @@
* sysdeps/unix/sysv/linux/Versions [GLIBC_2.14] (clock_adjtime):
Export.
@@ -46,7 +46,7 @@
2011-03-22 Ulrich Drepper <drepper at gmail.com>
* sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Increment
-@@ -753,6 +785,16 @@
+@@ -873,6 +905,16 @@
$LDFLAGS and -nostdlib -nostartfiles to linking step. Change main
to _start.
@@ -63,7 +63,7 @@
2011-03-06 Ulrich Drepper <drepper at gmail.com>
* elf/dl-load.c (_dl_map_object): If we are looking for the first
-@@ -789,6 +831,12 @@
+@@ -909,6 +951,12 @@
* sysdeps/sparc/sparc64/multiarch/memset.S(__bzero): Call
__bzero_ultra1 instead of __memset_ultra1.
@@ -76,7 +76,7 @@
2011-02-23 Andreas Schwab <schwab at redhat.com>
Ulrich Drepper <drepper at gmail.com>
-@@ -807,12 +855,6 @@
+@@ -927,12 +975,6 @@
* elf/noload.c: Include <memcheck.h>.
(main): Call mtrace. Close all opened handles.
@@ -89,7 +89,7 @@
2011-02-22 Samuel Thibault <samuel.thibault at ens-lyon.org>
Fix __if_freereq crash: Unlike the generic version which uses free,
-@@ -969,6 +1011,12 @@
+@@ -1089,6 +1131,12 @@
* shadow/sgetspent.c: Check return value of __sgetspent_r instead
of errno.
@@ -102,7 +102,7 @@
2011-01-19 Ulrich Drepper <drepper at gmail.com>
[BZ #11724]
-@@ -1656,6 +1704,29 @@
+@@ -1776,6 +1824,29 @@
* sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS):
Mask out sign-bit copies when constructing f_fsid.
@@ -132,7 +132,7 @@
2010-09-24 Petr Baudis <pasky at suse.cz>
* debug/stack_chk_fail_local.c: Add missing licence exception.
-@@ -2447,6 +2518,32 @@
+@@ -2567,6 +2638,32 @@
call returning > 0 value.
* sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise.
@@ -165,7 +165,7 @@
2010-06-07 Andreas Schwab <schwab at redhat.com>
* dlfcn/Makefile: Remove explicit dependencies on libc.so and
-@@ -2499,6 +2596,24 @@
+@@ -2619,6 +2716,24 @@
* hurd/hurd/fd.h (__file_name_lookup_at): Update comment.
* sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS.
@@ -190,8 +190,8 @@
2010-05-28 Luis Machado <luisgpm at br.ibm.com>
* sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi.
---- glibc-2.13-200-g0a197a9/ChangeLog.15
-+++ glibc-2.13.90-13/ChangeLog.15
+--- glibc-2.13-225-gfdc2fef/ChangeLog.15
++++ glibc-2.13.90-14/ChangeLog.15
@@ -477,6 +477,14 @@
2004-11-26 Jakub Jelinek <jakub at redhat.com>
@@ -257,8 +257,8 @@
2004-08-30 Roland McGrath <roland at frob.com>
* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-2.13-200-g0a197a9/ChangeLog.16
-+++ glibc-2.13.90-13/ChangeLog.16
+--- glibc-2.13-225-gfdc2fef/ChangeLog.16
++++ glibc-2.13.90-14/ChangeLog.16
@@ -2042,6 +2042,9 @@
(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
followed by __THROW.
@@ -281,8 +281,8 @@
2006-01-19 Thomas Schwinge <tschwinge at gnu.org>
* libio/genops.c: Include <stdbool.h>.
---- glibc-2.13-200-g0a197a9/ChangeLog.17
-+++ glibc-2.13.90-13/ChangeLog.17
+--- glibc-2.13-225-gfdc2fef/ChangeLog.17
++++ glibc-2.13.90-14/ChangeLog.17
@@ -256,6 +256,12 @@
* Makerules (libc-abis): Fix search for libc-abis in add-ons.
@@ -361,8 +361,8 @@
2006-12-09 Ulrich Drepper <drepper at redhat.com>
[BZ #3632]
---- glibc-2.13-200-g0a197a9/Makeconfig
-+++ glibc-2.13.90-13/Makeconfig
+--- glibc-2.13-225-gfdc2fef/Makeconfig
++++ glibc-2.13.90-14/Makeconfig
@@ -785,12 +785,12 @@ endif
# The assembler can generate debug information too.
ifndef ASFLAGS
@@ -379,11 +379,11 @@
ifndef BUILD_CC
BUILD_CC = $(CC)
---- glibc-2.13-200-g0a197a9/NEWS
-+++ glibc-2.13.90-13/NEWS
-@@ -18,16 +18,6 @@ Version 2.14
- 12653, 12655, 12660, 12681, 12685, 12711, 12713, 12714, 12717, 12723,
- 12724, 12734, 12738, 12746, 12766
+--- glibc-2.13-225-gfdc2fef/NEWS
++++ glibc-2.13.90-14/NEWS
+@@ -19,16 +19,6 @@ Version 2.14
+ 12714, 12717, 12723, 12724, 12734, 12738, 12746, 12766, 12775, 12777,
+ 12782, 12788, 12792, 12795, 12814
-* The RPC implementation in libc is obsoleted. Old programs keep working
- but new programs cannot be linked with the routines in libc anymore.
@@ -398,8 +398,8 @@
* New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at,
syncfs
---- glibc-2.13-200-g0a197a9/config.h.in
-+++ glibc-2.13.90-13/config.h.in
+--- glibc-2.13-225-gfdc2fef/config.h.in
++++ glibc-2.13.90-14/config.h.in
@@ -204,6 +204,9 @@
/* Define if `.ctors' and `.dtors' sections shouldn't be used. */
#undef NO_CTORS_DTORS_SECTIONS
@@ -410,8 +410,8 @@
/*
*/
---- glibc-2.13-200-g0a197a9/configure
-+++ glibc-2.13.90-13/configure
+--- glibc-2.13-225-gfdc2fef/configure
++++ glibc-2.13.90-14/configure
@@ -784,6 +784,7 @@ enable_all_warnings
enable_multi_arch
enable_experimental_malloc
@@ -480,8 +480,8 @@
# 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.13-200-g0a197a9/configure.in
-+++ glibc-2.13.90-13/configure.in
+--- glibc-2.13-225-gfdc2fef/configure.in
++++ glibc-2.13.90-14/configure.in
@@ -316,6 +316,29 @@ else
fi
AC_SUBST(libc_cv_nss_crypt)
@@ -512,8 +512,8 @@
# 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.13-200-g0a197a9/csu/Makefile
-+++ glibc-2.13.90-13/csu/Makefile
+--- glibc-2.13-225-gfdc2fef/csu/Makefile
++++ glibc-2.13.90-14/csu/Makefile
@@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
$(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -524,8 +524,8 @@
vpath initfini.c $(sysdirs)
---- glibc-2.13-200-g0a197a9/csu/elf-init.c
-+++ glibc-2.13.90-13/csu/elf-init.c
+--- glibc-2.13-225-gfdc2fef/csu/elf-init.c
++++ glibc-2.13.90-14/csu/elf-init.c
@@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **)
extern void (*__fini_array_start []) (void) attribute_hidden;
extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -550,8 +550,8 @@
/* These function symbols are provided for the .init/.fini section entry
points automagically by the linker. */
---- glibc-2.13-200-g0a197a9/debug/tst-chk1.c
-+++ glibc-2.13.90-13/debug/tst-chk1.c
+--- glibc-2.13-225-gfdc2fef/debug/tst-chk1.c
++++ glibc-2.13.90-14/debug/tst-chk1.c
@@ -17,6 +17,9 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
@@ -580,8 +580,8 @@
# define O 0
# else
# define O 1
---- glibc-2.13-200-g0a197a9/elf/Makefile
-+++ glibc-2.13.90-13/elf/Makefile
+--- glibc-2.13-225-gfdc2fef/elf/Makefile
++++ glibc-2.13.90-14/elf/Makefile
@@ -90,6 +90,7 @@ distribute := rtld-Rules \
unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \
unload6mod1.c unload6mod2.c unload6mod3.c \
@@ -594,7 +594,7 @@
ifeq ($(unwind-find-fde),yes)
routines += unwind-dw2-fde-glibc
shared-only-routines += unwind-dw2-fde-glibc
-+CFLAGS-unwind-dw2-fde-glibc.c = -fno-strict-aliasing
++CFLAGS-unwind-dw2-fde-glibc.c += -fno-strict-aliasing
endif
before-compile = $(objpfx)trusted-dirs.h
@@ -645,8 +645,8 @@
ifdef libdl
$(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a
$(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so
---- glibc-2.13-200-g0a197a9/elf/dl-close.c
-+++ glibc-2.13.90-13/elf/dl-close.c
+--- glibc-2.13-225-gfdc2fef/elf/dl-close.c
++++ glibc-2.13.90-14/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
|| dl_close_state != not_pending)
@@ -681,8 +681,8 @@
/* The loader is gone, so mark the object as not having one.
Note: l_idx != IDX_STILL_USED -> object will be removed. */
---- glibc-2.13-200-g0a197a9/elf/dl-deps.c
-+++ glibc-2.13.90-13/elf/dl-deps.c
+--- glibc-2.13-225-gfdc2fef/elf/dl-deps.c
++++ glibc-2.13.90-14/elf/dl-deps.c
@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
nneeded * sizeof needed[0]);
atomic_write_barrier ();
@@ -820,8 +820,8 @@
+ _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
+ NULL, errstring);
}
---- glibc-2.13-200-g0a197a9/elf/dl-init.c
-+++ glibc-2.13.90-13/elf/dl-init.c
+--- glibc-2.13-225-gfdc2fef/elf/dl-init.c
++++ glibc-2.13.90-14/elf/dl-init.c
@@ -24,11 +24,9 @@
/* Type of the initializer. */
typedef void (*init_t) (int, char **, char **);
@@ -844,8 +844,8 @@
-#endif
}
INTDEF (_dl_init)
---- glibc-2.13-200-g0a197a9/elf/dl-libc.c
-+++ glibc-2.13.90-13/elf/dl-libc.c
+--- glibc-2.13-225-gfdc2fef/elf/dl-libc.c
++++ glibc-2.13.90-14/elf/dl-libc.c
@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
@@ -872,8 +872,8 @@
}
if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
---- glibc-2.13-200-g0a197a9/elf/dl-load.c
-+++ glibc-2.13.90-13/elf/dl-load.c
+--- glibc-2.13-225-gfdc2fef/elf/dl-load.c
++++ glibc-2.13.90-14/elf/dl-load.c
@@ -250,8 +250,7 @@ is_trusted_path_normalize (const char *path, size_t len)
@@ -953,8 +953,8 @@
}
else
/* No DST we recognize. */
---- glibc-2.13-200-g0a197a9/elf/dl-support.c
-+++ glibc-2.13.90-13/elf/dl-support.c
+--- glibc-2.13-225-gfdc2fef/elf/dl-support.c
++++ glibc-2.13.90-14/elf/dl-support.c
@@ -81,10 +81,8 @@ unsigned long long _dl_load_adds;
create a fake scope containing nothing. */
struct r_scope_elem _dl_initial_searchlist;
@@ -966,8 +966,8 @@
/* Random data provided by the kernel. */
void *_dl_random;
---- glibc-2.13-200-g0a197a9/elf/ldconfig.c
-+++ glibc-2.13.90-13/elf/ldconfig.c
+--- glibc-2.13-225-gfdc2fef/elf/ldconfig.c
++++ glibc-2.13.90-14/elf/ldconfig.c
@@ -1034,17 +1034,19 @@ search_dirs (void)
@@ -1049,8 +1049,8 @@
}
const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;
---- glibc-2.13-200-g0a197a9/elf/ldd.bash.in
-+++ glibc-2.13.90-13/elf/ldd.bash.in
+--- glibc-2.13-225-gfdc2fef/elf/ldd.bash.in
++++ glibc-2.13.90-14/elf/ldd.bash.in
@@ -167,18 +167,6 @@ warning: you do not have execution permission for" "\`$file'" >&2
fi
done
@@ -1079,8 +1079,8 @@
try_trace "$RTLD" "$file" || result=1
;;
*)
---- glibc-2.13-200-g0a197a9/elf/rtld-Rules
-+++ glibc-2.13.90-13/elf/rtld-Rules
+--- glibc-2.13-225-gfdc2fef/elf/rtld-Rules
++++ glibc-2.13.90-14/elf/rtld-Rules
@@ -1,7 +1,7 @@
# Subroutine makefile for compiling libc modules linked into dynamic linker.
@@ -1098,8 +1098,8 @@
+rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld
endif
---- glibc-2.13-200-g0a197a9/elf/rtld.c
-+++ glibc-2.13.90-13/elf/rtld.c
+--- glibc-2.13-225-gfdc2fef/elf/rtld.c
++++ glibc-2.13.90-14/elf/rtld.c
@@ -107,7 +107,6 @@ static struct audit_list
struct audit_list *next;
} *audit_list;
@@ -1143,8 +1143,8 @@
if (! prelinked && rtld_multiple_ref)
{
/* There was an explicit ref to the dynamic linker as a shared lib.
---- glibc-2.13-200-g0a197a9/elf/unload8.c
-+++ glibc-2.13.90-13/elf/unload8.c
+--- glibc-2.13-225-gfdc2fef/elf/unload8.c
++++ glibc-2.13.90-14/elf/unload8.c
@@ -0,0 +1,33 @@
+#include <dlfcn.h>
+#include <stdio.h>
@@ -1179,8 +1179,8 @@
+
+ return 0;
+}
---- glibc-2.13-200-g0a197a9/elf/unload8mod1.c
-+++ glibc-2.13.90-13/elf/unload8mod1.c
+--- glibc-2.13-225-gfdc2fef/elf/unload8mod1.c
++++ glibc-2.13.90-14/elf/unload8mod1.c
@@ -0,0 +1,7 @@
+extern void mod2 (void);
+
@@ -1189,12 +1189,12 @@
+{
+ mod2 ();
+}
---- glibc-2.13-200-g0a197a9/elf/unload8mod1x.c
-+++ glibc-2.13.90-13/elf/unload8mod1x.c
+--- glibc-2.13-225-gfdc2fef/elf/unload8mod1x.c
++++ glibc-2.13.90-14/elf/unload8mod1x.c
@@ -0,0 +1 @@
+int mod1x;
---- glibc-2.13-200-g0a197a9/elf/unload8mod2.c
-+++ glibc-2.13.90-13/elf/unload8mod2.c
+--- glibc-2.13-225-gfdc2fef/elf/unload8mod2.c
++++ glibc-2.13.90-14/elf/unload8mod2.c
@@ -0,0 +1,7 @@
+extern void mod3 (void);
+
@@ -1203,8 +1203,8 @@
+{
+ mod3 ();
+}
---- glibc-2.13-200-g0a197a9/elf/unload8mod3.c
-+++ glibc-2.13.90-13/elf/unload8mod3.c
+--- glibc-2.13-225-gfdc2fef/elf/unload8mod3.c
++++ glibc-2.13.90-14/elf/unload8mod3.c
@@ -0,0 +1,27 @@
+#include <dlfcn.h>
+#include <stdio.h>
@@ -1233,24 +1233,24 @@
+
+ atexit (mod3_fini);
+}
---- glibc-2.13-200-g0a197a9/extra-lib.mk
-+++ glibc-2.13.90-13/extra-lib.mk
+--- glibc-2.13-225-gfdc2fef/extra-lib.mk
++++ glibc-2.13.90-14/extra-lib.mk
@@ -101,4 +101,4 @@ ifneq (,$(cpp-srcs-left))
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
endif
-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.13-200-g0a197a9/include/bits/stdlib-ldbl.h
-+++ glibc-2.13.90-13/include/bits/stdlib-ldbl.h
+--- glibc-2.13-225-gfdc2fef/include/bits/stdlib-ldbl.h
++++ glibc-2.13.90-14/include/bits/stdlib-ldbl.h
@@ -0,0 +1 @@
+#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-2.13-200-g0a197a9/include/bits/wchar-ldbl.h
-+++ glibc-2.13.90-13/include/bits/wchar-ldbl.h
+--- glibc-2.13-225-gfdc2fef/include/bits/wchar-ldbl.h
++++ glibc-2.13.90-14/include/bits/wchar-ldbl.h
@@ -0,0 +1 @@
+#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-2.13-200-g0a197a9/include/features.h
-+++ glibc-2.13.90-13/include/features.h
+--- glibc-2.13-225-gfdc2fef/include/features.h
++++ glibc-2.13.90-14/include/features.h
@@ -310,8 +310,13 @@
#endif
@@ -1267,8 +1267,8 @@
# define __USE_FORTIFY_LEVEL 2
# else
# define __USE_FORTIFY_LEVEL 1
---- glibc-2.13-200-g0a197a9/include/libc-symbols.h
-+++ glibc-2.13.90-13/include/libc-symbols.h
+--- glibc-2.13-225-gfdc2fef/include/libc-symbols.h
++++ glibc-2.13.90-14/include/libc-symbols.h
@@ -635,7 +635,7 @@ for linking")
# define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define libc_hidden_def(name) hidden_def (name)
@@ -1278,8 +1278,8 @@
# 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.13-200-g0a197a9/include/link.h
-+++ glibc-2.13.90-13/include/link.h
+--- glibc-2.13-225-gfdc2fef/include/link.h
++++ glibc-2.13.90-14/include/link.h
@@ -1,6 +1,6 @@
/* Data structure for communication from the run-time dynamic linker for
loaded ELF shared objects.
@@ -1308,8 +1308,8 @@
/* List of the dependencies introduced through symbol binding. */
struct link_map_reldeps
---- glibc-2.13-200-g0a197a9/include/stap-probe.h
-+++ glibc-2.13.90-13/include/stap-probe.h
+--- glibc-2.13-225-gfdc2fef/include/stap-probe.h
++++ glibc-2.13.90-14/include/stap-probe.h
@@ -0,0 +1,140 @@
+/* Macros for defining Systemtap <sys/sdt.h> static probe points.
+ Copyright (C) 2011 Free Software Foundation, Inc.
@@ -1451,27 +1451,27 @@
+#endif /* USE_STAP_PROBE. */
+
+#endif /* stap-probe.h */
---- glibc-2.13-200-g0a197a9/include/sys/resource.h
-+++ glibc-2.13.90-13/include/sys/resource.h
+--- glibc-2.13-225-gfdc2fef/include/sys/resource.h
++++ glibc-2.13.90-14/include/sys/resource.h
@@ -13,4 +13,5 @@ extern int __getrusage (enum __rusage_who __who, struct rusage *__usage)
extern int __setrlimit (enum __rlimit_resource __resource,
const struct rlimit *__rlimits);
+libc_hidden_proto (__getrlimit)
#endif
---- glibc-2.13-200-g0a197a9/inet/Makefile
-+++ glibc-2.13.90-13/inet/Makefile
+--- glibc-2.13-225-gfdc2fef/inet/Makefile
++++ glibc-2.13.90-14/inet/Makefile
@@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \
include ../Rules
-+CFLAGS-tst-inet6_rth.c = -fno-strict-aliasing
++CFLAGS-tst-inet6_rth.c += -fno-strict-aliasing
+
ifeq ($(have-thread-library),yes)
CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions
---- glibc-2.13-200-g0a197a9/intl/locale.alias
-+++ glibc-2.13.90-13/intl/locale.alias
+--- glibc-2.13-225-gfdc2fef/intl/locale.alias
++++ glibc-2.13.90-14/intl/locale.alias
@@ -57,8 +57,6 @@ korean ko_KR.eucKR
korean.euc ko_KR.eucKR
ko_KR ko_KR.eucKR
@@ -1481,8 +1481,8 @@
norwegian nb_NO.ISO-8859-1
nynorsk nn_NO.ISO-8859-1
polish pl_PL.ISO-8859-2
---- glibc-2.13-200-g0a197a9/libio/stdio.h
-+++ glibc-2.13.90-13/libio/stdio.h
+--- glibc-2.13-225-gfdc2fef/libio/stdio.h
++++ glibc-2.13.90-14/libio/stdio.h
@@ -165,10 +165,12 @@ typedef _G_fpos64_t fpos64_t;
extern struct _IO_FILE *stdin; /* Standard input stream. */
extern struct _IO_FILE *stdout; /* Standard output stream. */
@@ -1496,8 +1496,8 @@
__BEGIN_NAMESPACE_STD
/* Remove file FILENAME. */
---- glibc-2.13-200-g0a197a9/locale/iso-4217.def
-+++ glibc-2.13.90-13/locale/iso-4217.def
+--- glibc-2.13-225-gfdc2fef/locale/iso-4217.def
++++ glibc-2.13.90-14/locale/iso-4217.def
@@ -8,6 +8,7 @@
*
* !!! The list has to be sorted !!!
@@ -1589,8 +1589,8 @@
DEFINE_INT_CURR("PYG") /* Paraguay Guarani */
DEFINE_INT_CURR("QAR") /* Qatar Rial */
DEFINE_INT_CURR("ROL") /* Romanian Leu */
---- glibc-2.13-200-g0a197a9/locale/programs/locarchive.c
-+++ glibc-2.13.90-13/locale/programs/locarchive.c
+--- glibc-2.13-225-gfdc2fef/locale/programs/locarchive.c
++++ glibc-2.13.90-14/locale/programs/locarchive.c
@@ -134,7 +134,7 @@ create_archive (const char *archivefname, struct locarhandle *ah)
size_t reserved = RESERVE_MMAP_SIZE;
int xflags = 0;
@@ -1649,8 +1649,8 @@
add_alias (struct locarhandle *ah, const char *alias, bool replace,
const char *oldname, uint32_t *locrec_offset_p)
{
---- glibc-2.13-200-g0a197a9/localedata/Makefile
-+++ glibc-2.13.90-13/localedata/Makefile
+--- glibc-2.13-225-gfdc2fef/localedata/Makefile
++++ glibc-2.13.90-14/localedata/Makefile
@@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
echo -n '...'; \
input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -1659,8 +1659,8 @@
-i locales/$$input -c -f charmaps/$$charset \
$(addprefix --prefix=,$(install_root)) $$locale; \
echo ' done'; \
---- glibc-2.13-200-g0a197a9/localedata/SUPPORTED
-+++ glibc-2.13.90-13/localedata/SUPPORTED
+--- glibc-2.13-225-gfdc2fef/localedata/SUPPORTED
++++ glibc-2.13.90-14/localedata/SUPPORTED
@@ -86,6 +86,7 @@ cy_GB.UTF-8/UTF-8 \
cy_GB/ISO-8859-14 \
da_DK.UTF-8/UTF-8 \
@@ -1702,8 +1702,8 @@
sw_KE/UTF-8 \
sw_TZ/UTF-8 \
ta_IN/UTF-8 \
---- glibc-2.13-200-g0a197a9/localedata/locales/cy_GB
-+++ glibc-2.13.90-13/localedata/locales/cy_GB
+--- glibc-2.13-225-gfdc2fef/localedata/locales/cy_GB
++++ glibc-2.13.90-14/localedata/locales/cy_GB
@@ -248,8 +248,11 @@ mon "<U0049><U006F><U006E><U0061><U0077><U0072>";/
d_t_fmt "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
d_fmt "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -1718,8 +1718,8 @@
END LC_TIME
LC_MESSAGES
---- glibc-2.13-200-g0a197a9/localedata/locales/en_GB
-+++ glibc-2.13.90-13/localedata/locales/en_GB
+--- glibc-2.13-225-gfdc2fef/localedata/locales/en_GB
++++ glibc-2.13.90-14/localedata/locales/en_GB
@@ -116,8 +116,8 @@ mon "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/
d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -1731,8 +1731,8 @@
date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
<U0025><U005A><U0020><U0025><U0059>"
---- glibc-2.13-200-g0a197a9/localedata/locales/no_NO
-+++ glibc-2.13.90-13/localedata/locales/no_NO
+--- glibc-2.13-225-gfdc2fef/localedata/locales/no_NO
++++ glibc-2.13.90-14/localedata/locales/no_NO
@@ -0,0 +1,69 @@
+escape_char /
+comment_char %
@@ -1803,8 +1803,8 @@
+LC_ADDRESS
+copy "nb_NO"
+END LC_ADDRESS
---- glibc-2.13-200-g0a197a9/localedata/locales/zh_TW
-+++ glibc-2.13.90-13/localedata/locales/zh_TW
+--- glibc-2.13-225-gfdc2fef/localedata/locales/zh_TW
++++ glibc-2.13.90-14/localedata/locales/zh_TW
@@ -1,7 +1,7 @@
comment_char %
escape_char /
@@ -1832,8 +1832,8 @@
revision "0.2"
date "2000-08-02"
%
---- glibc-2.13-200-g0a197a9/login/programs/pt_chown.c
-+++ glibc-2.13.90-13/login/programs/pt_chown.c
+--- glibc-2.13-225-gfdc2fef/login/programs/pt_chown.c
++++ glibc-2.13.90-14/login/programs/pt_chown.c
@@ -29,6 +29,7 @@
#include <string.h>
#include <sys/stat.h>
@@ -1875,8 +1875,8 @@
-
return EXIT_SUCCESS;
}
---- glibc-2.13-200-g0a197a9/malloc/mcheck.c
-+++ glibc-2.13.90-13/malloc/mcheck.c
+--- glibc-2.13-225-gfdc2fef/malloc/mcheck.c
++++ glibc-2.13.90-14/malloc/mcheck.c
@@ -25,10 +25,26 @@
# include <mcheck.h>
# include <stdint.h>
@@ -1953,8 +1953,8 @@
old_free_hook = __free_hook;
__free_hook = freehook;
---- glibc-2.13-200-g0a197a9/manual/libc.texinfo
-+++ glibc-2.13.90-13/manual/libc.texinfo
+--- glibc-2.13-225-gfdc2fef/manual/libc.texinfo
++++ glibc-2.13.90-14/manual/libc.texinfo
@@ -5,7 +5,7 @@
@c setchapternewpage odd
@@ -1964,8 +1964,8 @@
@direntry
* Libc: (libc). C library.
@end direntry
---- glibc-2.13-200-g0a197a9/misc/sys/cdefs.h
-+++ glibc-2.13.90-13/misc/sys/cdefs.h
+--- glibc-2.13-225-gfdc2fef/misc/sys/cdefs.h
++++ glibc-2.13.90-14/misc/sys/cdefs.h
@@ -132,7 +132,10 @@
#define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
#define __bos0(ptr) __builtin_object_size (ptr, 0)
@@ -2009,8 +2009,8 @@
# define __va_arg_pack() __builtin_va_arg_pack ()
# define __va_arg_pack_len() __builtin_va_arg_pack_len ()
#endif
---- glibc-2.13-200-g0a197a9/nis/Makefile
-+++ glibc-2.13.90-13/nis/Makefile
+--- glibc-2.13-225-gfdc2fef/nis/Makefile
++++ glibc-2.13.90-14/nis/Makefile
@@ -23,9 +23,9 @@ subdir := nis
aux := nis_hash
@@ -2027,13 +2027,13 @@
include ../Rules
-+CFLAGS-nis_findserv.c = -fno-strict-aliasing
-+CFLAGS-ypclnt.c = -fno-strict-aliasing
++CFLAGS-nis_findserv.c += -fno-strict-aliasing
++CFLAGS-ypclnt.c += -fno-strict-aliasing
$(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version)
$(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \
---- glibc-2.13-200-g0a197a9/nis/nss
-+++ glibc-2.13.90-13/nis/nss
+--- glibc-2.13-225-gfdc2fef/nis/nss
++++ glibc-2.13.90-14/nis/nss
@@ -25,7 +25,7 @@
# memory with every getXXent() call. Otherwise each getXXent() call
# might result into a network communication with the server to get
@@ -2043,8 +2043,8 @@
#
# ADJUNCT_AS_SHADOW
# If set to TRUE, the passwd routines in the NIS NSS module will not
---- glibc-2.13-200-g0a197a9/nptl/ChangeLog
-+++ glibc-2.13.90-13/nptl/ChangeLog
+--- glibc-2.13-225-gfdc2fef/nptl/ChangeLog
++++ glibc-2.13.90-14/nptl/ChangeLog
@@ -10,6 +10,51 @@
clearing memory.
Patch partly by Robert Rex <robert.rex at exasol.com>.
@@ -2121,8 +2121,8 @@
2003-07-25 Jakub Jelinek <jakub at redhat.com>
* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-2.13-200-g0a197a9/nptl/DESIGN-systemtap-probes.txt
-+++ glibc-2.13.90-13/nptl/DESIGN-systemtap-probes.txt
+--- glibc-2.13-225-gfdc2fef/nptl/DESIGN-systemtap-probes.txt
++++ glibc-2.13.90-14/nptl/DESIGN-systemtap-probes.txt
@@ -0,0 +1,89 @@
+Systemtap is a dynamic tracing/instrumenting tool available on Linux. Probes
+that are not fired at run time have close to zero overhead.
@@ -2213,8 +2213,8 @@
+ arg1 = condition
+cond_broadcast - probe for pthread_cond_broadcast
+ arg1 = condition
---- glibc-2.13-200-g0a197a9/nptl/Makefile
-+++ glibc-2.13.90-13/nptl/Makefile
+--- glibc-2.13-225-gfdc2fef/nptl/Makefile
++++ glibc-2.13.90-14/nptl/Makefile
@@ -342,7 +342,8 @@ endif
extra-objs += $(crti-objs) $(crtn-objs)
omit-deps += crti crtn
@@ -2247,8 +2247,8 @@
else
$(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
endif
---- glibc-2.13-200-g0a197a9/nptl/Versions
-+++ glibc-2.13.90-13/nptl/Versions
+--- glibc-2.13-225-gfdc2fef/nptl/Versions
++++ glibc-2.13.90-14/nptl/Versions
@@ -30,6 +30,7 @@ libc {
__libc_alloca_cutoff;
# Internal libc interface to libpthread
@@ -2257,8 +2257,8 @@
}
}
---- glibc-2.13-200-g0a197a9/nptl/allocatestack.c
-+++ glibc-2.13.90-13/nptl/allocatestack.c
+--- glibc-2.13-225-gfdc2fef/nptl/allocatestack.c
++++ glibc-2.13.90-14/nptl/allocatestack.c
@@ -999,7 +999,16 @@ setxid_mark_thread (struct xid_command *cmdp, struct pthread *t)
/* If the thread is exiting right now, ignore it. */
@@ -2277,8 +2277,8 @@
}
while (atomic_compare_and_exchange_bool_acq (&t->cancelhandling,
ch | SETXID_BITMASK, ch));
---- glibc-2.13-200-g0a197a9/nptl/nptl-init.c
-+++ glibc-2.13.90-13/nptl/nptl-init.c
+--- glibc-2.13-225-gfdc2fef/nptl/nptl-init.c
++++ glibc-2.13.90-14/nptl/nptl-init.c
@@ -396,7 +396,7 @@ __pthread_initialize_minimal_internal (void)
/* Determine the default allowed stack size. This is the size used
in case the user does not specify one. */
@@ -2288,8 +2288,8 @@
|| limit.rlim_cur == RLIM_INFINITY)
/* The system limit is not usable. Use an architecture-specific
default. */
---- glibc-2.13-200-g0a197a9/nptl/pthread_cond_broadcast.c
-+++ glibc-2.13.90-13/nptl/pthread_cond_broadcast.c
+--- glibc-2.13-225-gfdc2fef/nptl/pthread_cond_broadcast.c
++++ glibc-2.13.90-14/nptl/pthread_cond_broadcast.c
@@ -23,6 +23,7 @@
#include <lowlevellock.h>
#include <pthread.h>
@@ -2307,8 +2307,8 @@
int pshared = (cond->__data.__mutex == (void *) ~0l)
? LLL_SHARED : LLL_PRIVATE;
/* Make sure we are alone. */
---- glibc-2.13-200-g0a197a9/nptl/pthread_cond_destroy.c
-+++ glibc-2.13.90-13/nptl/pthread_cond_destroy.c
+--- glibc-2.13-225-gfdc2fef/nptl/pthread_cond_destroy.c
++++ glibc-2.13.90-14/nptl/pthread_cond_destroy.c
@@ -20,6 +20,7 @@
#include <errno.h>
#include <shlib-compat.h>
@@ -2326,8 +2326,8 @@
/* Make sure we are alone. */
lll_lock (cond->__data.__lock, pshared);
---- glibc-2.13-200-g0a197a9/nptl/pthread_cond_init.c
-+++ glibc-2.13.90-13/nptl/pthread_cond_init.c
+--- glibc-2.13-225-gfdc2fef/nptl/pthread_cond_init.c
++++ glibc-2.13.90-14/nptl/pthread_cond_init.c
@@ -20,6 +20,7 @@
#include <shlib-compat.h>
@@ -2345,8 +2345,8 @@
return 0;
}
versioned_symbol (libpthread, __pthread_cond_init,
---- glibc-2.13-200-g0a197a9/nptl/pthread_cond_signal.c
-+++ glibc-2.13.90-13/nptl/pthread_cond_signal.c
+--- glibc-2.13-225-gfdc2fef/nptl/pthread_cond_signal.c
++++ glibc-2.13.90-14/nptl/pthread_cond_signal.c
@@ -26,6 +26,7 @@
#include <shlib-compat.h>
@@ -2364,8 +2364,8 @@
/* Make sure we are alone. */
lll_lock (cond->__data.__lock, pshared);
---- glibc-2.13-200-g0a197a9/nptl/pthread_cond_wait.c
-+++ glibc-2.13.90-13/nptl/pthread_cond_wait.c
+--- glibc-2.13-225-gfdc2fef/nptl/pthread_cond_wait.c
++++ glibc-2.13.90-14/nptl/pthread_cond_wait.c
@@ -25,6 +25,7 @@
#include <pthreadP.h>
@@ -2383,8 +2383,8 @@
/* Make sure we are alone. */
lll_lock (cond->__data.__lock, pshared);
---- glibc-2.13-200-g0a197a9/nptl/pthread_create.c
-+++ glibc-2.13.90-13/nptl/pthread_create.c
+--- glibc-2.13-225-gfdc2fef/nptl/pthread_create.c
++++ glibc-2.13.90-14/nptl/pthread_create.c
@@ -31,6 +31,8 @@
#include <shlib-compat.h>
@@ -2412,8 +2412,8 @@
/* Start the thread. */
return create_thread (pd, iattr, STACK_VARIABLES_ARGS);
}
---- glibc-2.13-200-g0a197a9/nptl/pthread_join.c
-+++ glibc-2.13.90-13/nptl/pthread_join.c
+--- glibc-2.13-225-gfdc2fef/nptl/pthread_join.c
++++ glibc-2.13.90-14/nptl/pthread_join.c
@@ -23,6 +23,8 @@
#include <atomic.h>
#include "pthreadP.h"
@@ -2440,8 +2440,8 @@
+
return result;
}
---- glibc-2.13-200-g0a197a9/nptl/pthread_mutex_destroy.c
-+++ glibc-2.13.90-13/nptl/pthread_mutex_destroy.c
+--- glibc-2.13-225-gfdc2fef/nptl/pthread_mutex_destroy.c
++++ glibc-2.13.90-14/nptl/pthread_mutex_destroy.c
@@ -20,11 +20,15 @@
#include <errno.h>
#include "pthreadP.h"
@@ -2458,8 +2458,8 @@
if ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) == 0
&& mutex->__data.__nusers != 0)
return EBUSY;
---- glibc-2.13-200-g0a197a9/nptl/pthread_mutex_init.c
-+++ glibc-2.13.90-13/nptl/pthread_mutex_init.c
+--- glibc-2.13-225-gfdc2fef/nptl/pthread_mutex_init.c
++++ glibc-2.13.90-14/nptl/pthread_mutex_init.c
@@ -24,6 +24,8 @@
#include <kernel-features.h>
#include "pthreadP.h"
@@ -2478,8 +2478,8 @@
return 0;
}
strong_alias (__pthread_mutex_init, pthread_mutex_init)
---- glibc-2.13-200-g0a197a9/nptl/pthread_mutex_lock.c
-+++ glibc-2.13.90-13/nptl/pthread_mutex_lock.c
+--- glibc-2.13-225-gfdc2fef/nptl/pthread_mutex_lock.c
++++ glibc-2.13.90-14/nptl/pthread_mutex_lock.c
@@ -24,6 +24,7 @@
#include <not-cancel.h>
#include "pthreadP.h"
@@ -2516,8 +2516,8 @@
return 0;
}
#ifndef __pthread_mutex_lock
---- glibc-2.13-200-g0a197a9/nptl/pthread_mutex_timedlock.c
-+++ glibc-2.13.90-13/nptl/pthread_mutex_timedlock.c
+--- glibc-2.13-225-gfdc2fef/nptl/pthread_mutex_timedlock.c
++++ glibc-2.13.90-14/nptl/pthread_mutex_timedlock.c
@@ -24,6 +24,8 @@
#include <lowlevellock.h>
#include <not-cancel.h>
@@ -2572,8 +2572,8 @@
}
out:
---- glibc-2.13-200-g0a197a9/nptl/pthread_mutex_unlock.c
-+++ glibc-2.13.90-13/nptl/pthread_mutex_unlock.c
+--- glibc-2.13-225-gfdc2fef/nptl/pthread_mutex_unlock.c
++++ glibc-2.13.90-14/nptl/pthread_mutex_unlock.c
@@ -22,6 +22,7 @@
#include <stdlib.h>
#include "pthreadP.h"
@@ -2610,8 +2610,8 @@
return 0;
}
---- glibc-2.13-200-g0a197a9/nptl/pthread_rwlock_destroy.c
-+++ glibc-2.13.90-13/nptl/pthread_rwlock_destroy.c
+--- glibc-2.13-225-gfdc2fef/nptl/pthread_rwlock_destroy.c
++++ glibc-2.13.90-14/nptl/pthread_rwlock_destroy.c
@@ -18,12 +18,15 @@
02111-1307 USA. */
@@ -2628,8 +2628,8 @@
/* Nothing to be done. For now. */
return 0;
}
---- glibc-2.13-200-g0a197a9/nptl/pthread_rwlock_rdlock.c
-+++ glibc-2.13.90-13/nptl/pthread_rwlock_rdlock.c
+--- glibc-2.13-225-gfdc2fef/nptl/pthread_rwlock_rdlock.c
++++ glibc-2.13.90-14/nptl/pthread_rwlock_rdlock.c
@@ -22,6 +22,7 @@
#include <lowlevellock.h>
#include <pthread.h>
@@ -2656,8 +2656,8 @@
break;
}
---- glibc-2.13-200-g0a197a9/nptl/pthread_rwlock_unlock.c
-+++ glibc-2.13.90-13/nptl/pthread_rwlock_unlock.c
+--- glibc-2.13-225-gfdc2fef/nptl/pthread_rwlock_unlock.c
++++ glibc-2.13.90-14/nptl/pthread_rwlock_unlock.c
@@ -22,11 +22,14 @@
#include <lowlevellock.h>
#include <pthread.h>
@@ -2673,8 +2673,8 @@
lll_lock (rwlock->__data.__lock, rwlock->__data.__shared);
if (rwlock->__data.__writer)
rwlock->__data.__writer = 0;
---- glibc-2.13-200-g0a197a9/nptl/pthread_rwlock_wrlock.c
-+++ glibc-2.13.90-13/nptl/pthread_rwlock_wrlock.c
+--- glibc-2.13-225-gfdc2fef/nptl/pthread_rwlock_wrlock.c
++++ glibc-2.13.90-14/nptl/pthread_rwlock_wrlock.c
@@ -22,6 +22,7 @@
#include <lowlevellock.h>
#include <pthread.h>
@@ -2701,8 +2701,8 @@
break;
}
---- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
-+++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+--- glibc-2.13-225-gfdc2fef/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
++++ glibc-2.13.90-14/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
@@ -189,4 +189,7 @@
/* Typed memory objects are not available. */
#define _POSIX_TYPED_MEMORY_OBJECTS -1
@@ -2711,8 +2711,8 @@
+#define _XOPEN_STREAMS -1
+
#endif /* bits/posix_opt.h */
---- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/i386/Versions
-+++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/i386/Versions
+--- glibc-2.13-225-gfdc2fef/nptl/sysdeps/unix/sysv/linux/i386/Versions
++++ glibc-2.13.90-14/nptl/sysdeps/unix/sysv/linux/i386/Versions
@@ -0,0 +1,6 @@
+libc {
+ GLIBC_PRIVATE {
@@ -2720,8 +2720,8 @@
+ __uname;
+ }
+}
---- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
-+++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
+--- glibc-2.13-225-gfdc2fef/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
++++ glibc-2.13.90-14/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
@@ -22,6 +22,8 @@
#include <kernel-features.h>
#include <lowlevellock.h>
@@ -2741,8 +2741,8 @@
ENTER_KERNEL
2: movl %edx, %eax
---- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
-+++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
+--- glibc-2.13-225-gfdc2fef/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
++++ glibc-2.13.90-14/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
@@ -24,6 +24,7 @@
#include <kernel-features.h>
#include <pthread-pi-defines.h>
@@ -2760,8 +2760,8 @@
/* Get internal lock. */
movl $1, %edx
xorl %eax, %eax
---- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
-+++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
+--- glibc-2.13-225-gfdc2fef/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
++++ glibc-2.13.90-14/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
@@ -24,7 +24,7 @@
#include <kernel-features.h>
#include <pthread-pi-defines.h>
@@ -2780,8 +2780,8 @@
/* Get internal lock. */
movl $1, %edx
xorl %eax, %eax
---- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
-+++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
+--- glibc-2.13-225-gfdc2fef/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
++++ glibc-2.13.90-14/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
@@ -24,7 +24,7 @@
#include <pthread-errnos.h>
#include <pthread-pi-defines.h>
@@ -2800,8 +2800,8 @@
cmpl $1000000000, 4(%ebp)
movl $EINVAL, %eax
jae 18f
---- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
-+++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
+--- glibc-2.13-225-gfdc2fef/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
++++ glibc-2.13.90-14/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
@@ -25,6 +25,7 @@
#include <pthread-errnos.h>
#include <pthread-pi-defines.h>
@@ -2819,8 +2819,8 @@
/* Get internal lock. */
movl $1, %edx
xorl %eax, %eax
---- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
-+++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
+--- glibc-2.13-225-gfdc2fef/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
++++ glibc-2.13.90-14/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
@@ -23,6 +23,7 @@
#include <pthread-errnos.h>
#include <kernel-features.h>
@@ -2838,8 +2838,8 @@
/* Get the lock. */
movl $1, %edx
xorl %eax, %eax
---- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
-+++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
+--- glibc-2.13-225-gfdc2fef/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
++++ glibc-2.13.90-14/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
@@ -23,6 +23,7 @@
#include <pthread-errnos.h>
#include <kernel-features.h>
@@ -2857,8 +2857,8 @@
/* Get the lock. */
movl $1, %edx
xorl %eax, %eax
---- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
-+++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
+--- glibc-2.13-225-gfdc2fef/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
++++ glibc-2.13.90-14/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
@@ -20,6 +20,8 @@
#ifndef _LOWLEVELLOCK_H
#define _LOWLEVELLOCK_H 1
@@ -2876,8 +2876,8 @@
__asm __volatile (LLL_EBX_LOAD \
LLL_ENTER_KERNEL \
LLL_EBX_LOAD \
---- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/i386/smp.h
-+++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/i386/smp.h
+--- glibc-2.13-225-gfdc2fef/nptl/sysdeps/unix/sysv/linux/i386/smp.h
++++ glibc-2.13.90-14/nptl/sysdeps/unix/sysv/linux/i386/smp.h
@@ -37,7 +37,7 @@ is_smp_system (void)
char *cp;
@@ -2887,8 +2887,8 @@
cp = u.uts.version;
else
{
---- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/kernel-features.h
-+++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.13-225-gfdc2fef/nptl/sysdeps/unix/sysv/linux/kernel-features.h
++++ glibc-2.13.90-14/nptl/sysdeps/unix/sysv/linux/kernel-features.h
@@ -0,0 +1,6 @@
+#include_next <kernel-features.h>
+
@@ -2896,8 +2896,8 @@
+#ifndef __ASSUME_CLONE_THREAD_FLAGS
+# define __ASSUME_CLONE_THREAD_FLAGS 1
+#endif
---- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
-+++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
+--- glibc-2.13-225-gfdc2fef/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
++++ glibc-2.13.90-14/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
@@ -22,6 +22,8 @@
#include <kernel-features.h>
#include <lowlevellock.h>
@@ -2927,8 +2927,8 @@
syscall
2: movl %edx, %eax
---- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
-+++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
+--- glibc-2.13-225-gfdc2fef/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
++++ glibc-2.13.90-14/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
@@ -20,6 +20,8 @@
#ifndef _LOWLEVELLOCK_H
#define _LOWLEVELLOCK_H 1
@@ -2946,8 +2946,8 @@
__asm __volatile ("syscall" \
: "=a" (__ignore) \
: "0" (SYS_futex), "D" (futex), \
---- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S
-+++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S
+--- glibc-2.13-225-gfdc2fef/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S
++++ glibc-2.13.90-14/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S
@@ -25,7 +25,7 @@
#include <kernel-features.h>
#include <pthread-pi-defines.h>
@@ -2966,8 +2966,8 @@
/* Get internal lock. */
movl $1, %esi
xorl %eax, %eax
---- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S
-+++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S
+--- glibc-2.13-225-gfdc2fef/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S
++++ glibc-2.13.90-14/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S
@@ -24,6 +24,7 @@
#include <pthread-pi-defines.h>
#include <kernel-features.h>
@@ -2985,8 +2985,8 @@
/* Get internal lock. */
movq %rdi, %r8
movl $1, %esi
---- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
-+++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
+--- glibc-2.13-225-gfdc2fef/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
++++ glibc-2.13.90-14/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
@@ -23,6 +23,7 @@
#include <lowlevelcond.h>
#include <pthread-pi-defines.h>
@@ -3004,8 +3004,8 @@
cmpq $1000000000, 8(%rdx)
movl $EINVAL, %eax
jae 48f
---- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
-+++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
+--- glibc-2.13-225-gfdc2fef/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
++++ glibc-2.13.90-14/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
@@ -23,6 +23,7 @@
#include <lowlevelcond.h>
#include <tcb-offsets.h>
@@ -3023,8 +3023,8 @@
cmpq $-1, dep_mutex(%rdi)
/* Prepare structure passed to cancellation handler. */
---- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
-+++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
+--- glibc-2.13-225-gfdc2fef/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
++++ glibc-2.13.90-14/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
@@ -22,7 +22,7 @@
#include <lowlevelrwlock.h>
#include <pthread-errnos.h>
@@ -3044,8 +3044,8 @@
xorq %r10, %r10
/* Get the lock. */
---- glibc-2.13-200-g0a197a9/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
-+++ glibc-2.13.90-13/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
+--- glibc-2.13-225-gfdc2fef/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
++++ glibc-2.13.90-14/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
@@ -22,7 +22,7 @@
#include <lowlevelrwlock.h>
#include <pthread-errnos.h>
@@ -3065,8 +3065,8 @@
xorq %r10, %r10
/* Get the lock. */
---- glibc-2.13-200-g0a197a9/nscd/nscd.conf
-+++ glibc-2.13.90-13/nscd/nscd.conf
+--- glibc-2.13-225-gfdc2fef/nscd/nscd.conf
++++ glibc-2.13.90-14/nscd/nscd.conf
@@ -33,7 +33,7 @@
# logfile /var/log/nscd.log
# threads 4
@@ -3076,8 +3076,8 @@
# stat-user somebody
debug-level 0
# reload-count 5
---- glibc-2.13-200-g0a197a9/nscd/nscd.init
-+++ glibc-2.13.90-13/nscd/nscd.init
+--- glibc-2.13-225-gfdc2fef/nscd/nscd.init
++++ glibc-2.13.90-14/nscd/nscd.init
@@ -9,6 +9,7 @@
# slow naming services like NIS, NIS+, LDAP, or hesiod.
# processname: /usr/sbin/nscd
@@ -3154,18 +3154,18 @@
;;
*)
echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-2.13-200-g0a197a9/nss/Makefile
-+++ glibc-2.13.90-13/nss/Makefile
+--- glibc-2.13-225-gfdc2fef/nss/Makefile
++++ glibc-2.13.90-14/nss/Makefile
@@ -75,6 +75,7 @@ endif
include ../Rules
-+CFLAGS-files-hosts.c = -fno-strict-aliasing
++CFLAGS-files-hosts.c += -fno-strict-aliasing
ifeq (yes,$(build-static-nss))
$(objpfx)getent: $(objpfx)libnss_files.a
---- glibc-2.13-200-g0a197a9/nss/nss_files/files-XXX.c
-+++ glibc-2.13.90-13/nss/nss_files/files-XXX.c
+--- glibc-2.13-225-gfdc2fef/nss/nss_files/files-XXX.c
++++ glibc-2.13.90-14/nss/nss_files/files-XXX.c
@@ -1,5 +1,5 @@
/* Common code for file-based databases in nss_files module.
- Copyright (C) 1996-1999,2001,2002,2004,2007,2008
@@ -3182,8 +3182,8 @@
int parse_result;
if (buflen < sizeof *data + 2)
---- glibc-2.13-200-g0a197a9/posix/Makefile
-+++ glibc-2.13.90-13/posix/Makefile
+--- glibc-2.13-225-gfdc2fef/posix/Makefile
++++ glibc-2.13.90-14/posix/Makefile
@@ -325,15 +325,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
mv -f $@/$$spec.new $@/$$spec; \
done < $(objpfx)getconf.speclist
@@ -3204,8 +3204,8 @@
+ | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
+ > $@.new
mv -f $@.new $@
---- glibc-2.13-200-g0a197a9/posix/gai.conf
-+++ glibc-2.13.90-13/posix/gai.conf
+--- glibc-2.13-225-gfdc2fef/posix/gai.conf
++++ glibc-2.13.90-14/posix/gai.conf
@@ -41,7 +41,7 @@
#
# precedence <mask> <value>
@@ -3230,8 +3230,8 @@
#scopev4 ::ffff:0.0.0.0/96 14
+#
+# This is what the Red Hat setting currently uses.
---- glibc-2.13-200-g0a197a9/posix/getconf.speclist.h
-+++ glibc-2.13.90-13/posix/getconf.speclist.h
+--- glibc-2.13-225-gfdc2fef/posix/getconf.speclist.h
++++ glibc-2.13.90-14/posix/getconf.speclist.h
@@ -0,0 +1,39 @@
+#include <unistd.h>
+const char *START_OF_STRINGS =
@@ -3272,8 +3272,8 @@
+"XBS5_LPBIG_OFFBIG"
+#endif
+"";
---- glibc-2.13-200-g0a197a9/posix/regcomp.c
-+++ glibc-2.13.90-13/posix/regcomp.c
+--- glibc-2.13-225-gfdc2fef/posix/regcomp.c
++++ glibc-2.13.90-14/posix/regcomp.c
@@ -2745,40 +2745,29 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
/* Local function for parse_bracket_exp used in _LIBC environement.
@@ -3405,18 +3405,18 @@
{
/* No valid character, treat it as a normal
character. */
---- glibc-2.13-200-g0a197a9/resolv/Makefile
-+++ glibc-2.13.90-13/resolv/Makefile
+--- glibc-2.13-225-gfdc2fef/resolv/Makefile
++++ glibc-2.13.90-14/resolv/Makefile
@@ -77,6 +77,7 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \
-Dgetnetbyaddr=res_getnetbyaddr
CFLAGS-res_hconf.c = -fexceptions
-+CFLAGS-res_send.c = -fno-strict-aliasing
++CFLAGS-res_send.c += -fno-strict-aliasing
# The BIND code elicits some harmless warnings.
+cflags += -Wno-strict-prototypes -Wno-write-strings
---- glibc-2.13-200-g0a197a9/resource/getrlimit.c
-+++ glibc-2.13.90-13/resource/getrlimit.c
+--- glibc-2.13-225-gfdc2fef/resource/getrlimit.c
++++ glibc-2.13.90-14/resource/getrlimit.c
@@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
__set_errno (ENOSYS);
return -1;
@@ -3425,8 +3425,8 @@
weak_alias (__getrlimit, getrlimit)
stub_warning (getrlimit)
---- glibc-2.13-200-g0a197a9/scripts/check-local-headers.sh
-+++ glibc-2.13.90-13/scripts/check-local-headers.sh
+--- glibc-2.13-225-gfdc2fef/scripts/check-local-headers.sh
++++ glibc-2.13.90-14/scripts/check-local-headers.sh
@@ -31,6 +31,8 @@ fgrep -v "$includedir/asm" |
fgrep -v "$includedir/linux" |
fgrep -v "$includedir/selinux" |
@@ -3436,9 +3436,9 @@
fgrep -v "$includedir/gd" |
fgrep -v "$includedir/nss3"; then
# If we found a match something is wrong.
---- glibc-2.13-200-g0a197a9/stdio-common/vfprintf.c
-+++ glibc-2.13.90-13/stdio-common/vfprintf.c
-@@ -1160,41 +1160,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
+--- glibc-2.13-225-gfdc2fef/stdio-common/vfprintf.c
++++ glibc-2.13.90-14/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')) \
{ \
if (prec != -1) \
@@ -3483,8 +3483,8 @@
else \
len = strlen (string); \
} \
---- glibc-2.13-200-g0a197a9/streams/Makefile
-+++ glibc-2.13.90-13/streams/Makefile
+--- glibc-2.13-225-gfdc2fef/streams/Makefile
++++ glibc-2.13.90-14/streams/Makefile
@@ -21,7 +21,7 @@
#
subdir := streams
@@ -3494,8 +3494,8 @@
routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach
include ../Rules
---- glibc-2.13-200-g0a197a9/sunrpc/Makefile
-+++ glibc-2.13.90-13/sunrpc/Makefile
+--- glibc-2.13-225-gfdc2fef/sunrpc/Makefile
++++ glibc-2.13.90-14/sunrpc/Makefile
@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \
des_crypt.h)
headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
@@ -3509,15 +3509,15 @@
CPPFLAGS += -D_RPC_THREAD_SAFE_
-+CFLAGS-clnt_tcp.c = -fno-strict-aliasing
-+CFLAGS-clnt_udp.c = -fno-strict-aliasing
-+CFLAGS-clnt_unix.c = -fno-strict-aliasing
++CFLAGS-clnt_tcp.c += -fno-strict-aliasing
++CFLAGS-clnt_udp.c += -fno-strict-aliasing
++CFLAGS-clnt_unix.c += -fno-strict-aliasing
+
$(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.13-200-g0a197a9/sysdeps/generic/dl-cache.h
-+++ glibc-2.13.90-13/sysdeps/generic/dl-cache.h
+--- glibc-2.13-225-gfdc2fef/sysdeps/generic/dl-cache.h
++++ glibc-2.13.90-14/sysdeps/generic/dl-cache.h
@@ -36,6 +36,14 @@
# define add_system_dir(dir) add_dir (dir)
#endif
@@ -3533,8 +3533,8 @@
#define CACHEMAGIC "ld.so-1.7.0"
/* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another
---- glibc-2.13-200-g0a197a9/sysdeps/i386/Makefile
-+++ glibc-2.13.90-13/sysdeps/i386/Makefile
+--- glibc-2.13-225-gfdc2fef/sysdeps/i386/Makefile
++++ glibc-2.13.90-14/sysdeps/i386/Makefile
@@ -2,6 +2,8 @@
# Every i386 port in use uses gas syntax (I think).
asm-CPPFLAGS += -DGAS_SYNTAX
@@ -3559,8 +3559,8 @@
endif
ifeq ($(subdir),elf)
---- glibc-2.13-200-g0a197a9/sysdeps/i386/__longjmp.S
-+++ glibc-2.13.90-13/sysdeps/i386/__longjmp.S
+--- glibc-2.13-225-gfdc2fef/sysdeps/i386/__longjmp.S
++++ glibc-2.13.90-14/sysdeps/i386/__longjmp.S
@@ -1,5 +1,5 @@
/* longjmp for i386.
- Copyright (C) 1995-1998,2000,2002,2005,2006,2009
@@ -3607,8 +3607,8 @@
#endif
/* Jump to saved PC. */
jmp *%edx
---- glibc-2.13-200-g0a197a9/sysdeps/i386/bsd-_setjmp.S
-+++ glibc-2.13.90-13/sysdeps/i386/bsd-_setjmp.S
+--- glibc-2.13-225-gfdc2fef/sysdeps/i386/bsd-_setjmp.S
++++ glibc-2.13.90-14/sysdeps/i386/bsd-_setjmp.S
@@ -1,5 +1,6 @@
/* BSD `_setjmp' entry point to `sigsetjmp (..., 0)'. i386 version.
- Copyright (C) 1994-1997,2000-2002,2005, 2006 Free Software Foundation, Inc.
@@ -3633,8 +3633,8 @@
#ifdef PTR_MANGLE
PTR_MANGLE (%ecx)
#endif
---- glibc-2.13-200-g0a197a9/sysdeps/i386/bsd-setjmp.S
-+++ glibc-2.13.90-13/sysdeps/i386/bsd-setjmp.S
+--- glibc-2.13-225-gfdc2fef/sysdeps/i386/bsd-setjmp.S
++++ glibc-2.13.90-14/sysdeps/i386/bsd-setjmp.S
@@ -1,5 +1,6 @@
/* BSD `setjmp' entry point to `sigsetjmp (..., 1)'. i386 version.
- Copyright (C) 1994-1997,2000,2001,2005, 2006 Free Software Foundation, Inc.
@@ -3659,8 +3659,8 @@
#ifdef PTR_MANGLE
PTR_MANGLE (%ecx)
#endif
---- glibc-2.13-200-g0a197a9/sysdeps/i386/i686/Makefile
-+++ glibc-2.13.90-13/sysdeps/i386/i686/Makefile
+--- glibc-2.13-225-gfdc2fef/sysdeps/i386/i686/Makefile
++++ glibc-2.13.90-14/sysdeps/i386/i686/Makefile
@@ -9,19 +9,3 @@ stack-align-test-flags += -msse
ifeq ($(subdir),string)
sysdep_routines += cacheinfo
@@ -3681,8 +3681,8 @@
-ASFLAGS-.ob += -Wa,-mtune=i686
-ASFLAGS-.oS += -Wa,-mtune=i686
-endif
---- glibc-2.13-200-g0a197a9/sysdeps/i386/i686/multiarch/strspn.S
-+++ glibc-2.13.90-13/sysdeps/i386/i686/multiarch/strspn.S
+--- glibc-2.13-225-gfdc2fef/sysdeps/i386/i686/multiarch/strspn.S
++++ glibc-2.13.90-14/sysdeps/i386/i686/multiarch/strspn.S
@@ -76,8 +76,8 @@ END(strspn)
# define ENTRY(name) \
.type __strspn_ia32, @function; \
@@ -3694,8 +3694,8 @@
CALL_MCOUNT
# undef END
# define END(name) \
---- glibc-2.13-200-g0a197a9/sysdeps/i386/setjmp.S
-+++ glibc-2.13.90-13/sysdeps/i386/setjmp.S
+--- glibc-2.13-225-gfdc2fef/sysdeps/i386/setjmp.S
++++ glibc-2.13.90-14/sysdeps/i386/setjmp.S
@@ -1,5 +1,5 @@
/* setjmp for i386.
- Copyright (C) 1995,1996,1997,2000,2001,2005,2006
@@ -3719,8 +3719,8 @@
#ifdef PTR_MANGLE
PTR_MANGLE (%ecx)
#endif
---- glibc-2.13-200-g0a197a9/sysdeps/ia64/Makefile
-+++ glibc-2.13.90-13/sysdeps/ia64/Makefile
+--- glibc-2.13-225-gfdc2fef/sysdeps/ia64/Makefile
++++ glibc-2.13.90-14/sysdeps/ia64/Makefile
@@ -12,8 +12,8 @@ elide-routines.os += hp-timing
ifeq (yes,$(build-shared))
@@ -3732,8 +3732,8 @@
endif
endif
---- glibc-2.13-200-g0a197a9/sysdeps/ia64/ia64libgcc.S
-+++ glibc-2.13.90-13/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.13-225-gfdc2fef/sysdeps/ia64/ia64libgcc.S
++++ glibc-2.13.90-14/sysdeps/ia64/ia64libgcc.S
@@ -1,350 +0,0 @@
-/* From the Intel IA-64 Optimization Guide, choose the minimum latency
- alternative. */
@@ -4085,8 +4085,8 @@
- .symver ___multi3, __multi3 at GLIBC_2.2
-
-#endif
---- glibc-2.13-200-g0a197a9/sysdeps/ia64/libgcc-compat.c
-+++ glibc-2.13.90-13/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.13-225-gfdc2fef/sysdeps/ia64/libgcc-compat.c
++++ glibc-2.13.90-14/sysdeps/ia64/libgcc-compat.c
@@ -0,0 +1,84 @@
+/* pre-.hidden libgcc compatibility
+ Copyright (C) 2002 Free Software Foundation, Inc.
@@ -4172,17 +4172,17 @@
+symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
+
+#endif
---- glibc-2.13-200-g0a197a9/sysdeps/mach/hurd/getrlimit.c
-+++ glibc-2.13.90-13/sysdeps/mach/hurd/getrlimit.c
+--- glibc-2.13-225-gfdc2fef/sysdeps/mach/hurd/getrlimit.c
++++ glibc-2.13.90-14/sysdeps/mach/hurd/getrlimit.c
@@ -44,4 +44,5 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
return 0;
}
+libc_hidden_def (__getrlimit)
weak_alias (__getrlimit, getrlimit)
---- glibc-2.13-200-g0a197a9/sysdeps/posix/getaddrinfo.c
-+++ glibc-2.13.90-13/sysdeps/posix/getaddrinfo.c
-@@ -1084,10 +1084,12 @@ static const struct scopeentry
+--- glibc-2.13-225-gfdc2fef/sysdeps/posix/getaddrinfo.c
++++ glibc-2.13.90-14/sysdeps/posix/getaddrinfo.c
+@@ -1335,10 +1335,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 },
@@ -4195,9 +4195,9 @@
/* Default: scope 14. */
{ { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 }
};
---- glibc-2.13-200-g0a197a9/sysdeps/powerpc/powerpc64/Makefile
-+++ glibc-2.13.90-13/sysdeps/powerpc/powerpc64/Makefile
-@@ -30,6 +30,7 @@ ifneq ($(elf),no)
+--- glibc-2.13-225-gfdc2fef/sysdeps/powerpc/powerpc64/Makefile
++++ glibc-2.13.90-14/sysdeps/powerpc/powerpc64/Makefile
+@@ -33,6 +33,7 @@ ifneq ($(elf),no)
# we use -fpic instead which is much better.
CFLAGS-initfini.s += -fpic -O1
endif
@@ -4205,16 +4205,16 @@
endif
ifeq ($(subdir),elf)
---- glibc-2.13-200-g0a197a9/sysdeps/powerpc/powerpc64/elf/Makefile
-+++ glibc-2.13.90-13/sysdeps/powerpc/powerpc64/elf/Makefile
+--- glibc-2.13-225-gfdc2fef/sysdeps/powerpc/powerpc64/elf/Makefile
++++ glibc-2.13.90-14/sysdeps/powerpc/powerpc64/elf/Makefile
@@ -9,3 +9,5 @@ CFLAGS-rtld-mempcpy.os = $(no-special-regs)
CFLAGS-rtld-memmove.os = $(no-special-regs)
CFLAGS-rtld-memchr.os = $(no-special-regs)
CFLAGS-rtld-strnlen.os = $(no-special-regs)
+
+CFLAGS-gmon-start.c = -fno-strict-aliasing
---- glibc-2.13-200-g0a197a9/sysdeps/unix/nice.c
-+++ glibc-2.13.90-13/sysdeps/unix/nice.c
+--- glibc-2.13-225-gfdc2fef/sysdeps/unix/nice.c
++++ glibc-2.13.90-14/sysdeps/unix/nice.c
@@ -42,7 +42,12 @@ nice (int incr)
__set_errno (save);
}
@@ -4229,8 +4229,8 @@
if (result == -1)
{
if (errno == EACCES)
---- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/check_pf.c
-+++ glibc-2.13.90-13/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.13-225-gfdc2fef/sysdeps/unix/sysv/linux/check_pf.c
++++ glibc-2.13.90-14/sysdeps/unix/sysv/linux/check_pf.c
@@ -27,13 +27,10 @@
#include <unistd.h>
#include <sys/socket.h>
@@ -4246,8 +4246,8 @@
#ifndef IFA_F_HOMEADDRESS
# define IFA_F_HOMEADDRESS 0
---- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/futimesat.c
-+++ glibc-2.13.90-13/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.13-225-gfdc2fef/sysdeps/unix/sysv/linux/futimesat.c
++++ glibc-2.13.90-14/sysdeps/unix/sysv/linux/futimesat.c
@@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
{
int result;
@@ -4290,8 +4290,8 @@
{
size_t filelen = strlen (file);
if (__builtin_expect (filelen == 0, 0))
---- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/getpagesize.c
-+++ glibc-2.13.90-13/sysdeps/unix/sysv/linux/getpagesize.c
+--- glibc-2.13-225-gfdc2fef/sysdeps/unix/sysv/linux/getpagesize.c
++++ glibc-2.13.90-14/sysdeps/unix/sysv/linux/getpagesize.c
@@ -28,7 +28,7 @@
int
__getpagesize ()
@@ -4301,8 +4301,8 @@
assert (GLRO(dl_pagesize) != 0);
return GLRO(dl_pagesize);
#else
---- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S
-+++ glibc-2.13.90-13/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S
+--- glibc-2.13-225-gfdc2fef/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S
++++ glibc-2.13.90-14/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S
@@ -1,4 +1,5 @@
-/* Copyright (C) 2001,2004,2005,2006,2009 Free Software Foundation, Inc.
+/* Copyright (C) 2001,2004,2005,2006,2009,2011
@@ -4336,8 +4336,8 @@
+ LIBC_PROBE (longjmp_target, 3, 4@%ecx, -4@%eax, 4@%edx)
jmp *%edx
END (____longjmp_chk)
---- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/i386/dl-cache.h
-+++ glibc-2.13.90-13/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.13-225-gfdc2fef/sysdeps/unix/sysv/linux/i386/dl-cache.h
++++ glibc-2.13.90-14/sysdeps/unix/sysv/linux/i386/dl-cache.h
@@ -0,0 +1,59 @@
+/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
+ Copyright (C) 2004 Free Software Foundation, Inc.
@@ -4398,16 +4398,16 @@
+ } while (0)
+
+#include_next <dl-cache.h>
---- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/i386/getrlimit.c
-+++ glibc-2.13.90-13/sysdeps/unix/sysv/linux/i386/getrlimit.c
+--- glibc-2.13-225-gfdc2fef/sysdeps/unix/sysv/linux/i386/getrlimit.c
++++ glibc-2.13.90-14/sysdeps/unix/sysv/linux/i386/getrlimit.c
@@ -79,4 +79,5 @@ __new_getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
}
weak_alias (__new_getrlimit, __getrlimit);
+libc_hidden_weak (__getrlimit)
versioned_symbol (libc, __new_getrlimit, getrlimit, GLIBC_2_2);
---- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/ia64/dl-cache.h
-+++ glibc-2.13.90-13/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+--- glibc-2.13-225-gfdc2fef/sysdeps/unix/sysv/linux/ia64/dl-cache.h
++++ glibc-2.13.90-14/sysdeps/unix/sysv/linux/ia64/dl-cache.h
@@ -22,4 +22,31 @@
#define _dl_cache_check_flags(flags) \
((flags) == _DL_CACHE_DEFAULT_ID)
@@ -4440,29 +4440,29 @@
+ } while (0)
+
#include_next <dl-cache.h>
---- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
-+++ glibc-2.13.90-13/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.13-225-gfdc2fef/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
++++ glibc-2.13.90-14/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
@@ -0,0 +1,5 @@
+#ifdef IS_IN_ldconfig
+#include <sysdeps/i386/dl-procinfo.c>
+#else
+#include <sysdeps/generic/dl-procinfo.c>
+#endif
---- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
-+++ glibc-2.13.90-13/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.13-225-gfdc2fef/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
++++ glibc-2.13.90-14/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
@@ -0,0 +1,5 @@
+#ifdef IS_IN_ldconfig
+#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
+#else
+#include <sysdeps/generic/dl-procinfo.h>
+#endif
---- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
-+++ glibc-2.13.90-13/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.13-225-gfdc2fef/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
++++ glibc-2.13.90-14/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
@@ -1 +1 @@
-s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_
+s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/netlinkaccess.h
-+++ glibc-2.13.90-13/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.13-225-gfdc2fef/sysdeps/unix/sysv/linux/netlinkaccess.h
++++ glibc-2.13.90-14/sysdeps/unix/sysv/linux/netlinkaccess.h
@@ -25,6 +25,24 @@
#include <kernel-features.h>
@@ -4488,8 +4488,8 @@
struct netlink_res
{
---- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/paths.h
-+++ glibc-2.13.90-13/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.13-225-gfdc2fef/sysdeps/unix/sysv/linux/paths.h
++++ glibc-2.13.90-14/sysdeps/unix/sysv/linux/paths.h
@@ -62,7 +62,7 @@
#define _PATH_TTY "/dev/tty"
#define _PATH_UNIX "/boot/vmlinux"
@@ -4499,8 +4499,8 @@
#define _PATH_WTMP "/var/log/wtmp"
/* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/tcsetattr.c
-+++ glibc-2.13.90-13/sysdeps/unix/sysv/linux/tcsetattr.c
+--- glibc-2.13-225-gfdc2fef/sysdeps/unix/sysv/linux/tcsetattr.c
++++ glibc-2.13.90-14/sysdeps/unix/sysv/linux/tcsetattr.c
@@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
{
struct __kernel_termios k_termios;
@@ -4546,8 +4546,8 @@
+ return retval;
}
libc_hidden_def (tcsetattr)
---- glibc-2.13-200-g0a197a9/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
-+++ glibc-2.13.90-13/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
+--- glibc-2.13-225-gfdc2fef/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
++++ glibc-2.13.90-14/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
@@ -19,6 +19,7 @@
#include <sysdep.h>
#include <jmpbuf-offsets.h>
@@ -4574,8 +4574,8 @@
+ LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx)
jmpq *%rdx
END (____longjmp_chk)
---- glibc-2.13-200-g0a197a9/sysdeps/x86_64/__longjmp.S
-+++ glibc-2.13.90-13/sysdeps/x86_64/__longjmp.S
+--- glibc-2.13-225-gfdc2fef/sysdeps/x86_64/__longjmp.S
++++ glibc-2.13.90-14/sysdeps/x86_64/__longjmp.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001,2004,2005,2006,2009 Free Software Foundation, Inc.
+/* Copyright (C) 2001,2004,2005,2006,2009,2011 Free Software Foundation, Inc.
@@ -4605,8 +4605,8 @@
+ LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx)
jmpq *%rdx
END (__longjmp)
---- glibc-2.13-200-g0a197a9/sysdeps/x86_64/setjmp.S
-+++ glibc-2.13.90-13/sysdeps/x86_64/setjmp.S
+--- glibc-2.13-225-gfdc2fef/sysdeps/x86_64/setjmp.S
++++ glibc-2.13.90-14/sysdeps/x86_64/setjmp.S
@@ -1,5 +1,5 @@
/* setjmp for x86-64.
- Copyright (C) 2001, 2003, 2005, 2006 Free Software Foundation, Inc.
@@ -4630,8 +4630,8 @@
#ifdef PTR_MANGLE
PTR_MANGLE (%rax)
#endif
---- glibc-2.13-200-g0a197a9/timezone/zic.c
-+++ glibc-2.13.90-13/timezone/zic.c
+--- glibc-2.13-225-gfdc2fef/timezone/zic.c
++++ glibc-2.13.90-14/timezone/zic.c
@@ -1921,7 +1921,7 @@ const int zonecount;
if (stdrp != NULL && stdrp->r_hiyear == 2037)
return;
diff --git a/glibc.spec b/glibc.spec
index 014c1da..58e536e 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
-%define glibcsrcdir glibc-2.13-200-g0a197a9
+%define glibcsrcdir glibc-2.13-225-gfdc2fef
%define glibcversion 2.13.90
-%define glibcportsdir glibc-ports-2.13-34-gf1d4d4b
+%define glibcportsdir glibc-ports-2.13-35-g8969f4d
### glibc.spec.in follows:
%define run_glibc_tests 1
%define auxarches athlon alphaev6
@@ -27,7 +27,7 @@
Summary: The GNU libc libraries
Name: glibc
Version: %{glibcversion}
-Release: 13
+Release: 14
# 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
@@ -1051,6 +1051,29 @@ rm -f *.filelist*
%endif
%changelog
+* Fri May 27 2011 Andreas Schwab <schwab at redhat.com> - 2.13.90-14
+- Update from master
+ - Fix conversion to ISO-2022-JP-2 with ISO-8859-7 designation
+ (BZ#12814)
+ - Undo accidental change in x86-64 user.h
+ - Update Japanese translation
+ - Define RLIMIT_RTTIME (BZ#12795)
+ - Update longlong.h from GCC
+ - Add a few more alloca size checks (BZ#12671)
+ - Fix flags parameter value passed to pltenter and pltexit
+ - Define CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM
+ - Always fill output buffer in XPG strerror function (BZ#12782)
+ - Nicer output for negative error numbers in strerror_r
+ - Fix CP1258 conversion (BZ#12777)
+ - Fix handling of LC_CTYPE in locale name handling (BZ#12788)
+ - Set stream errors in more cases (BZ#12792)
+ - Don't unconditionally use alloca in gaih_inet (BZ#11869)
+ - Update documentation in regex.h (BZ#11857)
+ - Prevent Altivec and VSX insns on PowerPC64 when no FPRs or VRs are
+ available
+ - Fix typo in x86-64 powl (BZ#12775)
+- Avoid overriding CFLAGS (#703880)
+
* Wed May 18 2011 Andreas Schwab <schwab at redhat.com> - 2.13.90-13
- Update from master
- Update GB18030 to 2005 version (BZ#11837)
diff --git a/sources b/sources
index 137a987..45d0b4d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-ca87afb83701b1866847b9bd530fdcb2 glibc-2.13-200-g0a197a9-fedora.tar.xz
-e2ec132be414bd3baf70ead36e998801 glibc-2.13-200-g0a197a9.tar.xz
-58bc3858b6d73b2868f6399a4850f0b7 glibc-ports-2.13-34-gf1d4d4b.tar.xz
+e27540abe5b738904c3d68154a77964d glibc-2.13-225-gfdc2fef-fedora.tar.xz
+eebde562bf891a2c772d169b410c3e03 glibc-2.13-225-gfdc2fef.tar.xz
+a300a99da8850731058a6221b5c56368 glibc-ports-2.13-35-g8969f4d.tar.xz
More information about the scm-commits
mailing list