rpms/glibc
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

2.11.90-11

Browse Source
This commit is contained in:
Andreas Schwab 2010-02-01 14:02:57 +00:00
parent c1875bb985
commit 3b8ebb3a56
5 changed files with 201 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cvsignore
View File

@ -1,2 +1,2 @@
glibc-2.11-158-ge3b7670-fedora.tar.bz2
glibc-2.11-158-ge3b7670.tar.bz2
glibc-2.11-175-gb34e12e-fedora.tar.bz2
glibc-2.11-175-gb34e12e.tar.bz2

370
glibc-fedora.patch
View File

@ -1,6 +1,6 @@
--- glibc-2.11-158-ge3b7670/ChangeLog
+++ glibc-2.11.90-9.1/ChangeLog
@@ -169,68 +169,6 @@
--- glibc-2.11-175-gb34e12e/ChangeLog
+++ glibc-2.11.90-11/ChangeLog
@@ -237,68 +237,6 @@
* posix/sched.h: Define time_t and pid_t for XPG7.
@ -69,7 +69,7 @@
2010-01-12 Ulrich Drepper <drepper@redhat.com>
* conform/data/sys/select.h-data: Fix up for XPG7.
@@ -1835,6 +1773,11 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com>
@@ -1903,6 +1841,11 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com>
* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in
the unique symbol hash table should not be const.
@ -81,7 +81,7 @@
2009-07-21 Ulrich Drepper <drepper@redhat.com>
* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove
@@ -2100,6 +2043,11 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com>
@@ -2168,6 +2111,11 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com>
out common code into new function get_common_indeces. Determine
extended family and model for Intel processors.
@ -93,7 +93,7 @@
2009-06-26 Ulrich Drepper <drepper@redhat.com>
* resolv/resolv.h: Define RES_SNGLKUPREOP.
@@ -10793,6 +10741,10 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com>
@@ -10861,6 +10809,10 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com>
[BZ #4368]
* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
@ -104,7 +104,7 @@
2007-04-16 Ulrich Drepper <drepper@redhat.com>
[BZ #4364]
@@ -12050,6 +12002,15 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com>
@@ -12118,6 +12070,15 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com>
separators also if no non-zero digits found.
* stdlib/Makefile (tests): Add tst-strtod3.
@ -120,8 +120,8 @@
2006-12-09 Ulrich Drepper <drepper@redhat.com>
[BZ #3632]
--- glibc-2.11-158-ge3b7670/ChangeLog.15
+++ glibc-2.11.90-9.1/ChangeLog.15
--- glibc-2.11-175-gb34e12e/ChangeLog.15
+++ glibc-2.11.90-11/ChangeLog.15
@@ -477,6 +477,14 @@
2004-11-26 Jakub Jelinek <jakub@redhat.com>
@ -187,8 +187,8 @@
2004-08-30 Roland McGrath <roland@frob.com>
* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
--- glibc-2.11-158-ge3b7670/ChangeLog.16
+++ glibc-2.11.90-9.1/ChangeLog.16
--- glibc-2.11-175-gb34e12e/ChangeLog.16
+++ glibc-2.11.90-11/ChangeLog.16
@@ -2042,6 +2042,9 @@
(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
followed by __THROW.
@ -242,8 +242,8 @@
2005-07-28 Thomas Schwinge <schwinge@nic-nac-project.de>
[BZ #1137]
--- glibc-2.11-158-ge3b7670/Makeconfig
+++ glibc-2.11.90-9.1/Makeconfig
--- glibc-2.11-175-gb34e12e/Makeconfig
+++ glibc-2.11.90-11/Makeconfig
@@ -780,12 +780,12 @@ endif
# The assembler can generate debug information too.
ifndef ASFLAGS
@ -260,8 +260,8 @@
ifndef BUILD_CC
BUILD_CC = $(CC)
--- glibc-2.11-158-ge3b7670/csu/Makefile
+++ glibc-2.11.90-9.1/csu/Makefile
--- glibc-2.11-175-gb34e12e/csu/Makefile
+++ glibc-2.11.90-11/csu/Makefile
@@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
$(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@ -272,8 +272,8 @@
vpath initfini.c $(sysdirs)
--- glibc-2.11-158-ge3b7670/csu/elf-init.c
+++ glibc-2.11.90-9.1/csu/elf-init.c
--- glibc-2.11-175-gb34e12e/csu/elf-init.c
+++ glibc-2.11.90-11/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;
@ -298,8 +298,8 @@
/* These function symbols are provided for the .init/.fini section entry
points automagically by the linker. */
--- glibc-2.11-158-ge3b7670/debug/tst-chk1.c
+++ glibc-2.11.90-9.1/debug/tst-chk1.c
--- glibc-2.11-175-gb34e12e/debug/tst-chk1.c
+++ glibc-2.11.90-11/debug/tst-chk1.c
@@ -17,6 +17,9 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
@ -328,8 +328,8 @@
# define O 0
# else
# define O 1
--- glibc-2.11-158-ge3b7670/elf/ldconfig.c
+++ glibc-2.11.90-9.1/elf/ldconfig.c
--- glibc-2.11-175-gb34e12e/elf/ldconfig.c
+++ glibc-2.11.90-11/elf/ldconfig.c
@@ -1020,17 +1020,19 @@ search_dirs (void)
@ -411,8 +411,8 @@
}
if (! opt_ignore_aux_cache)
--- glibc-2.11-158-ge3b7670/elf/tst-stackguard1.c
+++ glibc-2.11.90-9.1/elf/tst-stackguard1.c
--- glibc-2.11-175-gb34e12e/elf/tst-stackguard1.c
+++ glibc-2.11.90-11/elf/tst-stackguard1.c
@@ -160,17 +160,21 @@ do_test (void)
the 16 runs, something is very wrong. */
int ndifferences = 0;
@ -437,16 +437,16 @@
{
puts ("stack guard canaries are not randomized enough");
puts ("nor equal to the default canary value");
--- glibc-2.11-158-ge3b7670/include/bits/stdlib-ldbl.h
+++ glibc-2.11.90-9.1/include/bits/stdlib-ldbl.h
--- glibc-2.11-175-gb34e12e/include/bits/stdlib-ldbl.h
+++ glibc-2.11.90-11/include/bits/stdlib-ldbl.h
@@ -0,0 +1 @@
+#include <stdlib/bits/stdlib-ldbl.h>
--- glibc-2.11-158-ge3b7670/include/bits/wchar-ldbl.h
+++ glibc-2.11.90-9.1/include/bits/wchar-ldbl.h
--- glibc-2.11-175-gb34e12e/include/bits/wchar-ldbl.h
+++ glibc-2.11.90-11/include/bits/wchar-ldbl.h
@@ -0,0 +1 @@
+#include <wcsmbs/bits/wchar-ldbl.h>
--- glibc-2.11-158-ge3b7670/include/features.h
+++ glibc-2.11.90-9.1/include/features.h
--- glibc-2.11-175-gb34e12e/include/features.h
+++ glibc-2.11.90-11/include/features.h
@@ -308,8 +308,13 @@
#endif
@ -463,8 +463,8 @@
# define __USE_FORTIFY_LEVEL 2
# else
# define __USE_FORTIFY_LEVEL 1
--- glibc-2.11-158-ge3b7670/intl/locale.alias
+++ glibc-2.11.90-9.1/intl/locale.alias
--- glibc-2.11-175-gb34e12e/intl/locale.alias
+++ glibc-2.11.90-11/intl/locale.alias
@@ -57,8 +57,6 @@ korean ko_KR.eucKR
korean.euc ko_KR.eucKR
ko_KR ko_KR.eucKR
@ -474,8 +474,8 @@
norwegian nb_NO.ISO-8859-1
nynorsk nn_NO.ISO-8859-1
polish pl_PL.ISO-8859-2
--- glibc-2.11-158-ge3b7670/libio/stdio.h
+++ glibc-2.11.90-9.1/libio/stdio.h
--- glibc-2.11-175-gb34e12e/libio/stdio.h
+++ glibc-2.11.90-11/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. */
@ -489,8 +489,8 @@
__BEGIN_NAMESPACE_STD
/* Remove file FILENAME. */
--- glibc-2.11-158-ge3b7670/locale/iso-4217.def
+++ glibc-2.11.90-9.1/locale/iso-4217.def
--- glibc-2.11-175-gb34e12e/locale/iso-4217.def
+++ glibc-2.11.90-11/locale/iso-4217.def
@@ -8,6 +8,7 @@
*
* !!! The list has to be sorted !!!
@ -582,8 +582,8 @@
DEFINE_INT_CURR("PYG") /* Paraguay Guarani */
DEFINE_INT_CURR("QAR") /* Qatar Rial */
DEFINE_INT_CURR("ROL") /* Romanian Leu */
--- glibc-2.11-158-ge3b7670/locale/programs/locarchive.c
+++ glibc-2.11.90-9.1/locale/programs/locarchive.c
--- glibc-2.11-175-gb34e12e/locale/programs/locarchive.c
+++ glibc-2.11.90-11/locale/programs/locarchive.c
@@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const void *b)
/* forward decls for below */
static uint32_t add_locale (struct locarhandle *ah, const char *name,
@ -615,8 +615,8 @@
add_alias (struct locarhandle *ah, const char *alias, bool replace,
const char *oldname, uint32_t *locrec_offset_p)
{
--- glibc-2.11-158-ge3b7670/localedata/Makefile
+++ glibc-2.11.90-9.1/localedata/Makefile
--- glibc-2.11-175-gb34e12e/localedata/Makefile
+++ glibc-2.11.90-11/localedata/Makefile
@@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
echo -n '...'; \
input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@ -625,8 +625,8 @@
-i locales/$$input -c -f charmaps/$$charset \
$(addprefix --prefix=,$(install_root)) $$locale; \
echo ' done'; \
--- glibc-2.11-158-ge3b7670/localedata/SUPPORTED
+++ glibc-2.11.90-9.1/localedata/SUPPORTED
--- glibc-2.11-175-gb34e12e/localedata/SUPPORTED
+++ glibc-2.11.90-11/localedata/SUPPORTED
@@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
cy_GB/ISO-8859-14 \
da_DK.UTF-8/UTF-8 \
@ -668,8 +668,8 @@
ta_IN/UTF-8 \
te_IN/UTF-8 \
tg_TJ.UTF-8/UTF-8 \
--- glibc-2.11-158-ge3b7670/localedata/locales/cy_GB
+++ glibc-2.11.90-9.1/localedata/locales/cy_GB
--- glibc-2.11-175-gb34e12e/localedata/locales/cy_GB
+++ glibc-2.11.90-11/localedata/locales/cy_GB
@@ -248,8 +248,11 @@ mon "<U0049><U006F><U006E><U0061><U0077><U0072>";/
d_t_fmt "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
d_fmt "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@ -684,8 +684,8 @@
END LC_TIME
LC_MESSAGES
--- glibc-2.11-158-ge3b7670/localedata/locales/en_GB
+++ glibc-2.11.90-9.1/localedata/locales/en_GB
--- glibc-2.11-175-gb34e12e/localedata/locales/en_GB
+++ glibc-2.11.90-11/localedata/locales/en_GB
@@ -116,8 +116,8 @@ mon "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/
d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@ -697,8 +697,8 @@
date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
<U0025><U005A><U0020><U0025><U0059>"
--- glibc-2.11-158-ge3b7670/localedata/locales/no_NO
+++ glibc-2.11.90-9.1/localedata/locales/no_NO
--- glibc-2.11-175-gb34e12e/localedata/locales/no_NO
+++ glibc-2.11.90-11/localedata/locales/no_NO
@@ -0,0 +1,69 @@
+escape_char /
+comment_char %
@ -769,8 +769,8 @@
+LC_ADDRESS
+copy "nb_NO"
+END LC_ADDRESS
--- glibc-2.11-158-ge3b7670/localedata/locales/zh_TW
+++ glibc-2.11.90-9.1/localedata/locales/zh_TW
--- glibc-2.11-175-gb34e12e/localedata/locales/zh_TW
+++ glibc-2.11.90-11/localedata/locales/zh_TW
@@ -1,7 +1,7 @@
comment_char %
escape_char /
@ -798,8 +798,8 @@
revision "0.2"
date "2000-08-02"
%
--- glibc-2.11-158-ge3b7670/malloc/mcheck.c
+++ glibc-2.11.90-9.1/malloc/mcheck.c
--- glibc-2.11-175-gb34e12e/malloc/mcheck.c
+++ glibc-2.11.90-11/malloc/mcheck.c
@@ -24,9 +24,25 @@
# include <mcheck.h>
# include <stdint.h>
@ -875,8 +875,8 @@
old_free_hook = __free_hook;
__free_hook = freehook;
--- glibc-2.11-158-ge3b7670/manual/libc.texinfo
+++ glibc-2.11.90-9.1/manual/libc.texinfo
--- glibc-2.11-175-gb34e12e/manual/libc.texinfo
+++ glibc-2.11.90-11/manual/libc.texinfo
@@ -5,7 +5,7 @@
@c setchapternewpage odd
@ -886,8 +886,8 @@
@direntry
* Libc: (libc). C library.
@end direntry
--- glibc-2.11-158-ge3b7670/misc/sys/cdefs.h
+++ glibc-2.11.90-9.1/misc/sys/cdefs.h
--- glibc-2.11-175-gb34e12e/misc/sys/cdefs.h
+++ glibc-2.11.90-11/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)
@ -931,16 +931,16 @@
# define __va_arg_pack() __builtin_va_arg_pack ()
# define __va_arg_pack_len() __builtin_va_arg_pack_len ()
#endif
--- glibc-2.11-158-ge3b7670/nis/nss
+++ glibc-2.11.90-9.1/nis/nss
--- glibc-2.11-175-gb34e12e/nis/nss
+++ glibc-2.11.90-11/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-158-ge3b7670/nptl/ChangeLog
+++ glibc-2.11.90-9.1/nptl/ChangeLog
--- glibc-2.11-175-gb34e12e/nptl/ChangeLog
+++ glibc-2.11.90-11/nptl/ChangeLog
@@ -3834,6 +3834,15 @@
Use __sigfillset. Document that sigfillset does the right thing wrt
to SIGSETXID.
@ -981,8 +981,8 @@
2003-07-25 Jakub Jelinek <jakub@redhat.com>
* tst-cancel17.c (do_test): Check if aio_cancel failed.
--- glibc-2.11-158-ge3b7670/nptl/Makefile
+++ glibc-2.11.90-9.1/nptl/Makefile
--- glibc-2.11-175-gb34e12e/nptl/Makefile
+++ glibc-2.11.90-11/nptl/Makefile
@@ -339,7 +339,8 @@ endif
extra-objs += $(crti-objs) $(crtn-objs)
omit-deps += crti crtn
@ -1015,8 +1015,8 @@
else
$(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
endif
--- glibc-2.11-158-ge3b7670/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+++ glibc-2.11.90-9.1/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
--- glibc-2.11-175-gb34e12e/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+++ glibc-2.11.90-11/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
@ -1025,8 +1025,8 @@
+#define _XOPEN_STREAMS -1
+
#endif /* bits/posix_opt.h */
--- glibc-2.11-158-ge3b7670/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+++ glibc-2.11.90-9.1/nptl/sysdeps/unix/sysv/linux/kernel-features.h
--- glibc-2.11-175-gb34e12e/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+++ glibc-2.11.90-11/nptl/sysdeps/unix/sysv/linux/kernel-features.h
@@ -0,0 +1,6 @@
+#include_next <kernel-features.h>
+
@ -1034,8 +1034,8 @@
+#ifndef __ASSUME_CLONE_THREAD_FLAGS
+# define __ASSUME_CLONE_THREAD_FLAGS 1
+#endif
--- glibc-2.11-158-ge3b7670/nptl/tst-stackguard1.c
+++ glibc-2.11.90-9.1/nptl/tst-stackguard1.c
--- glibc-2.11-175-gb34e12e/nptl/tst-stackguard1.c
+++ glibc-2.11.90-11/nptl/tst-stackguard1.c
@@ -190,17 +190,21 @@ do_test (void)
the 16 runs, something is very wrong. */
int ndifferences = 0;
@ -1060,8 +1060,8 @@
{
puts ("stack guard canaries are not randomized enough");
puts ("nor equal to the default canary value");
--- glibc-2.11-158-ge3b7670/nscd/nscd.conf
+++ glibc-2.11.90-9.1/nscd/nscd.conf
--- glibc-2.11-175-gb34e12e/nscd/nscd.conf
+++ glibc-2.11.90-11/nscd/nscd.conf
@@ -33,7 +33,7 @@
# logfile /var/log/nscd.log
# threads 4
@ -1071,8 +1071,8 @@
# stat-user somebody
debug-level 0
# reload-count 5
--- glibc-2.11-158-ge3b7670/nscd/nscd.init
+++ glibc-2.11.90-9.1/nscd/nscd.init
--- glibc-2.11-175-gb34e12e/nscd/nscd.init
+++ glibc-2.11.90-11/nscd/nscd.init
@@ -9,6 +9,7 @@
# slow naming services like NIS, NIS+, LDAP, or hesiod.
# processname: /usr/sbin/nscd
@ -1144,8 +1144,8 @@
;;
*)
echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
--- glibc-2.11-158-ge3b7670/posix/Makefile
+++ glibc-2.11.90-9.1/posix/Makefile
--- glibc-2.11-175-gb34e12e/posix/Makefile
+++ glibc-2.11.90-11/posix/Makefile
@@ -303,15 +303,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
mv -f $@/$$spec.new $@/$$spec; \
done < $(objpfx)getconf.speclist
@ -1166,8 +1166,8 @@
+ | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
+ > $@.new
mv -f $@.new $@
--- glibc-2.11-158-ge3b7670/posix/getconf.speclist.h
+++ glibc-2.11.90-9.1/posix/getconf.speclist.h
--- glibc-2.11-175-gb34e12e/posix/getconf.speclist.h
+++ glibc-2.11.90-11/posix/getconf.speclist.h
@@ -0,0 +1,39 @@
+#include <unistd.h>
+const char *START_OF_STRINGS =
@ -1208,8 +1208,8 @@
+"XBS5_LPBIG_OFFBIG"
+#endif
+"";
--- glibc-2.11-158-ge3b7670/streams/Makefile
+++ glibc-2.11.90-9.1/streams/Makefile
--- glibc-2.11-175-gb34e12e/streams/Makefile
+++ glibc-2.11.90-11/streams/Makefile
@@ -21,7 +21,7 @@
#
subdir := streams
@ -1219,8 +1219,8 @@
routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach
include ../Rules
--- glibc-2.11-158-ge3b7670/sysdeps/generic/dl-cache.h
+++ glibc-2.11.90-9.1/sysdeps/generic/dl-cache.h
--- glibc-2.11-175-gb34e12e/sysdeps/generic/dl-cache.h
+++ glibc-2.11.90-11/sysdeps/generic/dl-cache.h
@@ -36,6 +36,14 @@
# define add_system_dir(dir) add_dir (dir)
#endif
@ -1236,8 +1236,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-158-ge3b7670/sysdeps/i386/Makefile
+++ glibc-2.11.90-9.1/sysdeps/i386/Makefile
--- glibc-2.11-175-gb34e12e/sysdeps/i386/Makefile
+++ glibc-2.11.90-11/sysdeps/i386/Makefile
@@ -2,6 +2,8 @@
# Every i386 port in use uses gas syntax (I think).
asm-CPPFLAGS += -DGAS_SYNTAX
@ -1262,21 +1262,21 @@
endif
ifeq ($(subdir),elf)
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/bcopy.S
+++ glibc-2.11.90-9.1//dev/null
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/bcopy.S
+++ glibc-2.11.90-11//dev/null
@@ -1,3 +0,0 @@
-#define USE_AS_BCOPY
-#define memmove bcopy
-#include <sysdeps/i386/i686/memmove.S>
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/cacheinfo.c
+++ glibc-2.11.90-9.1/sysdeps/i386/i686/cacheinfo.c
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/cacheinfo.c
+++ glibc-2.11.90-11/sysdeps/i386/i686/cacheinfo.c
@@ -1,4 +1,3 @@
-#define __x86_64_data_cache_size __x86_data_cache_size
#define __x86_64_data_cache_size_half __x86_data_cache_size_half
#define __x86_64_shared_cache_size __x86_shared_cache_size
#define __x86_64_shared_cache_size_half __x86_shared_cache_size_half
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/memcpy.S
+++ glibc-2.11.90-9.1/sysdeps/i386/i686/memcpy.S
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/memcpy.S
+++ glibc-2.11.90-11/sysdeps/i386/i686/memcpy.S
@@ -32,11 +32,11 @@
.text
@ -1291,8 +1291,8 @@
#endif
ENTRY (BP_SYM (memcpy))
ENTER
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/memmove.S
+++ glibc-2.11.90-9.1/sysdeps/i386/i686/memmove.S
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/memmove.S
+++ glibc-2.11.90-11/sysdeps/i386/i686/memmove.S
@@ -26,27 +26,18 @@
#define PARMS LINKAGE+4 /* one spilled register */
@ -1356,8 +1356,8 @@
-#ifndef USE_AS_BCOPY
libc_hidden_builtin_def (memmove)
-#endif
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/mempcpy.S
+++ glibc-2.11.90-9.1/sysdeps/i386/i686/mempcpy.S
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/mempcpy.S
+++ glibc-2.11.90-11/sysdeps/i386/i686/mempcpy.S
@@ -32,11 +32,11 @@
.text
@ -1372,8 +1372,8 @@
#endif
ENTRY (BP_SYM (__mempcpy))
ENTER
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/memset.S
+++ glibc-2.11.90-9.1/sysdeps/i386/i686/memset.S
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/memset.S
+++ glibc-2.11.90-11/sysdeps/i386/i686/memset.S
@@ -40,11 +40,11 @@
.text
@ -1388,8 +1388,8 @@
#endif
ENTRY (BP_SYM (memset))
ENTER
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/multiarch/Makefile
+++ glibc-2.11.90-9.1/sysdeps/i386/i686/multiarch/Makefile
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/Makefile
+++ glibc-2.11.90-11/sysdeps/i386/i686/multiarch/Makefile
@@ -4,10 +4,6 @@ gen-as-const-headers += ifunc-defines.sym
endif
@ -1401,22 +1401,22 @@
ifeq (yes,$(config-cflags-sse4))
sysdep_routines += strcspn-c strpbrk-c strspn-c strstr-c strcasestr-c
CFLAGS-strcspn-c.c += -msse4
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/multiarch/bcopy-ssse3-rep.S
+++ glibc-2.11.90-9.1//dev/null
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/bcopy-ssse3-rep.S
+++ glibc-2.11.90-11//dev/null
@@ -1,4 +0,0 @@
-#define USE_AS_MEMMOVE
-#define USE_AS_BCOPY
-#define MEMCPY __bcopy_ssse3_rep
-#include "memcpy-ssse3-rep.S"
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/multiarch/bcopy-ssse3.S
+++ glibc-2.11.90-9.1//dev/null
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/bcopy-ssse3.S
+++ glibc-2.11.90-11//dev/null
@@ -1,4 +0,0 @@
-#define USE_AS_MEMMOVE
-#define USE_AS_BCOPY
-#define MEMCPY __bcopy_ssse3
-#include "memcpy-ssse3.S"
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/multiarch/bcopy.S
+++ glibc-2.11.90-9.1//dev/null
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/bcopy.S
+++ glibc-2.11.90-11//dev/null
@@ -1,89 +0,0 @@
-/* Multiple versions of bcopy
- Copyright (C) 2010 Free Software Foundation, Inc.
@ -1507,20 +1507,20 @@
-#endif
-
-#include "../bcopy.S"
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/multiarch/bzero-sse2-rep.S
+++ glibc-2.11.90-9.1//dev/null
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/bzero-sse2-rep.S
+++ glibc-2.11.90-11//dev/null
@@ -1,3 +0,0 @@
-#define USE_AS_BZERO
-#define __memset_sse2_rep __bzero_sse2_rep
-#include "memset-sse2-rep.S"
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/multiarch/bzero-sse2.S
+++ glibc-2.11.90-9.1//dev/null
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/bzero-sse2.S
+++ glibc-2.11.90-11//dev/null
@@ -1,3 +0,0 @@
-#define USE_AS_BZERO
-#define __memset_sse2 __bzero_sse2
-#include "memset-sse2.S"
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/multiarch/bzero.S
+++ glibc-2.11.90-9.1//dev/null
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/bzero.S
+++ glibc-2.11.90-11//dev/null
@@ -1,97 +0,0 @@
-/* Multiple versions of bzero
- Copyright (C) 2010 Free Software Foundation, Inc.
@ -1619,8 +1619,8 @@
-#endif
-
-#include "../bzero.S"
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/multiarch/ifunc-defines.sym
+++ glibc-2.11.90-9.1/sysdeps/i386/i686/multiarch/ifunc-defines.sym
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/ifunc-defines.sym
+++ glibc-2.11.90-11/sysdeps/i386/i686/multiarch/ifunc-defines.sym
@@ -13,8 +13,5 @@ CPUID_ECX_OFFSET offsetof (struct cpuid_registers, ecx)
CPUID_EDX_OFFSET offsetof (struct cpuid_registers, edx)
FAMILY_OFFSET offsetof (struct cpu_features, family)
@ -1630,8 +1630,8 @@
COMMON_CPUID_INDEX_1
-FEATURE_INDEX_1
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
+++ glibc-2.11.90-9.1//dev/null
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
+++ glibc-2.11.90-11//dev/null
@@ -1,1785 +0,0 @@
-/* memcpy with SSSE3 and REP string.
- Copyright (C) 2010 Free Software Foundation, Inc.
@ -3418,8 +3418,8 @@
-END (MEMCPY)
-
-#endif
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/multiarch/memcpy-ssse3.S
+++ glibc-2.11.90-9.1//dev/null
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/memcpy-ssse3.S
+++ glibc-2.11.90-11//dev/null
@@ -1,1737 +0,0 @@
-/* memcpy with SSSE3
- Copyright (C) 2010 Free Software Foundation, Inc.
@ -5158,8 +5158,8 @@
-END (MEMCPY)
-
-#endif
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/multiarch/memcpy.S
+++ glibc-2.11.90-9.1//dev/null
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/memcpy.S
+++ glibc-2.11.90-11//dev/null
@@ -1,90 +0,0 @@
-/* Multiple versions of memcpy
- Copyright (C) 2010 Free Software Foundation, Inc.
@ -5251,8 +5251,8 @@
-#endif
-
-#include "../memcpy.S"
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/multiarch/memcpy_chk.S
+++ glibc-2.11.90-9.1//dev/null
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/memcpy_chk.S
+++ glibc-2.11.90-11//dev/null
@@ -1,64 +0,0 @@
-/* Multiple versions of __memcpy_chk
- Copyright (C) 2010 Free Software Foundation, Inc.
@ -5318,22 +5318,22 @@
-# include "../memcpy_chk.S"
-# endif
-#endif
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/multiarch/memmove-ssse3-rep.S
+++ glibc-2.11.90-9.1//dev/null
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/memmove-ssse3-rep.S
+++ glibc-2.11.90-11//dev/null
@@ -1,4 +0,0 @@
-#define USE_AS_MEMMOVE
-#define MEMCPY __memmove_ssse3_rep
-#define MEMCPY_CHK __memmove_chk_ssse3_rep
-#include "memcpy-ssse3-rep.S"
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/multiarch/memmove-ssse3.S
+++ glibc-2.11.90-9.1//dev/null
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/memmove-ssse3.S
+++ glibc-2.11.90-11//dev/null
@@ -1,4 +0,0 @@
-#define USE_AS_MEMMOVE
-#define MEMCPY __memmove_ssse3
-#define MEMCPY_CHK __memmove_chk_ssse3
-#include "memcpy-ssse3.S"
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/multiarch/memmove.S
+++ glibc-2.11.90-9.1//dev/null
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/memmove.S
+++ glibc-2.11.90-11//dev/null
@@ -1,117 +0,0 @@
-/* Multiple versions of memmove
- Copyright (C) 2010 Free Software Foundation, Inc.
@ -5452,8 +5452,8 @@
-#endif
-
-#include "../memmove.S"
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/multiarch/memmove_chk.S
+++ glibc-2.11.90-9.1//dev/null
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/memmove_chk.S
+++ glibc-2.11.90-11//dev/null
@@ -1,112 +0,0 @@
-/* Multiple versions of __memmove_chk
- Copyright (C) 2010 Free Software Foundation, Inc.
@ -5567,22 +5567,22 @@
- .size __memmove_chk_ia32, .-__memmove_chk_ia32
-# endif
-#endif
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/multiarch/mempcpy-ssse3-rep.S
+++ glibc-2.11.90-9.1//dev/null
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/mempcpy-ssse3-rep.S
+++ glibc-2.11.90-11//dev/null
@@ -1,4 +0,0 @@
-#define USE_AS_MEMPCPY
-#define MEMCPY __mempcpy_ssse3_rep
-#define MEMCPY_CHK __mempcpy_chk_ssse3_rep
-#include "memcpy-ssse3-rep.S"
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/multiarch/mempcpy-ssse3.S
+++ glibc-2.11.90-9.1//dev/null
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/mempcpy-ssse3.S
+++ glibc-2.11.90-11//dev/null
@@ -1,4 +0,0 @@
-#define USE_AS_MEMPCPY
-#define MEMCPY __mempcpy_ssse3
-#define MEMCPY_CHK __mempcpy_chk_ssse3
-#include "memcpy-ssse3.S"
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/multiarch/mempcpy.S
+++ glibc-2.11.90-9.1//dev/null
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/mempcpy.S
+++ glibc-2.11.90-11//dev/null
@@ -1,93 +0,0 @@
-/* Multiple versions of mempcpy
- Copyright (C) 2010 Free Software Foundation, Inc.
@ -5677,8 +5677,8 @@
-#endif
-
-#include "../mempcpy.S"
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/multiarch/mempcpy_chk.S
+++ glibc-2.11.90-9.1//dev/null
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/mempcpy_chk.S
+++ glibc-2.11.90-11//dev/null
@@ -1,64 +0,0 @@
-/* Multiple versions of __mempcpy_chk
- Copyright (C) 2010 Free Software Foundation, Inc.
@ -5744,8 +5744,8 @@
-# include "../mempcpy_chk.S"
-# endif
-#endif
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/multiarch/memset-sse2-rep.S
+++ glibc-2.11.90-9.1//dev/null
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/memset-sse2-rep.S
+++ glibc-2.11.90-11//dev/null
@@ -1,821 +0,0 @@
-/* memset with SSE2 and REP string.
- Copyright (C) 2010 Free Software Foundation, Inc.
@ -6568,8 +6568,8 @@
-END (__memset_sse2_rep)
-
-#endif
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/multiarch/memset-sse2.S
+++ glibc-2.11.90-9.1//dev/null
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/memset-sse2.S
+++ glibc-2.11.90-11//dev/null
@@ -1,867 +0,0 @@
-/* memset with SSE2
- Copyright (C) 2010 Free Software Foundation, Inc.
@ -7438,8 +7438,8 @@
-END (__memset_sse2)
-
-#endif
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/multiarch/memset.S
+++ glibc-2.11.90-9.1//dev/null
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/memset.S
+++ glibc-2.11.90-11//dev/null
@@ -1,112 +0,0 @@
-/* Multiple versions of memset
- Copyright (C) 2010 Free Software Foundation, Inc.
@ -7553,8 +7553,8 @@
-#endif
-
-#include "../memset.S"
--- glibc-2.11-158-ge3b7670/sysdeps/i386/i686/multiarch/memset_chk.S
+++ glibc-2.11.90-9.1//dev/null
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/memset_chk.S
+++ glibc-2.11.90-11//dev/null
@@ -1,116 +0,0 @@
-/* Multiple versions of __memset_chk
- Copyright (C) 2010 Free Software Foundation, Inc.
@ -7672,8 +7672,8 @@
- .size __memset_chk_ia32, .-__memset_chk_ia32
-# endif
-#endif
--- glibc-2.11-158-ge3b7670/sysdeps/i386/sysdep.h
+++ glibc-2.11.90-9.1/sysdeps/i386/sysdep.h
--- glibc-2.11-175-gb34e12e/sysdeps/i386/sysdep.h
+++ glibc-2.11.90-11/sysdeps/i386/sysdep.h
@@ -67,9 +67,6 @@
ASM_SIZE_DIRECTIVE(name) \
STABS_FUN_END(name)
@ -7684,8 +7684,8 @@
#ifdef HAVE_CPP_ASM_DEBUGINFO
/* Disable that goop, because we just pass -g through to the assembler
and it generates proper line number information directly. */
--- glibc-2.11-158-ge3b7670/sysdeps/ia64/Makefile
+++ glibc-2.11.90-9.1/sysdeps/ia64/Makefile
--- glibc-2.11-175-gb34e12e/sysdeps/ia64/Makefile
+++ glibc-2.11.90-11/sysdeps/ia64/Makefile
@@ -12,8 +12,8 @@ elide-routines.os += hp-timing
ifeq (yes,$(build-shared))
@ -7697,8 +7697,8 @@
endif
endif
--- glibc-2.11-158-ge3b7670/sysdeps/ia64/ia64libgcc.S
+++ glibc-2.11.90-9.1/sysdeps/ia64/ia64libgcc.S
--- glibc-2.11-175-gb34e12e/sysdeps/ia64/ia64libgcc.S
+++ glibc-2.11.90-11/sysdeps/ia64/ia64libgcc.S
@@ -1,350 +0,0 @@
-/* From the Intel IA-64 Optimization Guide, choose the minimum latency
- alternative. */
@ -8050,8 +8050,8 @@
- .symver ___multi3, __multi3@GLIBC_2.2
-
-#endif
--- glibc-2.11-158-ge3b7670/sysdeps/ia64/libgcc-compat.c
+++ glibc-2.11.90-9.1/sysdeps/ia64/libgcc-compat.c
--- glibc-2.11-175-gb34e12e/sysdeps/ia64/libgcc-compat.c
+++ glibc-2.11.90-11/sysdeps/ia64/libgcc-compat.c
@@ -0,0 +1,84 @@
+/* pre-.hidden libgcc compatibility
+ Copyright (C) 2002 Free Software Foundation, Inc.
@ -8137,8 +8137,8 @@
+symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
+
+#endif
--- glibc-2.11-158-ge3b7670/sysdeps/powerpc/powerpc64/Makefile
+++ glibc-2.11.90-9.1/sysdeps/powerpc/powerpc64/Makefile
--- glibc-2.11-175-gb34e12e/sysdeps/powerpc/powerpc64/Makefile
+++ glibc-2.11.90-11/sysdeps/powerpc/powerpc64/Makefile
@@ -30,6 +30,7 @@ ifneq ($(elf),no)
# we use -fpic instead which is much better.
CFLAGS-initfini.s += -fpic -O1
@ -8147,8 +8147,8 @@
endif
ifeq ($(subdir),elf)
--- glibc-2.11-158-ge3b7670/sysdeps/unix/nice.c
+++ glibc-2.11.90-9.1/sysdeps/unix/nice.c
--- glibc-2.11-175-gb34e12e/sysdeps/unix/nice.c
+++ glibc-2.11.90-11/sysdeps/unix/nice.c
@@ -42,7 +42,12 @@ nice (int incr)
__set_errno (save);
}
@ -8163,8 +8163,8 @@
if (result == -1)
{
if (errno == EACCES)
--- glibc-2.11-158-ge3b7670/sysdeps/unix/sysv/linux/check_pf.c
+++ glibc-2.11.90-9.1/sysdeps/unix/sysv/linux/check_pf.c
--- glibc-2.11-175-gb34e12e/sysdeps/unix/sysv/linux/check_pf.c
+++ glibc-2.11.90-11/sysdeps/unix/sysv/linux/check_pf.c
@@ -27,13 +27,10 @@
#include <unistd.h>
#include <sys/socket.h>
@ -8180,8 +8180,8 @@
#ifndef IFA_F_HOMEADDRESS
# define IFA_F_HOMEADDRESS 0
--- glibc-2.11-158-ge3b7670/sysdeps/unix/sysv/linux/dl-osinfo.h
+++ glibc-2.11.90-9.1/sysdeps/unix/sysv/linux/dl-osinfo.h
--- glibc-2.11-175-gb34e12e/sysdeps/unix/sysv/linux/dl-osinfo.h
+++ glibc-2.11.90-11/sysdeps/unix/sysv/linux/dl-osinfo.h
@@ -17,10 +17,13 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
@ -8229,8 +8229,8 @@
}
else
#endif
--- glibc-2.11-158-ge3b7670/sysdeps/unix/sysv/linux/futimesat.c
+++ glibc-2.11.90-9.1/sysdeps/unix/sysv/linux/futimesat.c
--- glibc-2.11-175-gb34e12e/sysdeps/unix/sysv/linux/futimesat.c
+++ glibc-2.11.90-11/sysdeps/unix/sysv/linux/futimesat.c
@@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
{
int result;
@ -8273,8 +8273,8 @@
{
size_t filelen = strlen (file);
if (__builtin_expect (filelen == 0, 0))
--- glibc-2.11-158-ge3b7670/sysdeps/unix/sysv/linux/i386/dl-cache.h
+++ glibc-2.11.90-9.1/sysdeps/unix/sysv/linux/i386/dl-cache.h
--- glibc-2.11-175-gb34e12e/sysdeps/unix/sysv/linux/i386/dl-cache.h
+++ glibc-2.11.90-11/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.
@ -8335,8 +8335,8 @@
+ } while (0)
+
+#include_next <dl-cache.h>
--- glibc-2.11-158-ge3b7670/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+++ glibc-2.11.90-9.1/sysdeps/unix/sysv/linux/ia64/dl-cache.h
--- glibc-2.11-175-gb34e12e/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+++ glibc-2.11.90-11/sysdeps/unix/sysv/linux/ia64/dl-cache.h
@@ -22,4 +22,31 @@
#define _dl_cache_check_flags(flags) \
((flags) == _DL_CACHE_DEFAULT_ID)
@ -8369,29 +8369,29 @@
+ } while (0)
+
#include_next <dl-cache.h>
--- glibc-2.11-158-ge3b7670/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+++ glibc-2.11.90-9.1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
--- glibc-2.11-175-gb34e12e/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+++ glibc-2.11.90-11/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
@@ -0,0 +1,5 @@
+#ifdef IS_IN_ldconfig
+#include <sysdeps/i386/dl-procinfo.c>
+#else
+#include <sysdeps/generic/dl-procinfo.c>
+#endif
--- glibc-2.11-158-ge3b7670/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+++ glibc-2.11.90-9.1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
--- glibc-2.11-175-gb34e12e/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+++ glibc-2.11.90-11/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
@@ -0,0 +1,5 @@
+#ifdef IS_IN_ldconfig
+#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
+#else
+#include <sysdeps/generic/dl-procinfo.h>
+#endif
--- glibc-2.11-158-ge3b7670/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+++ glibc-2.11.90-9.1/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
--- glibc-2.11-175-gb34e12e/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+++ glibc-2.11.90-11/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-158-ge3b7670/sysdeps/unix/sysv/linux/netlinkaccess.h
+++ glibc-2.11.90-9.1/sysdeps/unix/sysv/linux/netlinkaccess.h
--- glibc-2.11-175-gb34e12e/sysdeps/unix/sysv/linux/netlinkaccess.h
+++ glibc-2.11.90-11/sysdeps/unix/sysv/linux/netlinkaccess.h
@@ -25,6 +25,24 @@
#include <kernel-features.h>
@ -8417,8 +8417,8 @@
struct netlink_res
{
--- glibc-2.11-158-ge3b7670/sysdeps/unix/sysv/linux/paths.h
+++ glibc-2.11.90-9.1/sysdeps/unix/sysv/linux/paths.h
--- glibc-2.11-175-gb34e12e/sysdeps/unix/sysv/linux/paths.h
+++ glibc-2.11.90-11/sysdeps/unix/sysv/linux/paths.h
@@ -62,7 +62,7 @@
#define _PATH_TTY "/dev/tty"
#define _PATH_UNIX "/boot/vmlinux"
@ -8428,8 +8428,8 @@
#define _PATH_WTMP "/var/log/wtmp"
/* Provide trailing slash, since mostly used for building pathnames. */
--- glibc-2.11-158-ge3b7670/sysdeps/unix/sysv/linux/tcsetattr.c
+++ glibc-2.11.90-9.1/sysdeps/unix/sysv/linux/tcsetattr.c
--- glibc-2.11-175-gb34e12e/sysdeps/unix/sysv/linux/tcsetattr.c
+++ glibc-2.11.90-11/sysdeps/unix/sysv/linux/tcsetattr.c
@@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
{
struct __kernel_termios k_termios;
@ -8475,8 +8475,8 @@
+ return retval;
}
libc_hidden_def (tcsetattr)
--- glibc-2.11-158-ge3b7670/sysdeps/x86_64/cacheinfo.c
+++ glibc-2.11.90-9.1/sysdeps/x86_64/cacheinfo.c
--- glibc-2.11-175-gb34e12e/sysdeps/x86_64/cacheinfo.c
+++ glibc-2.11.90-11/sysdeps/x86_64/cacheinfo.c
@@ -74,7 +74,6 @@ static const struct intel_02_cache_info
{ 0x0a, 2, 32, M(_SC_LEVEL1_DCACHE_SIZE), 8192 },
{ 0x0c, 4, 32, M(_SC_LEVEL1_DCACHE_SIZE), 16384 },
@ -8517,8 +8517,8 @@
if (shared > 0)
{
--- glibc-2.11-158-ge3b7670/sysdeps/x86_64/multiarch/ifunc-defines.sym
+++ glibc-2.11.90-9.1/sysdeps/x86_64/multiarch/ifunc-defines.sym
--- glibc-2.11-175-gb34e12e/sysdeps/x86_64/multiarch/ifunc-defines.sym
+++ glibc-2.11.90-11/sysdeps/x86_64/multiarch/ifunc-defines.sym
@@ -13,8 +13,5 @@ CPUID_ECX_OFFSET offsetof (struct cpuid_registers, ecx)
CPUID_EDX_OFFSET offsetof (struct cpuid_registers, edx)
FAMILY_OFFSET offsetof (struct cpu_features, family)
@ -8528,8 +8528,8 @@
COMMON_CPUID_INDEX_1
-FEATURE_INDEX_1
--- glibc-2.11-158-ge3b7670/sysdeps/x86_64/multiarch/init-arch.c
+++ glibc-2.11.90-9.1/sysdeps/x86_64/multiarch/init-arch.c
--- glibc-2.11-175-gb34e12e/sysdeps/x86_64/multiarch/init-arch.c
+++ glibc-2.11.90-11/sysdeps/x86_64/multiarch/init-arch.c
@@ -64,23 +64,7 @@ __init_cpu_features (void)
__cpu_features.model += extended_model;
}
@ -8555,8 +8555,8 @@
}
/* This spells out "AuthenticAMD". */
else if (ebx == 0x68747541 && ecx == 0x444d4163 && edx == 0x69746e65)
--- glibc-2.11-158-ge3b7670/sysdeps/x86_64/multiarch/init-arch.h
+++ glibc-2.11.90-9.1/sysdeps/x86_64/multiarch/init-arch.h
--- glibc-2.11-175-gb34e12e/sysdeps/x86_64/multiarch/init-arch.h
+++ glibc-2.11.90-11/sysdeps/x86_64/multiarch/init-arch.h
@@ -16,8 +16,6 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
@ -8604,8 +8604,8 @@
-#define index_Fast_Rep_String FEATURE_INDEX_1
-
#endif /* __ASSEMBLER__ */
--- glibc-2.11-158-ge3b7670/timezone/zic.c
+++ glibc-2.11.90-9.1/timezone/zic.c
--- glibc-2.11-175-gb34e12e/timezone/zic.c
+++ glibc-2.11.90-11/timezone/zic.c
@@ -1921,7 +1921,7 @@ const int zonecount;
if (stdrp != NULL && stdrp->r_hiyear == 2037)
return;

13
glibc.spec
View File

@ -1,4 +1,4 @@
%define glibcsrcdir glibc-2.11-158-ge3b7670
%define glibcsrcdir glibc-2.11-175-gb34e12e
%define glibcversion 2.11.90
### glibc.spec.in follows:
%define run_glibc_tests 1
@ -24,7 +24,7 @@
Summary: The GNU libc libraries
Name: glibc
Version: %{glibcversion}
Release: 10
Release: 11
# 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
@ -1033,6 +1033,15 @@ rm -f *.filelist*
%endif
%changelog
* Mon Feb 1 2010 Andreas Schwab <schwab@redhat.com> - 2.11.90-11
- Update from master
- Fix error checking in iconv (#558053)
- Don't map U00DF to U1E9E in toupper table
- _nl_load_locale() incorrectly handles mmap() failures (BZ#11200)
- Fix various issues in regex matcher (BZ#11183, BZ#11184, BZ#11185,
BZ#11186, BZ#11187, BZ#11188, BZ#11189, BZ#11190, BZ#11191,
BZ#11192, BZ#11193)
* Tue Jan 19 2010 Andreas Schwab <schwab@redhat.com> - 2.11.90-10
- Update from master
- Fix ____longjmp_chk for s390/s390x

1
import.log
View File

@ -42,3 +42,4 @@ glibc-2_11_90-7:HEAD:glibc-2.11.90-7.src.rpm:1263223934
glibc-2_11_90-8:HEAD:glibc-2.11.90-8.src.rpm:1263312973
glibc-2_11_90-9:HEAD:glibc-2.11.90-9.src.rpm:1263553804
glibc-2_11_90-10:HEAD:glibc-2.11.90-10.src.rpm:1264006094
glibc-2_11_90-11:HEAD:glibc-2.11.90-11.src.rpm:1265032871

4
sources
View File

@ -1,2 +1,2 @@
1d47c3ebe971db5695399bc772f29855 glibc-2.11-158-ge3b7670-fedora.tar.bz2
2a28794deb6808713c47982c2193e574 glibc-2.11-158-ge3b7670.tar.bz2
155e8075781b82df5980d4f100b6d85f glibc-2.11-175-gb34e12e-fedora.tar.bz2
4e2d854478870bee708fee7bf24d7d9c glibc-2.11-175-gb34e12e.tar.bz2