From ba877c94453daa7287f660a051b435918f4de62c Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mar 09 2010 15:26:08 +0000 Subject: 2.11.90-15 --- diff --git a/.cvsignore b/.cvsignore index 3c53494..fd97ece 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-2.11-222-ge2f4aa5-fedora.tar.bz2 -glibc-2.11-222-ge2f4aa5.tar.bz2 +glibc-2.11-255-g462a522-fedora.tar.bz2 +glibc-2.11-255-g462a522.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 7c1cddd..7504d18 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,32 +1,9 @@ ---- glibc-2.11-222-ge2f4aa5/ChangeLog -+++ glibc-2.11.90-14/ChangeLog -@@ -30,6 +30,11 @@ - * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_runtime_setup): - Adjust rela->r_offset by l->l_addr when rewriting PLT. - -+2010-02-21 H.J. Lu -+ -+ * sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S: Properly -+ decrement ECX when jumping to copy_page_by_rep. -+ - 2010-02-19 Carl Fredrik Hammar - - * hurd/hurdioctl.c (tiocsctty): Call `do_tiocsctty' instead of -@@ -211,6 +216,30 @@ +--- glibc-2.11-255-g462a522/ChangeLog ++++ glibc-2.11.90-15/ChangeLog +@@ -405,6 +405,19 @@ * sysdeps/x86_64/fpu/fegetenv.c: Likewise * sysdeps/s390/fpu/fegetenv.c: Likewise. Remove unused headers. -+2010-02-12 H.J. Lu -+ -+ * sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S: Use unsigned -+ conditional jumps. -+ (shl_0_gobble_cache_loop_tail): Removed. -+ * sysdeps/i386/i686/multiarch/memcpy-ssse3.S: Likewise. -+ -+ * sysdeps/i386/i686/multiarch/memset-sse2-rep.S: Use unsigned -+ conditional jumps. -+ * sysdeps/i386/i686/multiarch/memset-sse2.S: Likewise. -+ +2009-10-27 Aurelien Jarno + + [BZ #10855] @@ -43,7 +20,7 @@ 2010-02-05 H.J. Lu [BZ #11230] -@@ -2153,6 +2182,11 @@ d2009-10-30 Ulrich Drepper +@@ -2347,6 +2360,11 @@ d2009-10-30 Ulrich Drepper * sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in the unique symbol hash table should not be const. @@ -55,7 +32,7 @@ 2009-07-21 Ulrich Drepper * sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove -@@ -2418,6 +2452,11 @@ d2009-10-30 Ulrich Drepper +@@ -2612,6 +2630,11 @@ d2009-10-30 Ulrich Drepper out common code into new function get_common_indeces. Determine extended family and model for Intel processors. @@ -67,7 +44,7 @@ 2009-06-26 Ulrich Drepper * resolv/resolv.h: Define RES_SNGLKUPREOP. -@@ -11111,6 +11150,10 @@ d2009-10-30 Ulrich Drepper +@@ -11305,6 +11328,10 @@ d2009-10-30 Ulrich Drepper [BZ #4368] * stdlib/stdlib.h: Remove obsolete part of comment for realpath. @@ -78,7 +55,7 @@ 2007-04-16 Ulrich Drepper [BZ #4364] -@@ -12368,6 +12411,15 @@ d2009-10-30 Ulrich Drepper +@@ -12562,6 +12589,15 @@ d2009-10-30 Ulrich Drepper separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. @@ -94,8 +71,8 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-2.11-222-ge2f4aa5/ChangeLog.15 -+++ glibc-2.11.90-14/ChangeLog.15 +--- glibc-2.11-255-g462a522/ChangeLog.15 ++++ glibc-2.11.90-15/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -161,8 +138,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.11-222-ge2f4aa5/ChangeLog.16 -+++ glibc-2.11.90-14/ChangeLog.16 +--- glibc-2.11-255-g462a522/ChangeLog.16 ++++ glibc-2.11.90-15/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -216,8 +193,8 @@ 2005-07-28 Thomas Schwinge [BZ #1137] ---- glibc-2.11-222-ge2f4aa5/Makeconfig -+++ glibc-2.11.90-14/Makeconfig +--- glibc-2.11-255-g462a522/Makeconfig ++++ glibc-2.11.90-15/Makeconfig @@ -780,12 +780,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -234,8 +211,8 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.11-222-ge2f4aa5/csu/Makefile -+++ glibc-2.11.90-14/csu/Makefile +--- glibc-2.11-255-g462a522/csu/Makefile ++++ glibc-2.11.90-15/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -246,8 +223,8 @@ vpath initfini.c $(sysdirs) ---- glibc-2.11-222-ge2f4aa5/csu/elf-init.c -+++ glibc-2.11.90-14/csu/elf-init.c +--- glibc-2.11-255-g462a522/csu/elf-init.c ++++ glibc-2.11.90-15/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; @@ -272,8 +249,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.11-222-ge2f4aa5/debug/tst-chk1.c -+++ glibc-2.11.90-14/debug/tst-chk1.c +--- glibc-2.11-255-g462a522/debug/tst-chk1.c ++++ glibc-2.11.90-15/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -302,8 +279,8 @@ # define O 0 # else # define O 1 ---- glibc-2.11-222-ge2f4aa5/elf/ldconfig.c -+++ glibc-2.11.90-14/elf/ldconfig.c +--- glibc-2.11-255-g462a522/elf/ldconfig.c ++++ glibc-2.11.90-15/elf/ldconfig.c @@ -1020,17 +1020,19 @@ search_dirs (void) @@ -385,8 +362,8 @@ } if (! opt_ignore_aux_cache) ---- glibc-2.11-222-ge2f4aa5/elf/tst-stackguard1.c -+++ glibc-2.11.90-14/elf/tst-stackguard1.c +--- glibc-2.11-255-g462a522/elf/tst-stackguard1.c ++++ glibc-2.11.90-15/elf/tst-stackguard1.c @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -411,16 +388,16 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.11-222-ge2f4aa5/include/bits/stdlib-ldbl.h -+++ glibc-2.11.90-14/include/bits/stdlib-ldbl.h +--- glibc-2.11-255-g462a522/include/bits/stdlib-ldbl.h ++++ glibc-2.11.90-15/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.11-222-ge2f4aa5/include/bits/wchar-ldbl.h -+++ glibc-2.11.90-14/include/bits/wchar-ldbl.h +--- glibc-2.11-255-g462a522/include/bits/wchar-ldbl.h ++++ glibc-2.11.90-15/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.11-222-ge2f4aa5/include/features.h -+++ glibc-2.11.90-14/include/features.h +--- glibc-2.11-255-g462a522/include/features.h ++++ glibc-2.11.90-15/include/features.h @@ -308,8 +308,13 @@ #endif @@ -437,8 +414,8 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.11-222-ge2f4aa5/intl/locale.alias -+++ glibc-2.11.90-14/intl/locale.alias +--- glibc-2.11-255-g462a522/intl/locale.alias ++++ glibc-2.11.90-15/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -448,8 +425,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.11-222-ge2f4aa5/libio/stdio.h -+++ glibc-2.11.90-14/libio/stdio.h +--- glibc-2.11-255-g462a522/libio/stdio.h ++++ glibc-2.11.90-15/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. */ @@ -463,8 +440,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.11-222-ge2f4aa5/locale/iso-4217.def -+++ glibc-2.11.90-14/locale/iso-4217.def +--- glibc-2.11-255-g462a522/locale/iso-4217.def ++++ glibc-2.11.90-15/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -556,8 +533,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.11-222-ge2f4aa5/locale/programs/locarchive.c -+++ glibc-2.11.90-14/locale/programs/locarchive.c +--- glibc-2.11-255-g462a522/locale/programs/locarchive.c ++++ glibc-2.11.90-15/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; @@ -616,8 +593,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.11-222-ge2f4aa5/localedata/Makefile -+++ glibc-2.11.90-14/localedata/Makefile +--- glibc-2.11-255-g462a522/localedata/Makefile ++++ glibc-2.11.90-15/localedata/Makefile @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -626,8 +603,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.11-222-ge2f4aa5/localedata/SUPPORTED -+++ glibc-2.11.90-14/localedata/SUPPORTED +--- glibc-2.11-255-g462a522/localedata/SUPPORTED ++++ glibc-2.11.90-15/localedata/SUPPORTED @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -669,8 +646,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-2.11-222-ge2f4aa5/localedata/locales/cy_GB -+++ glibc-2.11.90-14/localedata/locales/cy_GB +--- glibc-2.11-255-g462a522/localedata/locales/cy_GB ++++ glibc-2.11.90-15/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -685,8 +662,8 @@ END LC_TIME LC_MESSAGES ---- glibc-2.11-222-ge2f4aa5/localedata/locales/en_GB -+++ glibc-2.11.90-14/localedata/locales/en_GB +--- glibc-2.11-255-g462a522/localedata/locales/en_GB ++++ glibc-2.11.90-15/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -698,8 +675,8 @@ date_fmt "/ / " ---- glibc-2.11-222-ge2f4aa5/localedata/locales/no_NO -+++ glibc-2.11.90-14/localedata/locales/no_NO +--- glibc-2.11-255-g462a522/localedata/locales/no_NO ++++ glibc-2.11.90-15/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -770,8 +747,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.11-222-ge2f4aa5/localedata/locales/zh_TW -+++ glibc-2.11.90-14/localedata/locales/zh_TW +--- glibc-2.11-255-g462a522/localedata/locales/zh_TW ++++ glibc-2.11.90-15/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -799,8 +776,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.11-222-ge2f4aa5/malloc/mcheck.c -+++ glibc-2.11.90-14/malloc/mcheck.c +--- glibc-2.11-255-g462a522/malloc/mcheck.c ++++ glibc-2.11.90-15/malloc/mcheck.c @@ -24,9 +24,25 @@ # include # include @@ -876,8 +853,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.11-222-ge2f4aa5/manual/libc.texinfo -+++ glibc-2.11.90-14/manual/libc.texinfo +--- glibc-2.11-255-g462a522/manual/libc.texinfo ++++ glibc-2.11.90-15/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -887,8 +864,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.11-222-ge2f4aa5/misc/sys/cdefs.h -+++ glibc-2.11.90-14/misc/sys/cdefs.h +--- glibc-2.11-255-g462a522/misc/sys/cdefs.h ++++ glibc-2.11.90-15/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) @@ -932,17 +909,17 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.11-222-ge2f4aa5/nis/nss -+++ glibc-2.11.90-14/nis/nss +--- glibc-2.11-255-g462a522/nis/nss ++++ glibc-2.11.90-15/nis/nss @@ -25,4 +25,4 @@ # memory with every getXXent() call. Otherwise each getXXent() call # might result into a network communication with the server to get # the next entry. -#SETENT_BATCH_READ=TRUE +SETENT_BATCH_READ=TRUE ---- glibc-2.11-222-ge2f4aa5/nptl/ChangeLog -+++ glibc-2.11.90-14/nptl/ChangeLog -@@ -3834,6 +3834,15 @@ +--- glibc-2.11-255-g462a522/nptl/ChangeLog ++++ glibc-2.11.90-15/nptl/ChangeLog +@@ -3851,6 +3851,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -958,7 +935,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -4570,6 +4579,11 @@ +@@ -4587,6 +4596,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -970,7 +947,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -6644,6 +6658,11 @@ +@@ -6661,6 +6675,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -982,8 +959,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.11-222-ge2f4aa5/nptl/Makefile -+++ glibc-2.11.90-14/nptl/Makefile +--- glibc-2.11-255-g462a522/nptl/Makefile ++++ glibc-2.11.90-15/nptl/Makefile @@ -339,7 +339,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1016,8 +993,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.11-222-ge2f4aa5/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ glibc-2.11.90-14/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.11-255-g462a522/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.11.90-15/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 @@ -1026,8 +1003,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.11-222-ge2f4aa5/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.11.90-14/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.11-255-g462a522/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.11.90-15/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -1035,8 +1012,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.11-222-ge2f4aa5/nptl/tst-stackguard1.c -+++ glibc-2.11.90-14/nptl/tst-stackguard1.c +--- glibc-2.11-255-g462a522/nptl/tst-stackguard1.c ++++ glibc-2.11.90-15/nptl/tst-stackguard1.c @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1061,8 +1038,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.11-222-ge2f4aa5/nscd/nscd.conf -+++ glibc-2.11.90-14/nscd/nscd.conf +--- glibc-2.11-255-g462a522/nscd/nscd.conf ++++ glibc-2.11.90-15/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -1072,8 +1049,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.11-222-ge2f4aa5/nscd/nscd.init -+++ glibc-2.11.90-14/nscd/nscd.init +--- glibc-2.11-255-g462a522/nscd/nscd.init ++++ glibc-2.11.90-15/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1145,8 +1122,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.11-222-ge2f4aa5/posix/Makefile -+++ glibc-2.11.90-14/posix/Makefile +--- glibc-2.11-255-g462a522/posix/Makefile ++++ glibc-2.11.90-15/posix/Makefile @@ -303,15 +303,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1167,8 +1144,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.11-222-ge2f4aa5/posix/getconf.speclist.h -+++ glibc-2.11.90-14/posix/getconf.speclist.h +--- glibc-2.11-255-g462a522/posix/getconf.speclist.h ++++ glibc-2.11.90-15/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -1209,8 +1186,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.11-222-ge2f4aa5/streams/Makefile -+++ glibc-2.11.90-14/streams/Makefile +--- glibc-2.11-255-g462a522/streams/Makefile ++++ glibc-2.11.90-15/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -1220,8 +1197,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.11-222-ge2f4aa5/sysdeps/generic/dl-cache.h -+++ glibc-2.11.90-14/sysdeps/generic/dl-cache.h +--- glibc-2.11-255-g462a522/sysdeps/generic/dl-cache.h ++++ glibc-2.11.90-15/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1237,8 +1214,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.11-222-ge2f4aa5/sysdeps/i386/Makefile -+++ glibc-2.11.90-14/sysdeps/i386/Makefile +--- glibc-2.11-255-g462a522/sysdeps/i386/Makefile ++++ glibc-2.11.90-15/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -1263,729 +1240,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.11-222-ge2f4aa5/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S -+++ glibc-2.11.90-14/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S -@@ -128,7 +128,7 @@ ENTRY (MEMCPY) - jb L(copy_forward) - je L(fwd_write_0bytes) - cmp $32, %ecx -- jge L(memmove_bwd) -+ jae L(memmove_bwd) - jmp L(bk_write_less32bytes_2) - L(memmove_bwd): - add %ecx, %eax -@@ -139,12 +139,12 @@ L(memmove_bwd): - L(copy_forward): - #endif - cmp $48, %ecx -- jge L(48bytesormore) -+ jae L(48bytesormore) - - L(fwd_write_less32bytes): - #ifndef USE_AS_MEMMOVE - cmp %dl, %al -- jl L(bk_write) -+ jb L(bk_write) - #endif - add %ecx, %edx - add %ecx, %eax -@@ -181,7 +181,7 @@ L(48bytesormore): - #endif - - mov %eax, %edi -- jge L(large_page) -+ jae L(large_page) - and $0xf, %edi - jz L(shl_0) - -@@ -201,7 +201,7 @@ L(shl_0_loop): - movdqa %xmm0, (%edx, %edi) - movdqa %xmm1, 16(%edx, %edi) - lea 32(%edi), %edi -- jl L(shl_0_end) -+ jb L(shl_0_end) - - movdqa (%eax, %edi), %xmm0 - movdqa 16(%eax, %edi), %xmm1 -@@ -209,7 +209,7 @@ L(shl_0_loop): - movdqa %xmm0, (%edx, %edi) - movdqa %xmm1, 16(%edx, %edi) - lea 32(%edi), %edi -- jl L(shl_0_end) -+ jb L(shl_0_end) - - movdqa (%eax, %edi), %xmm0 - movdqa 16(%eax, %edi), %xmm1 -@@ -217,7 +217,7 @@ L(shl_0_loop): - movdqa %xmm0, (%edx, %edi) - movdqa %xmm1, 16(%edx, %edi) - lea 32(%edi), %edi -- jl L(shl_0_end) -+ jb L(shl_0_end) - - movdqa (%eax, %edi), %xmm0 - movdqa 16(%eax, %edi), %xmm1 -@@ -251,7 +251,7 @@ L(shl_0_gobble): - shr $3, %esi - sub %esi, %edi - cmp %edi, %ecx -- jge L(shl_0_gobble_mem_start) -+ jae L(shl_0_gobble_mem_start) - lea -128(%ecx), %ecx - ALIGN (4) - L(shl_0_gobble_cache_loop): -@@ -275,8 +275,7 @@ L(shl_0_gobble_cache_loop): - movaps %xmm7, 0x70(%edx) - lea 0x80(%edx), %edx - -- jge L(shl_0_gobble_cache_loop) --L(shl_0_gobble_cache_loop_tail): -+ jae L(shl_0_gobble_cache_loop) - cmp $-0x40, %ecx - lea 0x80(%ecx), %ecx - jl L(shl_0_cache_less_64bytes) -@@ -297,7 +296,7 @@ L(shl_0_gobble_cache_loop_tail): - add $0x40, %edx - L(shl_0_cache_less_64bytes): - cmp $0x20, %ecx -- jl L(shl_0_cache_less_32bytes) -+ jb L(shl_0_cache_less_32bytes) - movdqa (%eax), %xmm0 - sub $0x20, %ecx - movdqa 0x10(%eax), %xmm1 -@@ -307,7 +306,7 @@ L(shl_0_cache_less_64bytes): - add $0x20, %edx - L(shl_0_cache_less_32bytes): - cmp $0x10, %ecx -- jl L(shl_0_cache_less_16bytes) -+ jb L(shl_0_cache_less_16bytes) - sub $0x10, %ecx - movdqa (%eax), %xmm0 - add $0x10, %eax -@@ -352,7 +351,7 @@ L(shl_0_gobble_mem_loop): - movaps %xmm7, 0x70(%edx) - lea 0x80(%edx), %edx - -- jge L(shl_0_gobble_mem_loop) -+ jae L(shl_0_gobble_mem_loop) - cmp $-0x40, %ecx - lea 0x80(%ecx), %ecx - jl L(shl_0_mem_less_64bytes) -@@ -373,7 +372,7 @@ L(shl_0_gobble_mem_loop): - add $0x40, %edx - L(shl_0_mem_less_64bytes): - cmp $0x20, %ecx -- jl L(shl_0_mem_less_32bytes) -+ jb L(shl_0_mem_less_32bytes) - movdqa (%eax), %xmm0 - sub $0x20, %ecx - movdqa 0x10(%eax), %xmm1 -@@ -383,7 +382,7 @@ L(shl_0_mem_less_64bytes): - add $0x20, %edx - L(shl_0_mem_less_32bytes): - cmp $0x10, %ecx -- jl L(shl_0_mem_less_16bytes) -+ jb L(shl_0_mem_less_16bytes) - sub $0x10, %ecx - movdqa (%eax), %xmm0 - add $0x10, %eax -@@ -418,7 +417,7 @@ L(shl_1_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_1_end) -+ jb L(shl_1_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -461,7 +460,7 @@ L(shl_2_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_2_end) -+ jb L(shl_2_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -504,7 +503,7 @@ L(shl_3_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_3_end) -+ jb L(shl_3_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -547,7 +546,7 @@ L(shl_4_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_4_end) -+ jb L(shl_4_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -590,7 +589,7 @@ L(shl_5_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_5_end) -+ jb L(shl_5_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -634,7 +633,7 @@ L(shl_6_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_6_end) -+ jb L(shl_6_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -677,7 +676,7 @@ L(shl_7_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_7_end) -+ jb L(shl_7_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -720,7 +719,7 @@ L(shl_8_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_8_end) -+ jb L(shl_8_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -763,7 +762,7 @@ L(shl_9_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_9_end) -+ jb L(shl_9_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -806,7 +805,7 @@ L(shl_10_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_10_end) -+ jb L(shl_10_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -849,7 +848,7 @@ L(shl_11_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_11_end) -+ jb L(shl_11_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -892,7 +891,7 @@ L(shl_12_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_12_end) -+ jb L(shl_12_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -935,7 +934,7 @@ L(shl_13_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_13_end) -+ jb L(shl_13_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -978,7 +977,7 @@ L(shl_14_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_14_end) -+ jb L(shl_14_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -1022,7 +1021,7 @@ L(shl_15_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_15_end) -+ jb L(shl_15_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -1250,11 +1249,12 @@ L(large_page): - movdqu %xmm0, (%esi) - movntdq %xmm1, (%edx) - lea 16(%edx), %edx -+ lea -16(%ecx), %ecx - cmp %al, %dl - je L(copy_page_by_rep) - L(large_page_loop_init): - POP (%esi) -- lea -0x90(%ecx), %ecx -+ lea -0x80(%ecx), %ecx - POP (%edi) - L(large_page_loop): - prefetchnta 0x1c0(%eax) -@@ -1298,7 +1298,7 @@ L(large_page_loop): - sub $0x40, %ecx - L(large_page_less_64bytes): - cmp $32, %ecx -- jl L(large_page_less_32bytes) -+ jb L(large_page_less_32bytes) - movdqu (%eax), %xmm0 - movdqu 0x10(%eax), %xmm1 - lea 0x20(%eax), %eax -@@ -1665,11 +1665,11 @@ L(copy_backward): - - L(bk_aligned_4): - cmp $64, %ecx -- jge L(bk_write_more64bytes) -+ jae L(bk_write_more64bytes) - - L(bk_write_64bytesless): - cmp $32, %ecx -- jl L(bk_write_less32bytes) -+ jb L(bk_write_less32bytes) - - L(bk_write_more32bytes): - /* Copy 32 bytes at a time. */ -@@ -1704,7 +1704,7 @@ L(bk_write_less32bytes_2): - ALIGN (4) - L(bk_align): - cmp $8, %ecx -- jle L(bk_write_less32bytes) -+ jbe L(bk_write_less32bytes) - testl $1, %edx - /* We get here only if (EDX & 3 ) != 0 so if (EDX & 1) ==0, - then (EDX & 2) must be != 0. */ -@@ -1760,7 +1760,7 @@ L(bk_ssse3_align): - - L(bk_ssse3_cpy_pre): - cmp $64, %ecx -- jl L(bk_write_more32bytes) -+ jb L(bk_write_more32bytes) - - L(bk_ssse3_cpy): - sub $64, %esi -@@ -1775,7 +1775,7 @@ L(bk_ssse3_cpy): - movdqu (%esi), %xmm0 - movdqa %xmm0, (%edx) - cmp $64, %ecx -- jge L(bk_ssse3_cpy) -+ jae L(bk_ssse3_cpy) - jmp L(bk_write_64bytesless) - - #endif ---- glibc-2.11-222-ge2f4aa5/sysdeps/i386/i686/multiarch/memcpy-ssse3.S -+++ glibc-2.11.90-14/sysdeps/i386/i686/multiarch/memcpy-ssse3.S -@@ -128,7 +128,7 @@ ENTRY (MEMCPY) - jb L(copy_forward) - je L(fwd_write_0bytes) - cmp $32, %ecx -- jge L(memmove_bwd) -+ jae L(memmove_bwd) - jmp L(bk_write_less32bytes_2) - L(memmove_bwd): - add %ecx, %eax -@@ -139,12 +139,12 @@ L(memmove_bwd): - L(copy_forward): - #endif - cmp $48, %ecx -- jge L(48bytesormore) -+ jae L(48bytesormore) - - L(fwd_write_less32bytes): - #ifndef USE_AS_MEMMOVE - cmp %dl, %al -- jl L(bk_write) -+ jb L(bk_write) - #endif - add %ecx, %edx - add %ecx, %eax -@@ -181,7 +181,7 @@ L(48bytesormore): - #endif - - mov %eax, %edi -- jge L(large_page) -+ jae L(large_page) - and $0xf, %edi - jz L(shl_0) - -@@ -202,7 +202,7 @@ L(shl_0_loop): - movdqa %xmm0, (%edx, %edi) - movdqa %xmm1, 16(%edx, %edi) - lea 32(%edi), %edi -- jl L(shl_0_end) -+ jb L(shl_0_end) - - movdqa (%eax, %edi), %xmm0 - movdqa 16(%eax, %edi), %xmm1 -@@ -210,7 +210,7 @@ L(shl_0_loop): - movdqa %xmm0, (%edx, %edi) - movdqa %xmm1, 16(%edx, %edi) - lea 32(%edi), %edi -- jl L(shl_0_end) -+ jb L(shl_0_end) - - movdqa (%eax, %edi), %xmm0 - movdqa 16(%eax, %edi), %xmm1 -@@ -218,7 +218,7 @@ L(shl_0_loop): - movdqa %xmm0, (%edx, %edi) - movdqa %xmm1, 16(%edx, %edi) - lea 32(%edi), %edi -- jl L(shl_0_end) -+ jb L(shl_0_end) - - movdqa (%eax, %edi), %xmm0 - movdqa 16(%eax, %edi), %xmm1 -@@ -250,7 +250,7 @@ L(shl_0_gobble): - - POP (%edi) - lea -128(%ecx), %ecx -- jge L(shl_0_gobble_mem_loop) -+ jae L(shl_0_gobble_mem_loop) - L(shl_0_gobble_cache_loop): - movdqa (%eax), %xmm0 - movdqa 0x10(%eax), %xmm1 -@@ -272,8 +272,7 @@ L(shl_0_gobble_cache_loop): - movdqa %xmm7, 0x70(%edx) - lea 0x80(%edx), %edx - -- jge L(shl_0_gobble_cache_loop) --L(shl_0_gobble_cache_loop_tail): -+ jae L(shl_0_gobble_cache_loop) - cmp $-0x40, %ecx - lea 0x80(%ecx), %ecx - jl L(shl_0_cache_less_64bytes) -@@ -294,7 +293,7 @@ L(shl_0_gobble_cache_loop_tail): - add $0x40, %edx - L(shl_0_cache_less_64bytes): - cmp $0x20, %ecx -- jl L(shl_0_cache_less_32bytes) -+ jb L(shl_0_cache_less_32bytes) - movdqa (%eax), %xmm0 - sub $0x20, %ecx - movdqa 0x10(%eax), %xmm1 -@@ -304,7 +303,7 @@ L(shl_0_cache_less_64bytes): - add $0x20, %edx - L(shl_0_cache_less_32bytes): - cmp $0x10, %ecx -- jl L(shl_0_cache_less_16bytes) -+ jb L(shl_0_cache_less_16bytes) - sub $0x10, %ecx - movdqa (%eax), %xmm0 - add $0x10, %eax -@@ -342,7 +341,7 @@ L(shl_0_gobble_mem_loop): - movdqa %xmm7, 0x70(%edx) - lea 0x80(%edx), %edx - -- jge L(shl_0_gobble_mem_loop) -+ jae L(shl_0_gobble_mem_loop) - cmp $-0x40, %ecx - lea 0x80(%ecx), %ecx - jl L(shl_0_mem_less_64bytes) -@@ -363,7 +362,7 @@ L(shl_0_gobble_mem_loop): - add $0x40, %edx - L(shl_0_mem_less_64bytes): - cmp $0x20, %ecx -- jl L(shl_0_mem_less_32bytes) -+ jb L(shl_0_mem_less_32bytes) - movdqa (%eax), %xmm0 - sub $0x20, %ecx - movdqa 0x10(%eax), %xmm1 -@@ -373,7 +372,7 @@ L(shl_0_mem_less_64bytes): - add $0x20, %edx - L(shl_0_mem_less_32bytes): - cmp $0x10, %ecx -- jl L(shl_0_mem_less_16bytes) -+ jb L(shl_0_mem_less_16bytes) - sub $0x10, %ecx - movdqa (%eax), %xmm0 - add $0x10, %eax -@@ -406,7 +405,7 @@ L(shl_1_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_1_end) -+ jb L(shl_1_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -449,7 +448,7 @@ L(shl_2_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_2_end) -+ jb L(shl_2_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -492,7 +491,7 @@ L(shl_3_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_3_end) -+ jb L(shl_3_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -535,7 +534,7 @@ L(shl_4_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_4_end) -+ jb L(shl_4_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -578,7 +577,7 @@ L(shl_5_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_5_end) -+ jb L(shl_5_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -622,7 +621,7 @@ L(shl_6_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_6_end) -+ jb L(shl_6_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -665,7 +664,7 @@ L(shl_7_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_7_end) -+ jb L(shl_7_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -708,7 +707,7 @@ L(shl_8_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_8_end) -+ jb L(shl_8_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -751,7 +750,7 @@ L(shl_9_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_9_end) -+ jb L(shl_9_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -794,7 +793,7 @@ L(shl_10_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_10_end) -+ jb L(shl_10_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -837,7 +836,7 @@ L(shl_11_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_11_end) -+ jb L(shl_11_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -880,7 +879,7 @@ L(shl_12_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_12_end) -+ jb L(shl_12_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -923,7 +922,7 @@ L(shl_13_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_13_end) -+ jb L(shl_13_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -966,7 +965,7 @@ L(shl_14_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_14_end) -+ jb L(shl_14_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -1010,7 +1009,7 @@ L(shl_15_loop): - movdqa %xmm2, -32(%edx, %edi) - movdqa %xmm3, -16(%edx, %edi) - -- jl L(shl_15_end) -+ jb L(shl_15_end) - - movdqa 16(%eax, %edi), %xmm2 - sub $32, %ecx -@@ -1281,7 +1280,7 @@ L(large_page_loop): - sub $0x40, %ecx - L(large_page_less_64bytes): - cmp $32, %ecx -- jl L(large_page_less_32bytes) -+ jb L(large_page_less_32bytes) - movdqu (%eax), %xmm0 - movdqu 0x10(%eax), %xmm1 - lea 0x20(%eax), %eax -@@ -1617,11 +1616,11 @@ L(copy_backward): - - L(bk_aligned_4): - cmp $64, %ecx -- jge L(bk_write_more64bytes) -+ jae L(bk_write_more64bytes) - - L(bk_write_64bytesless): - cmp $32, %ecx -- jl L(bk_write_less32bytes) -+ jb L(bk_write_less32bytes) - - L(bk_write_more32bytes): - /* Copy 32 bytes at a time. */ -@@ -1656,7 +1655,7 @@ L(bk_write_less32bytes_2): - ALIGN (4) - L(bk_align): - cmp $8, %ecx -- jle L(bk_write_less32bytes) -+ jbe L(bk_write_less32bytes) - testl $1, %edx - /* We get here only if (EDX & 3 ) != 0 so if (EDX & 1) ==0, - then (EDX & 2) must be != 0. */ -@@ -1712,7 +1711,7 @@ L(bk_ssse3_align): - - L(bk_ssse3_cpy_pre): - cmp $64, %ecx -- jl L(bk_write_more32bytes) -+ jb L(bk_write_more32bytes) - - L(bk_ssse3_cpy): - sub $64, %esi -@@ -1727,7 +1726,7 @@ L(bk_ssse3_cpy): - movdqu (%esi), %xmm0 - movdqa %xmm0, (%edx) - cmp $64, %ecx -- jge L(bk_ssse3_cpy) -+ jae L(bk_ssse3_cpy) - jmp L(bk_write_64bytesless) - - #endif ---- glibc-2.11-222-ge2f4aa5/sysdeps/i386/i686/multiarch/memset-sse2-rep.S -+++ glibc-2.11.90-14/sysdeps/i386/i686/multiarch/memset-sse2-rep.S -@@ -261,7 +261,7 @@ L(not_aligned_16): - ALIGN (4) - L(aligned_16): - cmp $128, %ecx -- jge L(128bytesormore) -+ jae L(128bytesormore) - - L(aligned_16_less128bytes): - BRANCH_TO_JMPTBL_ENTRY (L(table_16_128bytes)) -@@ -306,7 +306,7 @@ L(128bytesormore_normal): - movdqa %xmm0, 0x60(%edx) - movdqa %xmm0, 0x70(%edx) - lea 128(%edx), %edx -- jl L(128bytesless_normal) -+ jb L(128bytesless_normal) - - - sub $128, %ecx -@@ -319,7 +319,7 @@ L(128bytesormore_normal): - movdqa %xmm0, 0x60(%edx) - movdqa %xmm0, 0x70(%edx) - lea 128(%edx), %edx -- jge L(128bytesormore_normal) -+ jae L(128bytesormore_normal) - - L(128bytesless_normal): - POP (%edi) ---- glibc-2.11-222-ge2f4aa5/sysdeps/i386/i686/multiarch/memset-sse2.S -+++ glibc-2.11.90-14/sysdeps/i386/i686/multiarch/memset-sse2.S -@@ -261,7 +261,7 @@ L(not_aligned_16): - ALIGN (4) - L(aligned_16): - cmp $128, %ecx -- jge L(128bytesormore) -+ jae L(128bytesormore) - - L(aligned_16_less128bytes): - BRANCH_TO_JMPTBL_ENTRY (L(table_16_128bytes)) -@@ -312,7 +312,7 @@ L(128bytesormore_normal): - movdqa %xmm0, 0x60(%edx) - movdqa %xmm0, 0x70(%edx) - lea 128(%edx), %edx -- jl L(128bytesless_normal) -+ jb L(128bytesless_normal) - - - sub $128, %ecx -@@ -325,7 +325,7 @@ L(128bytesormore_normal): - movdqa %xmm0, 0x60(%edx) - movdqa %xmm0, 0x70(%edx) - lea 128(%edx), %edx -- jge L(128bytesormore_normal) -+ jae L(128bytesormore_normal) - - L(128bytesless_normal): - lea 128(%ecx), %ecx -@@ -346,7 +346,7 @@ L(128bytes_L2_normal): - movaps %xmm0, 0x70(%edx) - add $128, %edx - cmp $128, %ecx -- jge L(128bytes_L2_normal) -+ jae L(128bytes_L2_normal) - - L(128bytesless_L2_normal): - BRANCH_TO_JMPTBL_ENTRY (L(table_16_128bytes)) -@@ -368,7 +368,7 @@ L(128bytesormore_shared_cache_loop): - movdqa %xmm0, 0x70(%edx) - add $0x80, %edx - cmp $0x80, %ebx -- jge L(128bytesormore_shared_cache_loop) -+ jae L(128bytesormore_shared_cache_loop) - cmp $0x80, %ecx - jb L(shared_cache_loop_end) - ALIGN (4) -@@ -384,7 +384,7 @@ L(128bytesormore_nt): - movntdq %xmm0, 0x70(%edx) - add $0x80, %edx - cmp $0x80, %ecx -- jge L(128bytesormore_nt) -+ jae L(128bytesormore_nt) - sfence - L(shared_cache_loop_end): - #if defined DATA_CACHE_SIZE || !defined SHARED ---- glibc-2.11-222-ge2f4aa5/sysdeps/ia64/Makefile -+++ glibc-2.11.90-14/sysdeps/ia64/Makefile +--- glibc-2.11-255-g462a522/sysdeps/ia64/Makefile ++++ glibc-2.11.90-15/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1997,8 +1253,8 @@ endif endif ---- glibc-2.11-222-ge2f4aa5/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.11.90-14/sysdeps/ia64/ia64libgcc.S +--- glibc-2.11-255-g462a522/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.11.90-15/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -2350,8 +1606,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.11-222-ge2f4aa5/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.11.90-14/sysdeps/ia64/libgcc-compat.c +--- glibc-2.11-255-g462a522/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.11.90-15/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -2437,8 +1693,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.11-222-ge2f4aa5/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.11.90-14/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.11-255-g462a522/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.11.90-15/sysdeps/powerpc/powerpc64/Makefile @@ -30,6 +30,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -2447,8 +1703,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.11-222-ge2f4aa5/sysdeps/unix/nice.c -+++ glibc-2.11.90-14/sysdeps/unix/nice.c +--- glibc-2.11-255-g462a522/sysdeps/unix/nice.c ++++ glibc-2.11.90-15/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -2463,8 +1719,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.11-222-ge2f4aa5/sysdeps/unix/sysv/linux/check_pf.c -+++ glibc-2.11.90-14/sysdeps/unix/sysv/linux/check_pf.c +--- glibc-2.11-255-g462a522/sysdeps/unix/sysv/linux/check_pf.c ++++ glibc-2.11.90-15/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include #include @@ -2480,8 +1736,8 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-2.11-222-ge2f4aa5/sysdeps/unix/sysv/linux/dl-osinfo.h -+++ glibc-2.11.90-14/sysdeps/unix/sysv/linux/dl-osinfo.h +--- glibc-2.11-255-g462a522/sysdeps/unix/sysv/linux/dl-osinfo.h ++++ glibc-2.11.90-15/sysdeps/unix/sysv/linux/dl-osinfo.h @@ -17,10 +17,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -2529,8 +1785,8 @@ } else #endif ---- glibc-2.11-222-ge2f4aa5/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.11.90-14/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.11-255-g462a522/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.11.90-15/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -2573,8 +1829,8 @@ { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) ---- glibc-2.11-222-ge2f4aa5/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ glibc-2.11.90-14/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.11-255-g462a522/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.11.90-15/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. @@ -2635,8 +1891,8 @@ + } while (0) + +#include_next ---- glibc-2.11-222-ge2f4aa5/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ glibc-2.11.90-14/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.11-255-g462a522/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.11.90-15/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -2669,29 +1925,29 @@ + } while (0) + #include_next ---- glibc-2.11-222-ge2f4aa5/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ glibc-2.11.90-14/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.11-255-g462a522/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.11.90-15/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.11-222-ge2f4aa5/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ glibc-2.11.90-14/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.11-255-g462a522/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.11.90-15/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.11-222-ge2f4aa5/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ glibc-2.11.90-14/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.11-255-g462a522/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.11.90-15/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.11-222-ge2f4aa5/sysdeps/unix/sysv/linux/netlinkaccess.h -+++ glibc-2.11.90-14/sysdeps/unix/sysv/linux/netlinkaccess.h +--- glibc-2.11-255-g462a522/sysdeps/unix/sysv/linux/netlinkaccess.h ++++ glibc-2.11.90-15/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ #include @@ -2717,8 +1973,8 @@ struct netlink_res { ---- glibc-2.11-222-ge2f4aa5/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.11.90-14/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.11-255-g462a522/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.11.90-15/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -2728,13 +1984,13 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.11-222-ge2f4aa5/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c -+++ glibc-2.11.90-14/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c +--- glibc-2.11-255-g462a522/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c ++++ glibc-2.11.90-15/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c @@ -1 +1 @@ -#include "../../fxstat.c" +#include "../../i386/fxstat.c" ---- glibc-2.11-222-ge2f4aa5/sysdeps/unix/sysv/linux/tcsetattr.c -+++ glibc-2.11.90-14/sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.11-255-g462a522/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.11.90-15/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -2780,8 +2036,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.11-222-ge2f4aa5/timezone/zic.c -+++ glibc-2.11.90-14/timezone/zic.c +--- glibc-2.11-255-g462a522/timezone/zic.c ++++ glibc-2.11.90-15/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 e9705db..b5ff80e 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,4 +1,4 @@ -%define glibcsrcdir glibc-2.11-222-ge2f4aa5 +%define glibcsrcdir glibc-2.11-255-g462a522 %define glibcversion 2.11.90 ### glibc.spec.in follows: %define run_glibc_tests 1 @@ -19,12 +19,11 @@ %define rtkaioarches %{ix86} x86_64 ia64 ppc ppc64 s390 s390x %define debuginfocommonarches alpha alphaev6 sparc sparcv9 sparcv9v sparc64 sparc64v %define multiarcharches ppc ppc64 %{ix86} x86_64 -%define _unpackaged_files_terminate_build 0 Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 14 +Release: 15 # 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 @@ -527,6 +526,7 @@ chmod 644 $RPM_BUILD_ROOT/etc/ld.so.conf mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d mkdir -p $RPM_BUILD_ROOT/etc/sysconfig > $RPM_BUILD_ROOT/etc/sysconfig/nscd +> $RPM_BUILD_ROOT/etc/gai.conf # Include %{_prefix}/%{_lib}/gconv/gconv-modules.cache > $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gconv/gconv-modules.cache @@ -569,8 +569,6 @@ rm -f ${RPM_BUILD_ROOT}/%{_lib}/libnss-*.so.1 # Ugly hack for buggy rpm ln -f ${RPM_BUILD_ROOT}%{_sbindir}/iconvconfig{,.%{_target_cpu}} -rm -f $RPM_BUILD_ROOT/etc/gai.conf - # In F7+ this is provided by rpcbind rpm rm -f $RPM_BUILD_ROOT%{_sbindir}/rpcinfo @@ -588,7 +586,6 @@ rm -f $RPM_BUILD_ROOT%{_sbindir}/rpcinfo find $RPM_BUILD_ROOT -type d \ \( -path '*%{_prefix}/share/*' ! -path '*%{_infodir}' -o \ -path "*%{_prefix}/include/*" -o \ - -path "*%{_prefix}/lib/locale/*" \ \) -printf "%%%%dir /%%P\n" } | { @@ -645,7 +642,8 @@ grep '%{_prefix}/bin' < rpm.filelist >> common.filelist #grep '%{_prefix}/libexec/pt_chown' < rpm.filelist >> common.filelist grep '%{_prefix}/sbin/[^gi]' < rpm.filelist >> common.filelist grep '%{_prefix}/share' < rpm.filelist | \ - grep -v '%{_prefix}/share/zoneinfo' >> common.filelist + grep -v -e '%{_prefix}/share/zoneinfo' -e '%%dir %{prefix}/share' \ + >> common.filelist sed -i -e '\|%{_prefix}/bin|d' \ -e '\|%{_prefix}/lib/locale|d' \ @@ -985,6 +983,7 @@ rm -f *.filelist* %dir %attr(755,root,root) /etc/default %verify(not md5 size mtime) %config(noreplace) /etc/default/nss %attr(4711,root,root) %{_prefix}/libexec/pt_chown +%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/gai.conf %doc documentation/* %files -f devel.filelist devel @@ -1030,6 +1029,19 @@ rm -f *.filelist* %endif %changelog +* Tue Mar 9 2010 Andreas Schwab - 2.11.90-15 +- Update from master + - sparc64: Fix handling of R_SPARC_TLS_LE_* relocations (#571551) + - Handle ext4 and logfs in statvfs functions + - Fix setxid race with thread creation + - Pass -mtune=i686 to assembler when compiling for i686 + - Fix R_X86_64_PC32 overflow detection + - Fix msgrcv on sparc64 + - Fix unwind info in x86 strcmp-sse4.S (BZ#11332) + - sparc: Add multiarch support for memset/bzero/memcpy +- Remove directories owned by filesystem (#569414) +- Add %%ghost /etc/gai.conf to glibc-common (#567748) + * Tue Feb 23 2010 Andreas Schwab - 2.11.90-14 - Update from master - Sparc updates diff --git a/import.log b/import.log index 52681f6..21260c4 100644 --- a/import.log +++ b/import.log @@ -46,3 +46,4 @@ glibc-2_11_90-11:HEAD:glibc-2.11.90-11.src.rpm:1265032871 glibc-2_11_90-12:HEAD:glibc-2.11.90-12.src.rpm:1265642830 glibc-2_11_90-13:F-13:glibc-2.11.90-13.src.rpm:1266853673 glibc-2_11_90-14:F-13:glibc-2.11.90-14.src.rpm:1266928256 +glibc-2_11_90-15:F-13:glibc-2.11.90-15.src.rpm:1268148292 diff --git a/sources b/sources index 95f46f3..778e955 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -a834629078d956c4d8764cd739143e81 glibc-2.11-222-ge2f4aa5-fedora.tar.bz2 -04cd90997fbd93342cfaf722791c96b2 glibc-2.11-222-ge2f4aa5.tar.bz2 +7947898c84fc7f6e8047aeadc7829b16 glibc-2.11-255-g462a522-fedora.tar.bz2 +e4d5bece9f6148ad9c111c323c3a7fcc glibc-2.11-255-g462a522.tar.bz2