From 444e2cc188fbdaac4882e1301d6711636b7ab378 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Wed, 20 Jul 2011 13:54:13 +0200 Subject: [PATCH] 2.14.90-3 --- .gitignore | 4 +- glibc-fedora.patch | 919 +++++++++++++++++++-------------------------- glibc.spec | 77 ++-- sources | 4 +- 4 files changed, 424 insertions(+), 580 deletions(-) diff --git a/.gitignore b/.gitignore index 74de638..3fb530b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/glibc-2.14-101-gdefe906-fedora.tar.xz -/glibc-2.14-101-gdefe906.tar.xz /glibc-ports-2.14-3-ge5cd24d.tar.xz +/glibc-2.14-121-g5551a7b-fedora.tar.xz +/glibc-2.14-121-g5551a7b.tar.xz diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 7f3c4b3..3bfdc3e 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,27 +1,22 @@ ---- glibc-2.14-101-gdefe906/ChangeLog -+++ glibc-2.14.90-2/ChangeLog -@@ -1,9 +1,3 @@ --2011-07-11 Roland McGrath -- -- * configure.in (-z relro check): Fix test code to make the variable -- truly const. -- * configure: Regenerated. -- - 2011-07-11 Ulrich Drepper +--- glibc-2.14-121-g5551a7b/ChangeLog ++++ glibc-2.14.90-3/ChangeLog +@@ -1,3 +1,15 @@ ++2011-07-09 Andreas Schwab ++ ++ * sysdeps/unix/sysv/linux/pathconf.c: Include . ++ ++2011-07-04 Aurelien Jarno ++ ++ * sysdeps/powerpc/dl-tls.h: Add _PPC_DL_TLS_H inclusion ++ protection macro. ++ * sysdeps/powerpc/powerpc64/dl-irel.h: Include ++ and . ++ (Elf64_FuncDesc): Remove. ++ + 2011-07-13 Andreas Krebbel - * nscd/nscd.h (struct traced_file): Define. -@@ -64,10 +58,6 @@ - Use an empirical test on a built program. - * configure: Regenerated. - -- * configure.in (-z relro check): Use an empirical test on a built DSO. -- Detect, but do not require, on ia64. -- * configure: Regenerated. -- - * configure.in (READELF): Find it with AC_CHECK_TOOL. - Update tests that use readelf to use $READELF instead. - * configure: Regenerated. -@@ -255,6 +245,14 @@ + * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h +@@ -374,6 +386,14 @@ * config.make.in: Likewise. * malloc/Makefile: Likewise. @@ -36,7 +31,7 @@ 2011-06-27 Andreas Schwab * iconvdata/gb18030.c (BODY for TO_LOOP): Fix encoding of non-BMP -@@ -386,6 +384,10 @@ +@@ -505,6 +525,10 @@ * inet/getnetgrent_r.c: Use DL_CALL_FCT in several places. @@ -47,7 +42,7 @@ 2011-06-20 David S. Miller * sysdeps/sparc/sparc32/dl-plt.h: Protect against multiple -@@ -1008,6 +1010,13 @@ +@@ -1127,6 +1151,13 @@ * libio/Makefile (tests): Add bug-fclose1. * libio/bug-fclose1.c: New file. @@ -61,7 +56,7 @@ 2011-05-12 Ulrich Drepper [BZ #12511] -@@ -1285,13 +1294,6 @@ +@@ -1404,13 +1435,6 @@ * stdlib/bug-getcontext.c: New file. * stdlib/Makefile: Add rules to build and run bug-getcontext. @@ -75,7 +70,7 @@ 2011-04-11 Andreas Krebbel * sysdeps/s390/s390-32/elf/start.S (_start): Skip extra zeroes -@@ -1529,6 +1531,31 @@ +@@ -1648,6 +1672,31 @@ * sysdeps/unix/sysv/linux/Versions [GLIBC_2.14] (clock_adjtime): Export. @@ -107,7 +102,7 @@ 2011-03-22 Ulrich Drepper * sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Increment -@@ -1589,6 +1616,16 @@ +@@ -1708,6 +1757,16 @@ $LDFLAGS and -nostdlib -nostartfiles to linking step. Change main to _start. @@ -124,7 +119,7 @@ 2011-03-06 Ulrich Drepper * elf/dl-load.c (_dl_map_object): If we are looking for the first -@@ -1643,12 +1680,6 @@ +@@ -1762,12 +1821,6 @@ * elf/noload.c: Include . (main): Call mtrace. Close all opened handles. @@ -137,7 +132,7 @@ 2011-02-22 Samuel Thibault Fix __if_freereq crash: Unlike the generic version which uses free, -@@ -1805,6 +1836,12 @@ +@@ -1924,6 +1977,12 @@ * shadow/sgetspent.c: Check return value of __sgetspent_r instead of errno. @@ -150,7 +145,7 @@ 2011-01-19 Ulrich Drepper [BZ #11724] -@@ -2492,6 +2529,29 @@ +@@ -2611,6 +2670,29 @@ * sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS): Mask out sign-bit copies when constructing f_fsid. @@ -180,7 +175,7 @@ 2010-09-24 Petr Baudis * debug/stack_chk_fail_local.c: Add missing licence exception. -@@ -3284,6 +3344,32 @@ +@@ -3403,6 +3485,32 @@ call returning > 0 value. * sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise. @@ -213,7 +208,7 @@ 2010-06-07 Andreas Schwab * dlfcn/Makefile: Remove explicit dependencies on libc.so and -@@ -3336,6 +3422,24 @@ +@@ -3455,6 +3563,24 @@ * hurd/hurd/fd.h (__file_name_lookup_at): Update comment. * sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS. @@ -238,8 +233,8 @@ 2010-05-28 Luis Machado * sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi. ---- glibc-2.14-101-gdefe906/ChangeLog.15 -+++ glibc-2.14.90-2/ChangeLog.15 +--- glibc-2.14-121-g5551a7b/ChangeLog.15 ++++ glibc-2.14.90-3/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -305,8 +300,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.14-101-gdefe906/ChangeLog.16 -+++ glibc-2.14.90-2/ChangeLog.16 +--- glibc-2.14-121-g5551a7b/ChangeLog.16 ++++ glibc-2.14.90-3/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -329,8 +324,8 @@ 2006-01-19 Thomas Schwinge * libio/genops.c: Include . ---- glibc-2.14-101-gdefe906/ChangeLog.17 -+++ glibc-2.14.90-2/ChangeLog.17 +--- glibc-2.14-121-g5551a7b/ChangeLog.17 ++++ glibc-2.14.90-3/ChangeLog.17 @@ -256,6 +256,12 @@ * Makerules (libc-abis): Fix search for libc-abis in add-ons. @@ -409,8 +404,8 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-2.14-101-gdefe906/Makeconfig -+++ glibc-2.14.90-2/Makeconfig +--- glibc-2.14-121-g5551a7b/Makeconfig ++++ glibc-2.14.90-3/Makeconfig @@ -797,12 +797,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -427,9 +422,9 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.14-101-gdefe906/NEWS -+++ glibc-2.14.90-2/NEWS -@@ -39,16 +39,6 @@ Version 2.14 +--- glibc-2.14-121-g5551a7b/NEWS ++++ glibc-2.14.90-3/NEWS +@@ -42,16 +42,6 @@ Version 2.14 12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792, 12795, 12811, 12813, 12814, 12841 @@ -446,8 +441,8 @@ * New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at, syncfs, setns, sendmmsg ---- glibc-2.14-101-gdefe906/config.h.in -+++ glibc-2.14.90-2/config.h.in +--- glibc-2.14-121-g5551a7b/config.h.in ++++ glibc-2.14.90-3/config.h.in @@ -204,6 +204,9 @@ /* Define if `.ctors' and `.dtors' sections shouldn't be used. */ #undef NO_CTORS_DTORS_SECTIONS @@ -458,9 +453,9 @@ /* */ ---- glibc-2.14-101-gdefe906/configure -+++ glibc-2.14.90-2/configure -@@ -794,6 +794,7 @@ enable_kernel +--- glibc-2.14-121-g5551a7b/configure ++++ glibc-2.14.90-3/configure +@@ -795,6 +795,7 @@ enable_kernel enable_all_warnings enable_multi_arch enable_nss_crypt @@ -468,7 +463,7 @@ with_cpu ' ac_precious_vars='build_alias -@@ -1453,6 +1454,7 @@ Optional Features: +@@ -1454,6 +1455,7 @@ Optional Features: --enable-multi-arch enable single DSO with optimizations for multiple architectures --enable-nss-crypt enable libcrypt to use nss @@ -476,7 +471,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -@@ -3843,6 +3845,51 @@ else +@@ -3844,6 +3846,51 @@ else fi @@ -528,125 +523,9 @@ # 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 -@@ -6371,97 +6418,40 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_z_initfirst" >&5 - $as_echo "$libc_cv_z_initfirst" >&6; } - -- # Add-on fragments can set these for other machines. -- libc_commonpagesize=${libc_commonpagesize:-no} -- libc_relro_required=${libc_relro_required:-no} - case "$base_machine" in -- i[34567]86 | x86_64 | powerpc* | s390*) -- libc_commonpagesize=0x1000 -- libc_relro_required=yes -- ;; -- sparc*) -- libc_commonpagesize=0x2000 -- libc_relro_required=yes -- ;; -- ia64*) -- libc_commonpagesize=0x4000 -- ;; -- alpha*) -- libc_commonpagesize=0x10000 -- libc_relro_required=yes -- ;; -- esac -- -- if test $libc_commonpagesize != no; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -z relro option" >&5 -+ i[34567]86 | x86_64 | powerpc* | s390* | sparc* | alpha*) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -z relro option" >&5 - $as_echo_n "checking for -z relro option... " >&6; } - if ${libc_cv_z_relro+:} false; then : - $as_echo_n "(cached) " >&6 - else -- libc_cv_z_relro=no -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --int _start (void) { return 42; } --extern void _exit (int); --const void *const relro[] = { &_start, &_exit, 0 }; -- --_ACEOF -- cat > conftest.awk <<\EOF --BEGIN { -- result = "no" -- commonpagesize = strtonum(commonpagesize) --} --{ print "LINE:", $0 > "/dev/stderr" } --$1 == "GNU_RELRO" { -- vaddr = strtonum($3) -- memsz = strtonum($6) -- end = vaddr + memsz -- printf "vaddr %#x memsz %#x end %#x commonpagesize %#x\n", \ -- vaddr, memsz, end, commonpagesize > "/dev/stderr" -- result = (end % commonpagesize == 0) ? "yes" : "broken" --} --END { print result } --EOF -- { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -- -fPIC -shared -o conftest.so conftest.c -- -nostartfiles -nostdlib -- -Wl,-z,relro 1>&5' -+ libc_cv_z_relro=no -+ if { ac_try='${CC-cc} -v --help 2>&1|grep "z relro" 1>&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; } && -- { ac_try='$READELF -Wl conftest.so > conftest.ph' -- { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; } && -- { ac_try=' -- $AWK -v commonpagesize=$libc_commonpagesize -f conftest.awk -- conftest.ph > conftest.cps -- ' -+ test $ac_status = 0; }; } -+ then -+ if { ac_try='${CC-cc} -Wl,--verbose 2>&1|grep DATA_SEGMENT_RELRO_END 1>&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; } && -- libc_cv_z_relro=`cat conftest.cps 2>&5` -- rm -f conftest* --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_z_relro" >&5 --$as_echo "$libc_cv_z_relro" >&6; } -- if { test "x$libc_relro_required" = xyes && -- test "x$libc_cv_z_relro" != xyes -- } -+ test $ac_status = 0; }; } - then -- as_fn_error $? "linker with -z relro support required" "$LINENO" 5 -+ libc_cv_z_relro=yes - fi -- else -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: missing architecture parameter to check for working -z relro" >&5 --$as_echo "$as_me: WARNING: missing architecture parameter to check for working -z relro" >&2;} - fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_z_relro" >&5 -+$as_echo "$libc_cv_z_relro" >&6; } -+ if test "$libc_cv_z_relro" = no; then -+ as_fn_error $? "linker with -z relro support required" "$LINENO" 5 -+ fi -+ ;; -+ *) ;; -+ esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Bgroup option" >&5 - $as_echo_n "checking for -Bgroup option... " >&6; } ---- glibc-2.14-101-gdefe906/configure.in -+++ glibc-2.14.90-2/configure.in -@@ -317,6 +317,29 @@ else +--- glibc-2.14-121-g5551a7b/configure.in ++++ glibc-2.14.90-3/configure.in +@@ -316,6 +316,29 @@ else fi AC_SUBST(libc_cv_nss_crypt) @@ -676,98 +555,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 -@@ -1579,72 +1602,26 @@ EOF - fi - rm -f conftest*]) - -- # Add-on fragments can set these for other machines. -- libc_commonpagesize=${libc_commonpagesize:-no} -- libc_relro_required=${libc_relro_required:-no} - case "$base_machine" in -- i[[34567]]86 | x86_64 | powerpc* | s390*) -- libc_commonpagesize=0x1000 -- libc_relro_required=yes -- ;; -- sparc*) -- libc_commonpagesize=0x2000 -- libc_relro_required=yes -- ;; -- ia64*) -- libc_commonpagesize=0x4000 -- ;; -- alpha*) -- libc_commonpagesize=0x10000 -- libc_relro_required=yes -- ;; -- esac -- -- if test $libc_commonpagesize != no; then -- AC_CACHE_CHECK(for -z relro option, -- libc_cv_z_relro, [dnl -- libc_cv_z_relro=no -- AC_LANG_CONFTEST([AC_LANG_SOURCE([[ --int _start (void) { return 42; } --extern void _exit (int); --const void *const relro[] = { &_start, &_exit, 0 }; --]])]) -- cat > conftest.awk <<\EOF --BEGIN { -- result = "no" -- commonpagesize = strtonum(commonpagesize) --} --{ print "LINE:", $0 > "/dev/stderr" } --$1 == "GNU_RELRO" { -- vaddr = strtonum($3) -- memsz = strtonum($6) -- end = vaddr + memsz -- printf "vaddr %#x memsz %#x end %#x commonpagesize %#x\n", \ -- vaddr, memsz, end, commonpagesize > "/dev/stderr" -- result = (end % commonpagesize == 0) ? "yes" : "broken" --} --END { print result } --EOF -- AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -- -fPIC -shared -o conftest.so conftest.c -- -nostartfiles -nostdlib -- -Wl,-z,relro 1>&AS_MESSAGE_LOG_FD]) && -- AC_TRY_COMMAND([$READELF -Wl conftest.so > conftest.ph]) && -- AC_TRY_COMMAND([ -- $AWK -v commonpagesize=$libc_commonpagesize -f conftest.awk -- conftest.ph > conftest.cps -- ]) && -- libc_cv_z_relro=`cat conftest.cps 2>&AS_MESSAGE_LOG_FD` -- rm -f conftest*]) -- if { test "x$libc_relro_required" = xyes && -- test "x$libc_cv_z_relro" != xyes -- } -+changequote(,)dnl -+ i[34567]86 | x86_64 | powerpc* | s390* | sparc* | alpha*) -+changequote([,])dnl -+ AC_CACHE_CHECK(for -z relro option, -+ libc_cv_z_relro, [dnl -+ libc_cv_z_relro=no -+ if AC_TRY_COMMAND([${CC-cc} -v --help 2>&1|grep "z relro" 1>&AS_MESSAGE_LOG_FD]) -+ then -+ if AC_TRY_COMMAND([${CC-cc} -Wl,--verbose 2>&1|grep DATA_SEGMENT_RELRO_END 1>&AS_MESSAGE_LOG_FD]) - then -- AC_MSG_ERROR(linker with -z relro support required) -+ libc_cv_z_relro=yes - fi -- else -- AC_MSG_WARN([missing architecture parameter to check for working -z relro]) -- fi -+ fi]) -+ if test "$libc_cv_z_relro" = no; then -+ AC_MSG_ERROR(linker with -z relro support required) -+ fi -+ ;; -+ *) ;; -+ esac - - AC_CACHE_CHECK(for -Bgroup option, - libc_cv_Bgroup, [dnl ---- glibc-2.14-101-gdefe906/csu/Makefile -+++ glibc-2.14.90-2/csu/Makefile +--- glibc-2.14-121-g5551a7b/csu/Makefile ++++ glibc-2.14.90-3/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -778,8 +567,8 @@ vpath initfini.c $(sysdirs) ---- glibc-2.14-101-gdefe906/csu/elf-init.c -+++ glibc-2.14.90-2/csu/elf-init.c +--- glibc-2.14-121-g5551a7b/csu/elf-init.c ++++ glibc-2.14.90-3/csu/elf-init.c @@ -64,6 +64,23 @@ extern void (*__init_array_end []) (int, char **, char **) extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -804,8 +593,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.14-101-gdefe906/debug/tst-chk1.c -+++ glibc-2.14.90-2/debug/tst-chk1.c +--- glibc-2.14-121-g5551a7b/debug/tst-chk1.c ++++ glibc-2.14.90-3/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -834,8 +623,8 @@ # define O 0 # else # define O 1 ---- glibc-2.14-101-gdefe906/elf/Makefile -+++ glibc-2.14.90-2/elf/Makefile +--- glibc-2.14-121-g5551a7b/elf/Makefile ++++ glibc-2.14.90-3/elf/Makefile @@ -90,6 +90,7 @@ distribute := rtld-Rules \ unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \ unload6mod1.c unload6mod2.c unload6mod3.c \ @@ -869,7 +658,7 @@ order2mod1 order2mod2 order2mod3 order2mod4 \ tst-unique1mod1 tst-unique1mod2 \ tst-unique2mod1 tst-unique2mod2 \ -@@ -498,7 +501,8 @@ CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ +@@ -500,7 +503,8 @@ CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) CFLAGS-cache.c = $(SYSCONF-FLAGS) @@ -879,7 +668,7 @@ test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names)))) generated += $(addsuffix .so,$(strip $(modules-names))) -@@ -566,6 +570,9 @@ $(objpfx)unload6mod2.so: $(libdl) +@@ -568,6 +572,9 @@ $(objpfx)unload6mod2.so: $(libdl) $(objpfx)unload6mod3.so: $(libdl) $(objpfx)unload7mod1.so: $(libdl) $(objpfx)unload7mod2.so: $(objpfx)unload7mod1.so @@ -889,7 +678,7 @@ $(objpfx)tst-initordera2.so: $(objpfx)tst-initordera1.so $(objpfx)tst-initorderb2.so: $(objpfx)tst-initorderb1.so $(objpfx)tst-initordera2.so $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb1.so -@@ -879,6 +886,9 @@ $(objpfx)unload7: $(libdl) +@@ -881,6 +888,9 @@ $(objpfx)unload7: $(libdl) $(objpfx)unload7.out: $(objpfx)unload7mod1.so $(objpfx)unload7mod2.so unload7-ENV = MALLOC_PERTURB_=85 @@ -899,8 +688,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.14-101-gdefe906/elf/dl-close.c -+++ glibc-2.14.90-2/elf/dl-close.c +--- glibc-2.14-121-g5551a7b/elf/dl-close.c ++++ glibc-2.14.90-3/elf/dl-close.c @@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map) if (map->l_direct_opencount > 0 || map->l_type != lt_loaded || dl_close_state != not_pending) @@ -935,8 +724,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.14-101-gdefe906/elf/dl-deps.c -+++ glibc-2.14.90-2/elf/dl-deps.c +--- glibc-2.14-121-g5551a7b/elf/dl-deps.c ++++ glibc-2.14.90-3/elf/dl-deps.c @@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map, nneeded * sizeof needed[0]); atomic_write_barrier (); @@ -975,8 +764,8 @@ + _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname, + NULL, errstring); } ---- glibc-2.14-101-gdefe906/elf/dl-init.c -+++ glibc-2.14.90-2/elf/dl-init.c +--- glibc-2.14-121-g5551a7b/elf/dl-init.c ++++ glibc-2.14.90-3/elf/dl-init.c @@ -24,11 +24,9 @@ /* Type of the initializer. */ typedef void (*init_t) (int, char **, char **); @@ -999,8 +788,8 @@ -#endif } INTDEF (_dl_init) ---- glibc-2.14-101-gdefe906/elf/dl-libc.c -+++ glibc-2.14.90-2/elf/dl-libc.c +--- glibc-2.14-121-g5551a7b/elf/dl-libc.c ++++ glibc-2.14.90-3/elf/dl-libc.c @@ -265,13 +265,13 @@ libc_freeres_fn (free_mem) for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) @@ -1027,8 +816,8 @@ } if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 ---- glibc-2.14-101-gdefe906/elf/dl-load.c -+++ glibc-2.14.90-2/elf/dl-load.c +--- glibc-2.14-121-g5551a7b/elf/dl-load.c ++++ glibc-2.14.90-3/elf/dl-load.c @@ -250,8 +250,7 @@ is_trusted_path_normalize (const char *path, size_t len) @@ -1108,8 +897,8 @@ } else /* No DST we recognize. */ ---- glibc-2.14-101-gdefe906/elf/dl-support.c -+++ glibc-2.14.90-2/elf/dl-support.c +--- glibc-2.14-121-g5551a7b/elf/dl-support.c ++++ glibc-2.14.90-3/elf/dl-support.c @@ -81,10 +81,8 @@ unsigned long long _dl_load_adds; create a fake scope containing nothing. */ struct r_scope_elem _dl_initial_searchlist; @@ -1121,8 +910,8 @@ /* Random data provided by the kernel. */ void *_dl_random; ---- glibc-2.14-101-gdefe906/elf/ldconfig.c -+++ glibc-2.14.90-2/elf/ldconfig.c +--- glibc-2.14-121-g5551a7b/elf/ldconfig.c ++++ glibc-2.14.90-3/elf/ldconfig.c @@ -1034,17 +1034,19 @@ search_dirs (void) @@ -1204,8 +993,8 @@ } const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; ---- glibc-2.14-101-gdefe906/elf/ldd.bash.in -+++ glibc-2.14.90-2/elf/ldd.bash.in +--- glibc-2.14-121-g5551a7b/elf/ldd.bash.in ++++ glibc-2.14.90-3/elf/ldd.bash.in @@ -167,18 +167,6 @@ warning: you do not have execution permission for" "\`$file'" >&2 fi done @@ -1234,8 +1023,8 @@ try_trace "$RTLD" "$file" || result=1 ;; *) ---- glibc-2.14-101-gdefe906/elf/rtld-Rules -+++ glibc-2.14.90-2/elf/rtld-Rules +--- glibc-2.14-121-g5551a7b/elf/rtld-Rules ++++ glibc-2.14.90-3/elf/rtld-Rules @@ -1,7 +1,7 @@ # Subroutine makefile for compiling libc modules linked into dynamic linker. @@ -1253,8 +1042,8 @@ +rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld endif ---- glibc-2.14-101-gdefe906/elf/rtld.c -+++ glibc-2.14.90-2/elf/rtld.c +--- glibc-2.14-121-g5551a7b/elf/rtld.c ++++ glibc-2.14.90-3/elf/rtld.c @@ -107,7 +107,6 @@ static struct audit_list struct audit_list *next; } *audit_list; @@ -1298,8 +1087,8 @@ if (! prelinked && rtld_multiple_ref) { /* There was an explicit ref to the dynamic linker as a shared lib. ---- glibc-2.14-101-gdefe906/elf/unload8.c -+++ glibc-2.14.90-2/elf/unload8.c +--- glibc-2.14-121-g5551a7b/elf/unload8.c ++++ glibc-2.14.90-3/elf/unload8.c @@ -0,0 +1,33 @@ +#include +#include @@ -1334,8 +1123,8 @@ + + return 0; +} ---- glibc-2.14-101-gdefe906/elf/unload8mod1.c -+++ glibc-2.14.90-2/elf/unload8mod1.c +--- glibc-2.14-121-g5551a7b/elf/unload8mod1.c ++++ glibc-2.14.90-3/elf/unload8mod1.c @@ -0,0 +1,7 @@ +extern void mod2 (void); + @@ -1344,12 +1133,12 @@ +{ + mod2 (); +} ---- glibc-2.14-101-gdefe906/elf/unload8mod1x.c -+++ glibc-2.14.90-2/elf/unload8mod1x.c +--- glibc-2.14-121-g5551a7b/elf/unload8mod1x.c ++++ glibc-2.14.90-3/elf/unload8mod1x.c @@ -0,0 +1 @@ +int mod1x; ---- glibc-2.14-101-gdefe906/elf/unload8mod2.c -+++ glibc-2.14.90-2/elf/unload8mod2.c +--- glibc-2.14-121-g5551a7b/elf/unload8mod2.c ++++ glibc-2.14.90-3/elf/unload8mod2.c @@ -0,0 +1,7 @@ +extern void mod3 (void); + @@ -1358,8 +1147,8 @@ +{ + mod3 (); +} ---- glibc-2.14-101-gdefe906/elf/unload8mod3.c -+++ glibc-2.14.90-2/elf/unload8mod3.c +--- glibc-2.14-121-g5551a7b/elf/unload8mod3.c ++++ glibc-2.14.90-3/elf/unload8mod3.c @@ -0,0 +1,27 @@ +#include +#include @@ -1388,24 +1177,24 @@ + + atexit (mod3_fini); +} ---- glibc-2.14-101-gdefe906/extra-lib.mk -+++ glibc-2.14.90-2/extra-lib.mk +--- glibc-2.14-121-g5551a7b/extra-lib.mk ++++ glibc-2.14.90-3/extra-lib.mk @@ -101,4 +101,4 @@ ifneq (,$(cpp-srcs-left)) include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) 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.14-101-gdefe906/include/bits/stdlib-ldbl.h -+++ glibc-2.14.90-2/include/bits/stdlib-ldbl.h +--- glibc-2.14-121-g5551a7b/include/bits/stdlib-ldbl.h ++++ glibc-2.14.90-3/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.14-101-gdefe906/include/bits/wchar-ldbl.h -+++ glibc-2.14.90-2/include/bits/wchar-ldbl.h +--- glibc-2.14-121-g5551a7b/include/bits/wchar-ldbl.h ++++ glibc-2.14.90-3/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.14-101-gdefe906/include/features.h -+++ glibc-2.14.90-2/include/features.h +--- glibc-2.14-121-g5551a7b/include/features.h ++++ glibc-2.14.90-3/include/features.h @@ -310,8 +310,13 @@ #endif @@ -1422,8 +1211,8 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.14-101-gdefe906/include/libc-symbols.h -+++ glibc-2.14.90-2/include/libc-symbols.h +--- glibc-2.14-121-g5551a7b/include/libc-symbols.h ++++ glibc-2.14.90-3/include/libc-symbols.h @@ -635,7 +635,7 @@ for linking") # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # define libc_hidden_def(name) hidden_def (name) @@ -1433,8 +1222,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.14-101-gdefe906/include/link.h -+++ glibc-2.14.90-2/include/link.h +--- glibc-2.14-121-g5551a7b/include/link.h ++++ glibc-2.14.90-3/include/link.h @@ -1,6 +1,6 @@ /* Data structure for communication from the run-time dynamic linker for loaded ELF shared objects. @@ -1463,8 +1252,8 @@ /* List of the dependencies introduced through symbol binding. */ struct link_map_reldeps ---- glibc-2.14-101-gdefe906/include/stap-probe.h -+++ glibc-2.14.90-2/include/stap-probe.h +--- glibc-2.14-121-g5551a7b/include/stap-probe.h ++++ glibc-2.14.90-3/include/stap-probe.h @@ -0,0 +1,140 @@ +/* Macros for defining Systemtap static probe points. + Copyright (C) 2011 Free Software Foundation, Inc. @@ -1606,16 +1395,16 @@ +#endif /* USE_STAP_PROBE. */ + +#endif /* stap-probe.h */ ---- glibc-2.14-101-gdefe906/include/sys/resource.h -+++ glibc-2.14.90-2/include/sys/resource.h +--- glibc-2.14-121-g5551a7b/include/sys/resource.h ++++ glibc-2.14.90-3/include/sys/resource.h @@ -13,4 +13,5 @@ extern int __getrusage (enum __rusage_who __who, struct rusage *__usage) extern int __setrlimit (enum __rlimit_resource __resource, const struct rlimit *__rlimits); +libc_hidden_proto (__getrlimit) #endif ---- glibc-2.14-101-gdefe906/inet/Makefile -+++ glibc-2.14.90-2/inet/Makefile +--- glibc-2.14-121-g5551a7b/inet/Makefile ++++ glibc-2.14.90-3/inet/Makefile @@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \ include ../Rules @@ -1625,8 +1414,8 @@ ifeq ($(have-thread-library),yes) CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions ---- glibc-2.14-101-gdefe906/intl/locale.alias -+++ glibc-2.14.90-2/intl/locale.alias +--- glibc-2.14-121-g5551a7b/intl/locale.alias ++++ glibc-2.14.90-3/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -1636,8 +1425,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.14-101-gdefe906/libio/stdio.h -+++ glibc-2.14.90-2/libio/stdio.h +--- glibc-2.14-121-g5551a7b/libio/stdio.h ++++ glibc-2.14.90-3/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. */ @@ -1651,8 +1440,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.14-101-gdefe906/locale/iso-4217.def -+++ glibc-2.14.90-2/locale/iso-4217.def +--- glibc-2.14-121-g5551a7b/locale/iso-4217.def ++++ glibc-2.14.90-3/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -1744,8 +1533,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.14-101-gdefe906/locale/programs/locarchive.c -+++ glibc-2.14.90-2/locale/programs/locarchive.c +--- glibc-2.14-121-g5551a7b/locale/programs/locarchive.c ++++ glibc-2.14.90-3/locale/programs/locarchive.c @@ -134,7 +134,7 @@ create_archive (const char *archivefname, struct locarhandle *ah) size_t reserved = RESERVE_MMAP_SIZE; int xflags = 0; @@ -1804,8 +1593,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.14-101-gdefe906/localedata/ChangeLog -+++ glibc-2.14.90-2/localedata/ChangeLog +--- glibc-2.14-121-g5551a7b/localedata/ChangeLog ++++ glibc-2.14.90-3/localedata/ChangeLog @@ -3,6 +3,14 @@ * tests-mbwc/tst_funcs.h (TST_DECL_VARS, TST_HEAD_LOCALE): Remove unused variable. @@ -1821,8 +1610,8 @@ 2011-05-21 Ulrich Drepper [BZ #12788] ---- glibc-2.14-101-gdefe906/localedata/Makefile -+++ glibc-2.14.90-2/localedata/Makefile +--- glibc-2.14-121-g5551a7b/localedata/Makefile ++++ glibc-2.14.90-3/localedata/Makefile @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -1831,8 +1620,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.14-101-gdefe906/localedata/SUPPORTED -+++ glibc-2.14.90-2/localedata/SUPPORTED +--- glibc-2.14-121-g5551a7b/localedata/SUPPORTED ++++ glibc-2.14.90-3/localedata/SUPPORTED @@ -86,6 +86,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -1874,8 +1663,8 @@ sw_KE/UTF-8 \ sw_TZ/UTF-8 \ ta_IN/UTF-8 \ ---- glibc-2.14-101-gdefe906/localedata/locales/cy_GB -+++ glibc-2.14.90-2/localedata/locales/cy_GB +--- glibc-2.14-121-g5551a7b/localedata/locales/cy_GB ++++ glibc-2.14.90-3/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1890,8 +1679,8 @@ END LC_TIME LC_MESSAGES ---- glibc-2.14-101-gdefe906/localedata/locales/en_GB -+++ glibc-2.14.90-2/localedata/locales/en_GB +--- glibc-2.14-121-g5551a7b/localedata/locales/en_GB ++++ glibc-2.14.90-3/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1903,8 +1692,8 @@ date_fmt "/ / " ---- glibc-2.14-101-gdefe906/localedata/locales/no_NO -+++ glibc-2.14.90-2/localedata/locales/no_NO +--- glibc-2.14-121-g5551a7b/localedata/locales/no_NO ++++ glibc-2.14.90-3/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1975,8 +1764,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.14-101-gdefe906/localedata/locales/zh_TW -+++ glibc-2.14.90-2/localedata/locales/zh_TW +--- glibc-2.14-121-g5551a7b/localedata/locales/zh_TW ++++ glibc-2.14.90-3/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -2004,8 +1793,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.14-101-gdefe906/login/programs/pt_chown.c -+++ glibc-2.14.90-2/login/programs/pt_chown.c +--- glibc-2.14-121-g5551a7b/login/programs/pt_chown.c ++++ glibc-2.14.90-3/login/programs/pt_chown.c @@ -29,6 +29,7 @@ #include #include @@ -2047,8 +1836,8 @@ - return EXIT_SUCCESS; } ---- glibc-2.14-101-gdefe906/malloc/mcheck.c -+++ glibc-2.14.90-2/malloc/mcheck.c +--- glibc-2.14-121-g5551a7b/malloc/mcheck.c ++++ glibc-2.14.90-3/malloc/mcheck.c @@ -25,10 +25,26 @@ # include # include @@ -2125,8 +1914,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.14-101-gdefe906/manual/libc.texinfo -+++ glibc-2.14.90-2/manual/libc.texinfo +--- glibc-2.14-121-g5551a7b/manual/libc.texinfo ++++ glibc-2.14.90-3/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -2136,8 +1925,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.14-101-gdefe906/misc/sys/cdefs.h -+++ glibc-2.14.90-2/misc/sys/cdefs.h +--- glibc-2.14-121-g5551a7b/misc/sys/cdefs.h ++++ glibc-2.14.90-3/misc/sys/cdefs.h @@ -132,7 +132,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos0(ptr) __builtin_object_size (ptr, 0) @@ -2181,8 +1970,8 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.14-101-gdefe906/nis/Makefile -+++ glibc-2.14.90-2/nis/Makefile +--- glibc-2.14-121-g5551a7b/nis/Makefile ++++ glibc-2.14.90-3/nis/Makefile @@ -23,9 +23,9 @@ subdir := nis aux := nis_hash @@ -2204,8 +1993,8 @@ $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version) $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \ ---- glibc-2.14-101-gdefe906/nis/nss -+++ glibc-2.14.90-2/nis/nss +--- glibc-2.14-121-g5551a7b/nis/nss ++++ glibc-2.14.90-3/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 @@ -2215,9 +2004,9 @@ # # ADJUNCT_AS_SHADOW # If set to TRUE, the passwd routines in the NIS NSS module will not ---- glibc-2.14-101-gdefe906/nptl/ChangeLog -+++ glibc-2.14.90-2/nptl/ChangeLog -@@ -24,6 +24,51 @@ +--- glibc-2.14-121-g5551a7b/nptl/ChangeLog ++++ glibc-2.14.90-3/nptl/ChangeLog +@@ -29,6 +29,51 @@ clearing memory. Patch partly by Robert Rex . @@ -2269,7 +2058,7 @@ 2011-01-19 Roland McGrath * pthread_cond_wait.c (__pthread_cond_wait): Fix comment typo. -@@ -4753,6 +4798,11 @@ +@@ -4758,6 +4803,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -2281,7 +2070,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -6827,6 +6877,11 @@ +@@ -6832,6 +6882,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -2293,8 +2082,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.14-101-gdefe906/nptl/DESIGN-systemtap-probes.txt -+++ glibc-2.14.90-2/nptl/DESIGN-systemtap-probes.txt +--- glibc-2.14-121-g5551a7b/nptl/DESIGN-systemtap-probes.txt ++++ glibc-2.14.90-3/nptl/DESIGN-systemtap-probes.txt @@ -0,0 +1,89 @@ +Systemtap is a dynamic tracing/instrumenting tool available on Linux. Probes +that are not fired at run time have close to zero overhead. @@ -2385,8 +2174,8 @@ + arg1 = condition +cond_broadcast - probe for pthread_cond_broadcast + arg1 = condition ---- glibc-2.14-101-gdefe906/nptl/Makefile -+++ glibc-2.14.90-2/nptl/Makefile +--- glibc-2.14-121-g5551a7b/nptl/Makefile ++++ glibc-2.14.90-3/nptl/Makefile @@ -342,7 +342,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -2419,8 +2208,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.14-101-gdefe906/nptl/Versions -+++ glibc-2.14.90-2/nptl/Versions +--- glibc-2.14-121-g5551a7b/nptl/Versions ++++ glibc-2.14.90-3/nptl/Versions @@ -30,6 +30,7 @@ libc { __libc_alloca_cutoff; # Internal libc interface to libpthread @@ -2429,8 +2218,8 @@ } } ---- glibc-2.14-101-gdefe906/nptl/allocatestack.c -+++ glibc-2.14.90-2/nptl/allocatestack.c +--- glibc-2.14-121-g5551a7b/nptl/allocatestack.c ++++ glibc-2.14.90-3/nptl/allocatestack.c @@ -999,7 +999,16 @@ setxid_mark_thread (struct xid_command *cmdp, struct pthread *t) /* If the thread is exiting right now, ignore it. */ @@ -2449,8 +2238,8 @@ } while (atomic_compare_and_exchange_bool_acq (&t->cancelhandling, ch | SETXID_BITMASK, ch)); ---- glibc-2.14-101-gdefe906/nptl/nptl-init.c -+++ glibc-2.14.90-2/nptl/nptl-init.c +--- glibc-2.14-121-g5551a7b/nptl/nptl-init.c ++++ glibc-2.14.90-3/nptl/nptl-init.c @@ -414,7 +414,7 @@ __pthread_initialize_minimal_internal (void) /* Determine the default allowed stack size. This is the size used in case the user does not specify one. */ @@ -2460,8 +2249,8 @@ || limit.rlim_cur == RLIM_INFINITY) /* The system limit is not usable. Use an architecture-specific default. */ ---- glibc-2.14-101-gdefe906/nptl/pthread_cond_broadcast.c -+++ glibc-2.14.90-2/nptl/pthread_cond_broadcast.c +--- glibc-2.14-121-g5551a7b/nptl/pthread_cond_broadcast.c ++++ glibc-2.14.90-3/nptl/pthread_cond_broadcast.c @@ -23,6 +23,7 @@ #include #include @@ -2479,8 +2268,8 @@ int pshared = (cond->__data.__mutex == (void *) ~0l) ? LLL_SHARED : LLL_PRIVATE; /* Make sure we are alone. */ ---- glibc-2.14-101-gdefe906/nptl/pthread_cond_destroy.c -+++ glibc-2.14.90-2/nptl/pthread_cond_destroy.c +--- glibc-2.14-121-g5551a7b/nptl/pthread_cond_destroy.c ++++ glibc-2.14.90-3/nptl/pthread_cond_destroy.c @@ -20,6 +20,7 @@ #include #include @@ -2498,8 +2287,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-101-gdefe906/nptl/pthread_cond_init.c -+++ glibc-2.14.90-2/nptl/pthread_cond_init.c +--- glibc-2.14-121-g5551a7b/nptl/pthread_cond_init.c ++++ glibc-2.14.90-3/nptl/pthread_cond_init.c @@ -20,6 +20,7 @@ #include @@ -2517,8 +2306,8 @@ return 0; } versioned_symbol (libpthread, __pthread_cond_init, ---- glibc-2.14-101-gdefe906/nptl/pthread_cond_signal.c -+++ glibc-2.14.90-2/nptl/pthread_cond_signal.c +--- glibc-2.14-121-g5551a7b/nptl/pthread_cond_signal.c ++++ glibc-2.14.90-3/nptl/pthread_cond_signal.c @@ -26,6 +26,7 @@ #include @@ -2536,8 +2325,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-101-gdefe906/nptl/pthread_cond_wait.c -+++ glibc-2.14.90-2/nptl/pthread_cond_wait.c +--- glibc-2.14-121-g5551a7b/nptl/pthread_cond_wait.c ++++ glibc-2.14.90-3/nptl/pthread_cond_wait.c @@ -25,6 +25,7 @@ #include @@ -2555,8 +2344,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14-101-gdefe906/nptl/pthread_create.c -+++ glibc-2.14.90-2/nptl/pthread_create.c +--- glibc-2.14-121-g5551a7b/nptl/pthread_create.c ++++ glibc-2.14.90-3/nptl/pthread_create.c @@ -31,6 +31,8 @@ #include @@ -2584,8 +2373,8 @@ /* Start the thread. */ return create_thread (pd, iattr, STACK_VARIABLES_ARGS); } ---- glibc-2.14-101-gdefe906/nptl/pthread_join.c -+++ glibc-2.14.90-2/nptl/pthread_join.c +--- glibc-2.14-121-g5551a7b/nptl/pthread_join.c ++++ glibc-2.14.90-3/nptl/pthread_join.c @@ -23,6 +23,8 @@ #include #include "pthreadP.h" @@ -2612,8 +2401,8 @@ + return result; } ---- glibc-2.14-101-gdefe906/nptl/pthread_mutex_destroy.c -+++ glibc-2.14.90-2/nptl/pthread_mutex_destroy.c +--- glibc-2.14-121-g5551a7b/nptl/pthread_mutex_destroy.c ++++ glibc-2.14.90-3/nptl/pthread_mutex_destroy.c @@ -20,11 +20,15 @@ #include #include "pthreadP.h" @@ -2630,8 +2419,8 @@ if ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) == 0 && mutex->__data.__nusers != 0) return EBUSY; ---- glibc-2.14-101-gdefe906/nptl/pthread_mutex_init.c -+++ glibc-2.14.90-2/nptl/pthread_mutex_init.c +--- glibc-2.14-121-g5551a7b/nptl/pthread_mutex_init.c ++++ glibc-2.14.90-3/nptl/pthread_mutex_init.c @@ -24,6 +24,8 @@ #include #include "pthreadP.h" @@ -2650,8 +2439,8 @@ return 0; } strong_alias (__pthread_mutex_init, pthread_mutex_init) ---- glibc-2.14-101-gdefe906/nptl/pthread_mutex_lock.c -+++ glibc-2.14.90-2/nptl/pthread_mutex_lock.c +--- glibc-2.14-121-g5551a7b/nptl/pthread_mutex_lock.c ++++ glibc-2.14.90-3/nptl/pthread_mutex_lock.c @@ -24,6 +24,7 @@ #include #include "pthreadP.h" @@ -2688,8 +2477,8 @@ return 0; } #ifndef __pthread_mutex_lock ---- glibc-2.14-101-gdefe906/nptl/pthread_mutex_timedlock.c -+++ glibc-2.14.90-2/nptl/pthread_mutex_timedlock.c +--- glibc-2.14-121-g5551a7b/nptl/pthread_mutex_timedlock.c ++++ glibc-2.14.90-3/nptl/pthread_mutex_timedlock.c @@ -24,6 +24,8 @@ #include #include @@ -2744,8 +2533,8 @@ } out: ---- glibc-2.14-101-gdefe906/nptl/pthread_mutex_unlock.c -+++ glibc-2.14.90-2/nptl/pthread_mutex_unlock.c +--- glibc-2.14-121-g5551a7b/nptl/pthread_mutex_unlock.c ++++ glibc-2.14.90-3/nptl/pthread_mutex_unlock.c @@ -22,6 +22,7 @@ #include #include "pthreadP.h" @@ -2782,8 +2571,8 @@ return 0; } ---- glibc-2.14-101-gdefe906/nptl/pthread_rwlock_destroy.c -+++ glibc-2.14.90-2/nptl/pthread_rwlock_destroy.c +--- glibc-2.14-121-g5551a7b/nptl/pthread_rwlock_destroy.c ++++ glibc-2.14.90-3/nptl/pthread_rwlock_destroy.c @@ -18,12 +18,15 @@ 02111-1307 USA. */ @@ -2800,8 +2589,8 @@ /* Nothing to be done. For now. */ return 0; } ---- glibc-2.14-101-gdefe906/nptl/pthread_rwlock_rdlock.c -+++ glibc-2.14.90-2/nptl/pthread_rwlock_rdlock.c +--- glibc-2.14-121-g5551a7b/nptl/pthread_rwlock_rdlock.c ++++ glibc-2.14.90-3/nptl/pthread_rwlock_rdlock.c @@ -22,6 +22,7 @@ #include #include @@ -2828,8 +2617,8 @@ break; } ---- glibc-2.14-101-gdefe906/nptl/pthread_rwlock_unlock.c -+++ glibc-2.14.90-2/nptl/pthread_rwlock_unlock.c +--- glibc-2.14-121-g5551a7b/nptl/pthread_rwlock_unlock.c ++++ glibc-2.14.90-3/nptl/pthread_rwlock_unlock.c @@ -22,11 +22,14 @@ #include #include @@ -2845,8 +2634,8 @@ lll_lock (rwlock->__data.__lock, rwlock->__data.__shared); if (rwlock->__data.__writer) rwlock->__data.__writer = 0; ---- glibc-2.14-101-gdefe906/nptl/pthread_rwlock_wrlock.c -+++ glibc-2.14.90-2/nptl/pthread_rwlock_wrlock.c +--- glibc-2.14-121-g5551a7b/nptl/pthread_rwlock_wrlock.c ++++ glibc-2.14.90-3/nptl/pthread_rwlock_wrlock.c @@ -22,6 +22,7 @@ #include #include @@ -2873,8 +2662,8 @@ break; } ---- glibc-2.14-101-gdefe906/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ glibc-2.14.90-2/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h @@ -189,4 +189,7 @@ /* Typed memory objects are not available. */ #define _POSIX_TYPED_MEMORY_OBJECTS -1 @@ -2883,8 +2672,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.14-101-gdefe906/nptl/sysdeps/unix/sysv/linux/i386/Versions -+++ glibc-2.14.90-2/nptl/sysdeps/unix/sysv/linux/i386/Versions +--- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/i386/Versions ++++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/i386/Versions @@ -0,0 +1,6 @@ +libc { + GLIBC_PRIVATE { @@ -2892,8 +2681,8 @@ + __uname; + } +} ---- glibc-2.14-101-gdefe906/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S -+++ glibc-2.14.90-2/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S +--- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S ++++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S @@ -22,6 +22,8 @@ #include #include @@ -2913,8 +2702,8 @@ ENTER_KERNEL 2: movl %edx, %eax ---- glibc-2.14-101-gdefe906/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S -+++ glibc-2.14.90-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S +--- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S ++++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S @@ -24,6 +24,7 @@ #include #include @@ -2932,8 +2721,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-101-gdefe906/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S -+++ glibc-2.14.90-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S +--- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S ++++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S @@ -24,7 +24,7 @@ #include #include @@ -2952,8 +2741,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-101-gdefe906/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S -+++ glibc-2.14.90-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S +--- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S ++++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S @@ -24,7 +24,7 @@ #include #include @@ -2972,8 +2761,8 @@ cmpl $1000000000, 4(%ebp) movl $EINVAL, %eax jae 18f ---- glibc-2.14-101-gdefe906/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S -+++ glibc-2.14.90-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S +--- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S ++++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S @@ -25,6 +25,7 @@ #include #include @@ -2991,8 +2780,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-101-gdefe906/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S -+++ glibc-2.14.90-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S +--- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S ++++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S @@ -23,6 +23,7 @@ #include #include @@ -3010,8 +2799,8 @@ /* Get the lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-101-gdefe906/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S -+++ glibc-2.14.90-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S +--- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S ++++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S @@ -23,6 +23,7 @@ #include #include @@ -3029,8 +2818,8 @@ /* Get the lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14-101-gdefe906/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h -+++ glibc-2.14.90-2/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h +--- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h ++++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H #define _LOWLEVELLOCK_H 1 @@ -3048,8 +2837,8 @@ __asm __volatile (LLL_EBX_LOAD \ LLL_ENTER_KERNEL \ LLL_EBX_LOAD \ ---- glibc-2.14-101-gdefe906/nptl/sysdeps/unix/sysv/linux/i386/smp.h -+++ glibc-2.14.90-2/nptl/sysdeps/unix/sysv/linux/i386/smp.h +--- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/i386/smp.h ++++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/i386/smp.h @@ -37,7 +37,7 @@ is_smp_system (void) char *cp; @@ -3059,8 +2848,8 @@ cp = u.uts.version; else { ---- glibc-2.14-101-gdefe906/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.14.90-2/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -3068,8 +2857,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.14-101-gdefe906/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S -+++ glibc-2.14.90-2/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S +--- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S ++++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S @@ -22,6 +22,8 @@ #include #include @@ -3099,8 +2888,8 @@ syscall 2: movl %edx, %eax ---- glibc-2.14-101-gdefe906/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h -+++ glibc-2.14.90-2/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h +--- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h ++++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H #define _LOWLEVELLOCK_H 1 @@ -3118,8 +2907,8 @@ __asm __volatile ("syscall" \ : "=a" (__ignore) \ : "0" (SYS_futex), "D" (futex), \ ---- glibc-2.14-101-gdefe906/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S -+++ glibc-2.14.90-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S +--- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S ++++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S @@ -25,7 +25,7 @@ #include #include @@ -3138,8 +2927,8 @@ /* Get internal lock. */ movl $1, %esi xorl %eax, %eax ---- glibc-2.14-101-gdefe906/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S -+++ glibc-2.14.90-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S +--- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S ++++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S @@ -24,6 +24,7 @@ #include #include @@ -3157,8 +2946,8 @@ /* Get internal lock. */ movq %rdi, %r8 movl $1, %esi ---- glibc-2.14-101-gdefe906/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S -+++ glibc-2.14.90-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S +--- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S ++++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S @@ -23,6 +23,7 @@ #include #include @@ -3176,8 +2965,8 @@ cmpq $1000000000, 8(%rdx) movl $EINVAL, %eax jae 48f ---- glibc-2.14-101-gdefe906/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S -+++ glibc-2.14.90-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S +--- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S ++++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S @@ -23,6 +23,7 @@ #include #include @@ -3195,8 +2984,8 @@ cmpq $-1, dep_mutex(%rdi) /* Prepare structure passed to cancellation handler. */ ---- glibc-2.14-101-gdefe906/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S -+++ glibc-2.14.90-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S +--- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S ++++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S @@ -22,7 +22,7 @@ #include #include @@ -3216,8 +3005,8 @@ xorq %r10, %r10 /* Get the lock. */ ---- glibc-2.14-101-gdefe906/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S -+++ glibc-2.14.90-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S +--- glibc-2.14-121-g5551a7b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S ++++ glibc-2.14.90-3/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S @@ -22,7 +22,7 @@ #include #include @@ -3237,8 +3026,8 @@ xorq %r10, %r10 /* Get the lock. */ ---- glibc-2.14-101-gdefe906/nscd/nscd.conf -+++ glibc-2.14.90-2/nscd/nscd.conf +--- glibc-2.14-121-g5551a7b/nscd/nscd.conf ++++ glibc-2.14.90-3/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -3248,8 +3037,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.14-101-gdefe906/nscd/nscd.init -+++ glibc-2.14.90-2/nscd/nscd.init +--- glibc-2.14-121-g5551a7b/nscd/nscd.init ++++ glibc-2.14.90-3/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -3326,8 +3115,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.14-101-gdefe906/nss/Makefile -+++ glibc-2.14.90-2/nss/Makefile +--- glibc-2.14-121-g5551a7b/nss/Makefile ++++ glibc-2.14.90-3/nss/Makefile @@ -88,6 +88,7 @@ endif include ../Rules @@ -3336,8 +3125,8 @@ ifeq (yes,$(build-static-nss)) $(objpfx)getent: $(objpfx)libnss_files.a ---- glibc-2.14-101-gdefe906/nss/nss_files/files-XXX.c -+++ glibc-2.14.90-2/nss/nss_files/files-XXX.c +--- glibc-2.14-121-g5551a7b/nss/nss_files/files-XXX.c ++++ glibc-2.14.90-3/nss/nss_files/files-XXX.c @@ -190,7 +190,7 @@ internal_getent (struct STRUCTURE *result, { char *p; @@ -3347,8 +3136,8 @@ int parse_result; if (buflen < sizeof *data + 2) ---- glibc-2.14-101-gdefe906/posix/Makefile -+++ glibc-2.14.90-2/posix/Makefile +--- glibc-2.14-121-g5551a7b/posix/Makefile ++++ glibc-2.14.90-3/posix/Makefile @@ -325,15 +325,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -3369,8 +3158,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.14-101-gdefe906/posix/gai.conf -+++ glibc-2.14.90-2/posix/gai.conf +--- glibc-2.14-121-g5551a7b/posix/gai.conf ++++ glibc-2.14.90-3/posix/gai.conf @@ -41,7 +41,7 @@ # # precedence @@ -3395,8 +3184,8 @@ #scopev4 ::ffff:0.0.0.0/96 14 +# +# This is what the Red Hat setting currently uses. ---- glibc-2.14-101-gdefe906/posix/getconf.speclist.h -+++ glibc-2.14.90-2/posix/getconf.speclist.h +--- glibc-2.14-121-g5551a7b/posix/getconf.speclist.h ++++ glibc-2.14.90-3/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -3437,8 +3226,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.14-101-gdefe906/posix/regcomp.c -+++ glibc-2.14.90-2/posix/regcomp.c +--- glibc-2.14-121-g5551a7b/posix/regcomp.c ++++ glibc-2.14.90-3/posix/regcomp.c @@ -2745,40 +2745,29 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, /* Local function for parse_bracket_exp used in _LIBC environement. @@ -3570,8 +3359,8 @@ { /* No valid character, treat it as a normal character. */ ---- glibc-2.14-101-gdefe906/resolv/Makefile -+++ glibc-2.14.90-2/resolv/Makefile +--- glibc-2.14-121-g5551a7b/resolv/Makefile ++++ glibc-2.14.90-3/resolv/Makefile @@ -77,6 +77,7 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \ -Dgetnetbyaddr=res_getnetbyaddr @@ -3580,8 +3369,8 @@ # The BIND code elicits some harmless warnings. +cflags += -Wno-strict-prototypes -Wno-write-strings ---- glibc-2.14-101-gdefe906/resource/getrlimit.c -+++ glibc-2.14.90-2/resource/getrlimit.c +--- glibc-2.14-121-g5551a7b/resource/getrlimit.c ++++ glibc-2.14.90-3/resource/getrlimit.c @@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) __set_errno (ENOSYS); return -1; @@ -3590,8 +3379,8 @@ weak_alias (__getrlimit, getrlimit) stub_warning (getrlimit) ---- glibc-2.14-101-gdefe906/scripts/check-local-headers.sh -+++ glibc-2.14.90-2/scripts/check-local-headers.sh +--- glibc-2.14-121-g5551a7b/scripts/check-local-headers.sh ++++ glibc-2.14.90-3/scripts/check-local-headers.sh @@ -29,7 +29,7 @@ exec ${AWK} -v includedir="$includedir" ' BEGIN { status = 0 @@ -3601,8 +3390,8 @@ } /^[^ ]/ && $1 ~ /.*:/ { obj = $1 } { ---- glibc-2.14-101-gdefe906/stdio-common/vfprintf.c -+++ glibc-2.14.90-2/stdio-common/vfprintf.c +--- glibc-2.14-121-g5551a7b/stdio-common/vfprintf.c ++++ glibc-2.14.90-3/stdio-common/vfprintf.c @@ -1161,41 +1161,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) else if (!is_long && spec != L_('S')) \ { \ @@ -3648,8 +3437,8 @@ else \ len = strlen (string); \ } \ ---- glibc-2.14-101-gdefe906/streams/Makefile -+++ glibc-2.14.90-2/streams/Makefile +--- glibc-2.14-121-g5551a7b/streams/Makefile ++++ glibc-2.14.90-3/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -3659,8 +3448,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.14-101-gdefe906/sunrpc/Makefile -+++ glibc-2.14.90-2/sunrpc/Makefile +--- glibc-2.14-121-g5551a7b/sunrpc/Makefile ++++ glibc-2.14.90-3/sunrpc/Makefile @@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ des_crypt.h) headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \ @@ -3681,8 +3470,8 @@ $(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-101-gdefe906/sysdeps/generic/dl-cache.h -+++ glibc-2.14.90-2/sysdeps/generic/dl-cache.h +--- glibc-2.14-121-g5551a7b/sysdeps/generic/dl-cache.h ++++ glibc-2.14.90-3/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -3698,8 +3487,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.14-101-gdefe906/sysdeps/i386/Makefile -+++ glibc-2.14.90-2/sysdeps/i386/Makefile +--- glibc-2.14-121-g5551a7b/sysdeps/i386/Makefile ++++ glibc-2.14.90-3/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -3709,7 +3498,7 @@ # The i386 `long double' is a distinct type we support. long-double-fcts = yes -@@ -65,6 +67,14 @@ endif +@@ -68,6 +70,14 @@ endif ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS))) defines += -DNO_TLS_DIRECT_SEG_REFS @@ -3724,8 +3513,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.14-101-gdefe906/sysdeps/i386/__longjmp.S -+++ glibc-2.14.90-2/sysdeps/i386/__longjmp.S +--- glibc-2.14-121-g5551a7b/sysdeps/i386/__longjmp.S ++++ glibc-2.14.90-3/sysdeps/i386/__longjmp.S @@ -1,5 +1,5 @@ /* longjmp for i386. - Copyright (C) 1995-1998,2000,2002,2005,2006,2009 @@ -3772,8 +3561,8 @@ #endif /* Jump to saved PC. */ jmp *%edx ---- glibc-2.14-101-gdefe906/sysdeps/i386/bsd-_setjmp.S -+++ glibc-2.14.90-2/sysdeps/i386/bsd-_setjmp.S +--- glibc-2.14-121-g5551a7b/sysdeps/i386/bsd-_setjmp.S ++++ glibc-2.14.90-3/sysdeps/i386/bsd-_setjmp.S @@ -1,5 +1,6 @@ /* BSD `_setjmp' entry point to `sigsetjmp (..., 0)'. i386 version. - Copyright (C) 1994-1997,2000-2002,2005, 2006 Free Software Foundation, Inc. @@ -3798,8 +3587,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-101-gdefe906/sysdeps/i386/bsd-setjmp.S -+++ glibc-2.14.90-2/sysdeps/i386/bsd-setjmp.S +--- glibc-2.14-121-g5551a7b/sysdeps/i386/bsd-setjmp.S ++++ glibc-2.14.90-3/sysdeps/i386/bsd-setjmp.S @@ -1,5 +1,6 @@ /* BSD `setjmp' entry point to `sigsetjmp (..., 1)'. i386 version. - Copyright (C) 1994-1997,2000,2001,2005, 2006 Free Software Foundation, Inc. @@ -3824,8 +3613,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-101-gdefe906/sysdeps/i386/i686/Makefile -+++ glibc-2.14.90-2/sysdeps/i386/i686/Makefile +--- glibc-2.14-121-g5551a7b/sysdeps/i386/i686/Makefile ++++ glibc-2.14.90-3/sysdeps/i386/i686/Makefile @@ -9,19 +9,3 @@ stack-align-test-flags += -msse ifeq ($(subdir),string) sysdep_routines += cacheinfo @@ -3846,8 +3635,8 @@ -ASFLAGS-.ob += -Wa,-mtune=i686 -ASFLAGS-.oS += -Wa,-mtune=i686 -endif ---- glibc-2.14-101-gdefe906/sysdeps/i386/i686/multiarch/strspn.S -+++ glibc-2.14.90-2/sysdeps/i386/i686/multiarch/strspn.S +--- glibc-2.14-121-g5551a7b/sysdeps/i386/i686/multiarch/strspn.S ++++ glibc-2.14.90-3/sysdeps/i386/i686/multiarch/strspn.S @@ -76,8 +76,8 @@ END(strspn) # define ENTRY(name) \ .type __strspn_ia32, @function; \ @@ -3859,8 +3648,8 @@ CALL_MCOUNT # undef END # define END(name) \ ---- glibc-2.14-101-gdefe906/sysdeps/i386/setjmp.S -+++ glibc-2.14.90-2/sysdeps/i386/setjmp.S +--- glibc-2.14-121-g5551a7b/sysdeps/i386/setjmp.S ++++ glibc-2.14.90-3/sysdeps/i386/setjmp.S @@ -1,5 +1,5 @@ /* setjmp for i386. - Copyright (C) 1995,1996,1997,2000,2001,2005,2006 @@ -3884,8 +3673,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14-101-gdefe906/sysdeps/ia64/Makefile -+++ glibc-2.14.90-2/sysdeps/ia64/Makefile +--- glibc-2.14-121-g5551a7b/sysdeps/ia64/Makefile ++++ glibc-2.14.90-3/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -3897,8 +3686,8 @@ endif endif ---- glibc-2.14-101-gdefe906/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.14.90-2/sysdeps/ia64/ia64libgcc.S +--- glibc-2.14-121-g5551a7b/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.14.90-3/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -4250,8 +4039,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.14-101-gdefe906/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.14.90-2/sysdeps/ia64/libgcc-compat.c +--- glibc-2.14-121-g5551a7b/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.14.90-3/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -4337,16 +4126,16 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.14-101-gdefe906/sysdeps/mach/hurd/getrlimit.c -+++ glibc-2.14.90-2/sysdeps/mach/hurd/getrlimit.c +--- glibc-2.14-121-g5551a7b/sysdeps/mach/hurd/getrlimit.c ++++ glibc-2.14.90-3/sysdeps/mach/hurd/getrlimit.c @@ -44,4 +44,5 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) return 0; } +libc_hidden_def (__getrlimit) weak_alias (__getrlimit, getrlimit) ---- glibc-2.14-101-gdefe906/sysdeps/posix/getaddrinfo.c -+++ glibc-2.14.90-2/sysdeps/posix/getaddrinfo.c +--- glibc-2.14-121-g5551a7b/sysdeps/posix/getaddrinfo.c ++++ glibc-2.14.90-3/sysdeps/posix/getaddrinfo.c @@ -562,8 +562,8 @@ gaih_inet (const char *name, const struct gaih_service *service, /* If we do not have to look for IPv6 addresses, use @@ -4471,8 +4260,25 @@ /* Default: scope 14. */ { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 } }; ---- glibc-2.14-101-gdefe906/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.14.90-2/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.14-121-g5551a7b/sysdeps/powerpc/dl-tls.h ++++ glibc-2.14.90-3/sysdeps/powerpc/dl-tls.h +@@ -17,6 +17,8 @@ + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + ++#ifndef _PPC_DL_TLS_H ++# define _PPC_DL_TLS_H 1 + + /* Type used for the representation of TLS information in the TOC. */ + typedef struct +@@ -50,3 +52,5 @@ extern void *__tls_get_addr (tls_index *ti); + + /* Value used for dtv entries for which the allocation is delayed. */ + #define TLS_DTV_UNALLOCATED ((void *) -1l) ++ ++#endif /* dl-tls.h */ +--- glibc-2.14-121-g5551a7b/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.14.90-3/sysdeps/powerpc/powerpc64/Makefile @@ -33,6 +33,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -4481,16 +4287,37 @@ endif ifeq ($(subdir),elf) ---- glibc-2.14-101-gdefe906/sysdeps/powerpc/powerpc64/elf/Makefile -+++ glibc-2.14.90-2/sysdeps/powerpc/powerpc64/elf/Makefile +--- glibc-2.14-121-g5551a7b/sysdeps/powerpc/powerpc64/dl-irel.h ++++ glibc-2.14.90-3/sysdeps/powerpc/powerpc64/dl-irel.h +@@ -23,16 +23,11 @@ + + #include + #include ++#include ++#include + + #define ELF_MACHINE_IRELA 1 + +-typedef struct +-{ +- Elf64_Addr fd_func; +- Elf64_Addr fd_toc; +- Elf64_Addr fd_aux; +-} Elf64_FuncDesc; +- + static inline Elf64_Addr + __attribute ((always_inline)) + elf_ifunc_invoke (Elf64_Addr addr) +--- glibc-2.14-121-g5551a7b/sysdeps/powerpc/powerpc64/elf/Makefile ++++ glibc-2.14.90-3/sysdeps/powerpc/powerpc64/elf/Makefile @@ -9,3 +9,5 @@ CFLAGS-rtld-mempcpy.os = $(no-special-regs) CFLAGS-rtld-memmove.os = $(no-special-regs) CFLAGS-rtld-memchr.os = $(no-special-regs) CFLAGS-rtld-strnlen.os = $(no-special-regs) + +CFLAGS-gmon-start.c = -fno-strict-aliasing ---- glibc-2.14-101-gdefe906/sysdeps/s390/s390-64/utf16-utf32-z9.c -+++ glibc-2.14.90-2/sysdeps/s390/s390-64/utf16-utf32-z9.c +--- glibc-2.14-121-g5551a7b/sysdeps/s390/s390-64/utf16-utf32-z9.c ++++ glibc-2.14.90-3/sysdeps/s390/s390-64/utf16-utf32-z9.c @@ -169,10 +169,7 @@ gconv_end (struct __gconv_step *data) register unsigned long long outlen asm("11") = outend - outptr; \ uint64_t cc = 0; \ @@ -4503,8 +4330,8 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-101-gdefe906/sysdeps/s390/s390-64/utf8-utf16-z9.c -+++ glibc-2.14.90-2/sysdeps/s390/s390-64/utf8-utf16-z9.c +--- glibc-2.14-121-g5551a7b/sysdeps/s390/s390-64/utf8-utf16-z9.c ++++ glibc-2.14.90-3/sysdeps/s390/s390-64/utf8-utf16-z9.c @@ -151,10 +151,7 @@ gconv_end (struct __gconv_step *data) register unsigned long long outlen asm("11") = outend - outptr; \ uint64_t cc = 0; \ @@ -4517,8 +4344,8 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-101-gdefe906/sysdeps/s390/s390-64/utf8-utf32-z9.c -+++ glibc-2.14.90-2/sysdeps/s390/s390-64/utf8-utf32-z9.c +--- glibc-2.14-121-g5551a7b/sysdeps/s390/s390-64/utf8-utf32-z9.c ++++ glibc-2.14.90-3/sysdeps/s390/s390-64/utf8-utf32-z9.c @@ -155,10 +155,7 @@ gconv_end (struct __gconv_step *data) register unsigned long long outlen asm("11") = outend - outptr; \ uint64_t cc = 0; \ @@ -4531,8 +4358,8 @@ " jo 0b \n\t" \ " ipm %2 \n" \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ ---- glibc-2.14-101-gdefe906/sysdeps/unix/nice.c -+++ glibc-2.14.90-2/sysdeps/unix/nice.c +--- glibc-2.14-121-g5551a7b/sysdeps/unix/nice.c ++++ glibc-2.14.90-3/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -4547,8 +4374,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.14-101-gdefe906/sysdeps/unix/sysv/linux/check_pf.c -+++ glibc-2.14.90-2/sysdeps/unix/sysv/linux/check_pf.c +--- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/check_pf.c ++++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include #include @@ -4564,8 +4391,8 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-2.14-101-gdefe906/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.14.90-2/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -4608,8 +4435,8 @@ { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) ---- glibc-2.14-101-gdefe906/sysdeps/unix/sysv/linux/getpagesize.c -+++ glibc-2.14.90-2/sysdeps/unix/sysv/linux/getpagesize.c +--- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/getpagesize.c ++++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/getpagesize.c @@ -28,7 +28,7 @@ int __getpagesize () @@ -4619,8 +4446,8 @@ assert (GLRO(dl_pagesize) != 0); return GLRO(dl_pagesize); #else ---- glibc-2.14-101-gdefe906/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S -+++ glibc-2.14.90-2/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S +--- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S ++++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S @@ -1,4 +1,5 @@ -/* Copyright (C) 2001,2004,2005,2006,2009 Free Software Foundation, Inc. +/* Copyright (C) 2001,2004,2005,2006,2009,2011 @@ -4654,8 +4481,8 @@ + LIBC_PROBE (longjmp_target, 3, 4@%ecx, -4@%eax, 4@%edx) jmp *%edx END (____longjmp_chk) ---- glibc-2.14-101-gdefe906/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ glibc-2.14.90-2/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/i386/dl-cache.h @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -4716,16 +4543,16 @@ + } while (0) + +#include_next ---- glibc-2.14-101-gdefe906/sysdeps/unix/sysv/linux/i386/getrlimit.c -+++ glibc-2.14.90-2/sysdeps/unix/sysv/linux/i386/getrlimit.c +--- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/i386/getrlimit.c ++++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/i386/getrlimit.c @@ -79,4 +79,5 @@ __new_getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) } weak_alias (__new_getrlimit, __getrlimit); +libc_hidden_weak (__getrlimit) versioned_symbol (libc, __new_getrlimit, getrlimit, GLIBC_2_2); ---- glibc-2.14-101-gdefe906/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ glibc-2.14.90-2/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -4758,29 +4585,29 @@ + } while (0) + #include_next ---- glibc-2.14-101-gdefe906/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ glibc-2.14.90-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.14-101-gdefe906/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ glibc-2.14.90-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.14-101-gdefe906/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ glibc-2.14.90-2/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ ---- glibc-2.14-101-gdefe906/sysdeps/unix/sysv/linux/netlinkaccess.h -+++ glibc-2.14.90-2/sysdeps/unix/sysv/linux/netlinkaccess.h +--- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/netlinkaccess.h ++++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ #include @@ -4806,8 +4633,18 @@ struct netlink_res { ---- glibc-2.14-101-gdefe906/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.14.90-2/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/pathconf.c ++++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/pathconf.c +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include + #include + +--- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -4817,8 +4654,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.14-101-gdefe906/sysdeps/unix/sysv/linux/tcsetattr.c -+++ glibc-2.14.90-2/sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -4864,8 +4701,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.14-101-gdefe906/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S -+++ glibc-2.14.90-2/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S +--- glibc-2.14-121-g5551a7b/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S ++++ glibc-2.14.90-3/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S @@ -19,6 +19,7 @@ #include #include @@ -4892,8 +4729,8 @@ + LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx) jmpq *%rdx END (____longjmp_chk) ---- glibc-2.14-101-gdefe906/sysdeps/x86_64/__longjmp.S -+++ glibc-2.14.90-2/sysdeps/x86_64/__longjmp.S +--- glibc-2.14-121-g5551a7b/sysdeps/x86_64/__longjmp.S ++++ glibc-2.14.90-3/sysdeps/x86_64/__longjmp.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2001,2004,2005,2006,2009 Free Software Foundation, Inc. +/* Copyright (C) 2001,2004,2005,2006,2009,2011 Free Software Foundation, Inc. @@ -4923,8 +4760,8 @@ + LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx) jmpq *%rdx END (__longjmp) ---- glibc-2.14-101-gdefe906/sysdeps/x86_64/setjmp.S -+++ glibc-2.14.90-2/sysdeps/x86_64/setjmp.S +--- glibc-2.14-121-g5551a7b/sysdeps/x86_64/setjmp.S ++++ glibc-2.14.90-3/sysdeps/x86_64/setjmp.S @@ -1,5 +1,5 @@ /* setjmp for x86-64. - Copyright (C) 2001, 2003, 2005, 2006 Free Software Foundation, Inc. @@ -4948,8 +4785,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%rax) #endif ---- glibc-2.14-101-gdefe906/timezone/zic.c -+++ glibc-2.14.90-2/timezone/zic.c +--- glibc-2.14-121-g5551a7b/timezone/zic.c ++++ glibc-2.14.90-3/timezone/zic.c @@ -1921,7 +1921,7 @@ const int zonecount; if (stdrp != NULL && stdrp->r_hiyear == 2037) return; diff --git a/glibc.spec b/glibc.spec index 3d92d72..a3c921e 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,4 +1,4 @@ -%define glibcsrcdir glibc-2.14-101-gdefe906 +%define glibcsrcdir glibc-2.14-121-g5551a7b %define glibcversion 2.14.90 %define glibcportsdir glibc-ports-2.14-3-ge5cd24d ### glibc.spec.in follows: @@ -28,7 +28,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 2 +Release: 3 # 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 @@ -64,10 +64,9 @@ BuildRequires: systemtap-sdt-devel BuildRequires: gcc >= 3.2 %define enablekernel 2.6.32 Conflicts: kernel < %{enablekernel} -%ifarch i386 -%define nptl_target_cpu i486 -%else -%define nptl_target_cpu %{_target_cpu} +%define target %{_target_cpu}-redhat-linux +%ifarch %{arm} +%define target %{_target_cpu}-redhat-linuxeabi %endif %ifarch %{multiarcharches} # Need STT_IFUNC support @@ -285,7 +284,7 @@ touch locale/programs/*-kw.h GCC=gcc GXX=g++ %ifarch %{ix86} -BuildFlags="-march=%{nptl_target_cpu} -mtune=generic" +BuildFlags="-march=%{_target_cpu} -mtune=generic" %endif %ifarch i686 BuildFlags="-march=i686 -mtune=generic" @@ -345,10 +344,10 @@ AddOns=`echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkai AddOns=,rtkaio$AddOns %endif -build_nptl() +build() { -builddir=build-%{nptl_target_cpu}-$1 -shift +builddir=build-%{target}${1:+-$1} +${1+shift} rm -rf $builddir mkdir $builddir ; cd $builddir build_CFLAGS="$BuildFlags -g -O3 $*" @@ -359,8 +358,7 @@ configure_CFLAGS="$build_CFLAGS -fno-asynchronous-unwind-tables" --prefix=%{_prefix} \ --enable-add-ons=../%{glibcportsdir},nptl$AddOns \ --with-headers=%{_prefix}/include $EnableKernel --enable-bind-now \ - --with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \ - --host %{nptl_target_cpu}-redhat-linux \ + --with-tls --with-__thread --build=%{target} \ %ifarch %{multiarcharches} --enable-multi-arch \ %endif @@ -375,10 +373,10 @@ make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" %{silentrules} cd .. } -build_nptl linuxnptl +build %if %{buildxen} -build_nptl linuxnptl-nosegneg -mno-tls-direct-seg-refs +build nosegneg -mno-tls-direct-seg-refs %endif %if %{buildpower6} @@ -398,11 +396,11 @@ fi AddOns="$AddOns --with-cpu=power6" GCC="$GCC -mcpu=power6" GXX="$GXX -mcpu=power6" -build_nptl linuxnptl-power6 +build power6 ) %endif -cd build-%{nptl_target_cpu}-linuxnptl +cd build-%{target} $GCC -static -L. -Os -g ../fedora/glibc_post_upgrade.c -o glibc_post_upgrade.%{_target_cpu} \ '-DLIBTLS="/%{_lib}/tls/"' \ '-DGCONV_MODULES_DIR="%{_prefix}/%{_lib}/gconv"' \ @@ -415,9 +413,9 @@ GCC=`cat Gcc` rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT -make -j1 install_root=$RPM_BUILD_ROOT install -C build-%{nptl_target_cpu}-linuxnptl %{silentrules} +make -j1 install_root=$RPM_BUILD_ROOT install -C build-%{target} %{silentrules} %ifnarch %{auxarches} -cd build-%{nptl_target_cpu}-linuxnptl && \ +cd build-%{target} && \ make %{?_smp_mflags} install_root=$RPM_BUILD_ROOT install-locales -C ../localedata objdir=`pwd` && \ cd .. %endif @@ -438,7 +436,7 @@ ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/rtkaio/librtkaio-*.so` $RPM_BUILD_ROOT/ %define nosegneg_subdir_base i686 %define nosegneg_subdir i686/nosegneg %define nosegneg_subdir_up ../.. -cd build-%{nptl_target_cpu}-linuxnptl-nosegneg +cd build-%{target}-nosegneg destdir=$RPM_BUILD_ROOT/%{_lib}/%{nosegneg_subdir} mkdir -p $destdir for lib in libc math/libm nptl/libpthread rt/librt nptl_db/libthread_db @@ -446,7 +444,7 @@ do libbase=${lib#*/} libbaseso=$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}-*.so) # Only install if different from base lib - if cmp -s ${lib}.so ../build-%{nptl_target_cpu}-linuxnptl/${lib}.so; then + if cmp -s ${lib}.so ../build-%{target}/${lib}.so; then ln -sf %{nosegneg_subdir_up}/$libbaseso $destdir/$libbaseso else cp -a ${lib}.so $destdir/$libbaseso @@ -457,7 +455,7 @@ done destdir=$RPM_BUILD_ROOT/%{_lib}/rtkaio/%{nosegneg_subdir} mkdir -p $destdir librtkaioso=$(basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/) -if cmp -s rtkaio/librtkaio.so ../build-%{nptl_target_cpu}-linuxnptl/rtkaio/librtkaio.so; then +if cmp -s rtkaio/librtkaio.so ../build-%{target}/rtkaio/librtkaio.so; then ln -s %{nosegneg_subdir_up}/$librtkaioso $destdir/$librtkaioso else cp -a rtkaio/librtkaio.so $destdir/$librtkaioso @@ -468,7 +466,7 @@ cd .. %endif %if %{buildpower6} -cd build-%{nptl_target_cpu}-linuxnptl-power6 +cd build-%{target}-power6 destdir=$RPM_BUILD_ROOT/%{_lib}/power6 mkdir -p ${destdir} for lib in libc math/libm nptl/libpthread rt/librt nptl_db/libthread_db @@ -550,7 +548,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/sysconfig chmod 644 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gconv/gconv-modules.cache # Install the upgrade program -install -m 700 build-%{nptl_target_cpu}-linuxnptl/glibc_post_upgrade.%{_target_cpu} \ +install -m 700 build-%{target}/glibc_post_upgrade.%{_target_cpu} \ $RPM_BUILD_ROOT/usr/sbin/glibc_post_upgrade.%{_target_cpu} strip -g $RPM_BUILD_ROOT%{_prefix}/%{_lib}/*.o @@ -572,9 +570,9 @@ pushd ${RPM_BUILD_ROOT}%{_prefix}/lib/locale rm locale-archive || : # Intentionally we do not pass --alias-file=, aliases will be added # by build-locale-archive. -$olddir/build-%{nptl_target_cpu}-linuxnptl/elf/ld.so \ - --library-path $olddir/build-%{nptl_target_cpu}-linuxnptl/ \ - $olddir/build-%{nptl_target_cpu}-linuxnptl/locale/localedef \ +$olddir/build-%{target}/elf/ld.so \ + --library-path $olddir/build-%{target}/ \ + $olddir/build-%{target}/locale/localedef \ --prefix ${RPM_BUILD_ROOT} --add-to-archive \ *_* rm -rf *_* @@ -702,15 +700,15 @@ touch -r sunrpc/etc.rpc $RPM_BUILD_ROOT/etc/rpc cd fedora $GCC -Os -g -o build-locale-archive build-locale-archive.c \ - ../build-%{nptl_target_cpu}-linuxnptl/locale/locarchive.o \ - ../build-%{nptl_target_cpu}-linuxnptl/locale/md5.o \ + ../build-%{target}/locale/locarchive.o \ + ../build-%{target}/locale/md5.o \ -DDATADIR=\"%{_datadir}\" -DPREFIX=\"%{_prefix}\" \ - -L../build-%{nptl_target_cpu}-linuxnptl \ - -B../build-%{nptl_target_cpu}-linuxnptl/csu/ -lc -lc_nonshared + -L../build-%{target} \ + -B../build-%{target}/csu/ -lc -lc_nonshared install -m 700 build-locale-archive $RPM_BUILD_ROOT/usr/sbin/build-locale-archive $GCC -Os -g -o tzdata-update tzdata-update.c \ - -L../build-%{nptl_target_cpu}-linuxnptl \ - -B../build-%{nptl_target_cpu}-linuxnptl/csu/ -lc -lc_nonshared + -L../build-%{target} \ + -B../build-%{target}/csu/ -lc -lc_nonshared install -m 700 tzdata-update $RPM_BUILD_ROOT/usr/sbin/tzdata-update cd .. @@ -742,7 +740,7 @@ ln -sf /%{_lib}/ld-linux-ia64.so.2 $RPM_BUILD_ROOT/lib/ld-linux-ia64.so.2 export TIMEOUTFACTOR=16 parent=$$ echo ====================TESTING========================= -cd build-%{nptl_target_cpu}-linuxnptl +cd build-%{target} ( make %{?_smp_mflags} -k check %{silentrules} 2>&1 sleep 10s teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`" @@ -751,7 +749,7 @@ cd build-%{nptl_target_cpu}-linuxnptl cd .. %if %{buildxen} echo ====================TESTING -mno-tls-direct-seg-refs============= -cd build-%{nptl_target_cpu}-linuxnptl-nosegneg +cd build-%{target}-nosegneg ( make %{?_smp_mflags} -k check %{silentrules} 2>&1 sleep 10s teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`" @@ -761,7 +759,7 @@ cd .. %endif %if %{buildpower6} echo ====================TESTING -mcpu=power6============= -cd build-%{nptl_target_cpu}-linuxnptl-power6 +cd build-%{target}-power6 ( if [ -d ../power6emul ]; then export LD_PRELOAD=`cd ../power6emul; pwd`/\$LIB/power6emul.so fi @@ -1081,6 +1079,15 @@ rm -f *.filelist* %endif %changelog +* Wed Jul 20 2011 Andreas Schwab - 2.14.90-3 +- Update from master + - S/390: Don't use r11 in INTERNAL_VSYSCALL_NCS macro + - Avoid warning in nscd config file parsing code + - Improve 64 bit strcat functions with SSE2/SSSE3 + - Fix alloca accounting in strxfrm + - Avoid possible crashes in anormal nscd exits + - Updated Swedish and Dutch translations + * Thu Jul 14 2011 Andreas Schwab - 2.14.90-2 - Update from master - Generalize framework to register monitoring of files in nscd diff --git a/sources b/sources index 65e529f..f4388d2 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -9fd4de2a029035c7a38bcf87f9e40fe8 glibc-2.14-101-gdefe906-fedora.tar.xz -e25b8839d90879597e1fc9ca6b141099 glibc-2.14-101-gdefe906.tar.xz +cf35ba5c4f96868e2307ec80cf449d35 glibc-2.14-121-g5551a7b-fedora.tar.xz +0021ec019a82b738e02c1c31b76fdfd5 glibc-2.14-121-g5551a7b.tar.xz e7ea1c6c9428ed5c2473d38092f28762 glibc-ports-2.14-3-ge5cd24d.tar.xz