rpms/glibc
7
0
Fork 1
Code Issues Pull Requests Releases Activity

2.11.90-12

Browse Source
This commit is contained in:
Andreas Schwab 2010-02-08 15:32:13 +00:00
parent 3b8ebb3a56
commit f3e82c414e
5 changed files with 252 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-175-gb34e12e-fedora.tar.bz2 glibc-2.11-188-g0cbcca8-fedora.tar.bz2
glibc-2.11-175-gb34e12e.tar.bz2 glibc-2.11-188-g0cbcca8.tar.bz2

419
glibc-fedora.patch
View File

@ -1,6 +1,23 @@
--- glibc-2.11-175-gb34e12e/ChangeLog --- glibc-2.11-188-g0cbcca8/ChangeLog
+++ glibc-2.11.90-11/ChangeLog +++ glibc-2.11.90-12/ChangeLog
@@ -237,68 +237,6 @@ @@ -1,3 +1,16 @@
+2009-10-27 Aurelien Jarno <aurelien@aurel32.net>
+
+ [BZ #10855]
+ * locale/programs/locarchive.c: use MMAP_SHARED to reserve memory
+ used later with MMAP_FIXED | MMAP_SHARED to cope with different
+ alignment restrictions.
+
+2010-02-08 Andreas Schwab <schwab@redhat.com>
+
+ [BZ #11155]
+ * sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c: Include i386
+ version.
+
2010-02-05 H.J. Lu <hongjiu.lu@intel.com>
[BZ #11230]
@@ -274,68 +287,6 @@
* posix/sched.h: Define time_t and pid_t for XPG7. * posix/sched.h: Define time_t and pid_t for XPG7.
@ -69,7 +86,7 @@
2010-01-12 Ulrich Drepper <drepper@redhat.com> 2010-01-12 Ulrich Drepper <drepper@redhat.com>
* conform/data/sys/select.h-data: Fix up for XPG7. * conform/data/sys/select.h-data: Fix up for XPG7.
@@ -1903,6 +1841,11 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com> @@ -1940,6 +1891,11 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com>
* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in * sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in
the unique symbol hash table should not be const. the unique symbol hash table should not be const.
@ -81,7 +98,7 @@
2009-07-21 Ulrich Drepper <drepper@redhat.com> 2009-07-21 Ulrich Drepper <drepper@redhat.com>
* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove * sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove
@@ -2168,6 +2111,11 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com> @@ -2205,6 +2161,11 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com>
out common code into new function get_common_indeces. Determine out common code into new function get_common_indeces. Determine
extended family and model for Intel processors. extended family and model for Intel processors.
@ -93,7 +110,7 @@
2009-06-26 Ulrich Drepper <drepper@redhat.com> 2009-06-26 Ulrich Drepper <drepper@redhat.com>
* resolv/resolv.h: Define RES_SNGLKUPREOP. * resolv/resolv.h: Define RES_SNGLKUPREOP.
@@ -10861,6 +10809,10 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com> @@ -10898,6 +10859,10 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com>
[BZ #4368] [BZ #4368]
* stdlib/stdlib.h: Remove obsolete part of comment for realpath. * stdlib/stdlib.h: Remove obsolete part of comment for realpath.
@ -104,7 +121,7 @@
2007-04-16 Ulrich Drepper <drepper@redhat.com> 2007-04-16 Ulrich Drepper <drepper@redhat.com>
[BZ #4364] [BZ #4364]
@@ -12118,6 +12070,15 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com> @@ -12155,6 +12120,15 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com>
separators also if no non-zero digits found. separators also if no non-zero digits found.
* stdlib/Makefile (tests): Add tst-strtod3. * stdlib/Makefile (tests): Add tst-strtod3.
@ -120,8 +137,8 @@
2006-12-09 Ulrich Drepper <drepper@redhat.com> 2006-12-09 Ulrich Drepper <drepper@redhat.com>
[BZ #3632] [BZ #3632]
--- glibc-2.11-175-gb34e12e/ChangeLog.15 --- glibc-2.11-188-g0cbcca8/ChangeLog.15
+++ glibc-2.11.90-11/ChangeLog.15 +++ glibc-2.11.90-12/ChangeLog.15
@@ -477,6 +477,14 @@ @@ -477,6 +477,14 @@
2004-11-26 Jakub Jelinek <jakub@redhat.com> 2004-11-26 Jakub Jelinek <jakub@redhat.com>
@ -187,8 +204,8 @@
2004-08-30 Roland McGrath <roland@frob.com> 2004-08-30 Roland McGrath <roland@frob.com>
* scripts/extract-abilist.awk: If `lastversion' variable defined, omit * scripts/extract-abilist.awk: If `lastversion' variable defined, omit
--- glibc-2.11-175-gb34e12e/ChangeLog.16 --- glibc-2.11-188-g0cbcca8/ChangeLog.16
+++ glibc-2.11.90-11/ChangeLog.16 +++ glibc-2.11.90-12/ChangeLog.16
@@ -2042,6 +2042,9 @@ @@ -2042,6 +2042,9 @@
(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
followed by __THROW. followed by __THROW.
@ -242,8 +259,8 @@
2005-07-28 Thomas Schwinge <schwinge@nic-nac-project.de> 2005-07-28 Thomas Schwinge <schwinge@nic-nac-project.de>
[BZ #1137] [BZ #1137]
--- glibc-2.11-175-gb34e12e/Makeconfig --- glibc-2.11-188-g0cbcca8/Makeconfig
+++ glibc-2.11.90-11/Makeconfig +++ glibc-2.11.90-12/Makeconfig
@@ -780,12 +780,12 @@ endif @@ -780,12 +780,12 @@ endif
# The assembler can generate debug information too. # The assembler can generate debug information too.
ifndef ASFLAGS ifndef ASFLAGS
@ -260,8 +277,8 @@
ifndef BUILD_CC ifndef BUILD_CC
BUILD_CC = $(CC) BUILD_CC = $(CC)
--- glibc-2.11-175-gb34e12e/csu/Makefile --- glibc-2.11-188-g0cbcca8/csu/Makefile
+++ glibc-2.11.90-11/csu/Makefile +++ glibc-2.11.90-12/csu/Makefile
@@ -93,7 +93,8 @@ omit-deps += $(crtstuff) @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
$(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
$(compile.S) -g0 $(ASFLAGS-.os) -o $@ $(compile.S) -g0 $(ASFLAGS-.os) -o $@
@ -272,8 +289,8 @@
vpath initfini.c $(sysdirs) vpath initfini.c $(sysdirs)
--- glibc-2.11-175-gb34e12e/csu/elf-init.c --- glibc-2.11-188-g0cbcca8/csu/elf-init.c
+++ glibc-2.11.90-11/csu/elf-init.c +++ glibc-2.11.90-12/csu/elf-init.c
@@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **) @@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **)
extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_start []) (void) attribute_hidden;
extern void (*__fini_array_end []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden;
@ -298,8 +315,8 @@
/* These function symbols are provided for the .init/.fini section entry /* These function symbols are provided for the .init/.fini section entry
points automagically by the linker. */ points automagically by the linker. */
--- glibc-2.11-175-gb34e12e/debug/tst-chk1.c --- glibc-2.11-188-g0cbcca8/debug/tst-chk1.c
+++ glibc-2.11.90-11/debug/tst-chk1.c +++ glibc-2.11.90-12/debug/tst-chk1.c
@@ -17,6 +17,9 @@ @@ -17,6 +17,9 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */ 02111-1307 USA. */
@ -328,8 +345,8 @@
# define O 0 # define O 0
# else # else
# define O 1 # define O 1
--- glibc-2.11-175-gb34e12e/elf/ldconfig.c --- glibc-2.11-188-g0cbcca8/elf/ldconfig.c
+++ glibc-2.11.90-11/elf/ldconfig.c +++ glibc-2.11.90-12/elf/ldconfig.c
@@ -1020,17 +1020,19 @@ search_dirs (void) @@ -1020,17 +1020,19 @@ search_dirs (void)
@ -411,8 +428,8 @@
} }
if (! opt_ignore_aux_cache) if (! opt_ignore_aux_cache)
--- glibc-2.11-175-gb34e12e/elf/tst-stackguard1.c --- glibc-2.11-188-g0cbcca8/elf/tst-stackguard1.c
+++ glibc-2.11.90-11/elf/tst-stackguard1.c +++ glibc-2.11.90-12/elf/tst-stackguard1.c
@@ -160,17 +160,21 @@ do_test (void) @@ -160,17 +160,21 @@ do_test (void)
the 16 runs, something is very wrong. */ the 16 runs, something is very wrong. */
int ndifferences = 0; int ndifferences = 0;
@ -437,16 +454,16 @@
{ {
puts ("stack guard canaries are not randomized enough"); puts ("stack guard canaries are not randomized enough");
puts ("nor equal to the default canary value"); puts ("nor equal to the default canary value");
--- glibc-2.11-175-gb34e12e/include/bits/stdlib-ldbl.h --- glibc-2.11-188-g0cbcca8/include/bits/stdlib-ldbl.h
+++ glibc-2.11.90-11/include/bits/stdlib-ldbl.h +++ glibc-2.11.90-12/include/bits/stdlib-ldbl.h
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+#include <stdlib/bits/stdlib-ldbl.h> +#include <stdlib/bits/stdlib-ldbl.h>
--- glibc-2.11-175-gb34e12e/include/bits/wchar-ldbl.h --- glibc-2.11-188-g0cbcca8/include/bits/wchar-ldbl.h
+++ glibc-2.11.90-11/include/bits/wchar-ldbl.h +++ glibc-2.11.90-12/include/bits/wchar-ldbl.h
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+#include <wcsmbs/bits/wchar-ldbl.h> +#include <wcsmbs/bits/wchar-ldbl.h>
--- glibc-2.11-175-gb34e12e/include/features.h --- glibc-2.11-188-g0cbcca8/include/features.h
+++ glibc-2.11.90-11/include/features.h +++ glibc-2.11.90-12/include/features.h
@@ -308,8 +308,13 @@ @@ -308,8 +308,13 @@
#endif #endif
@ -463,8 +480,8 @@
# define __USE_FORTIFY_LEVEL 2 # define __USE_FORTIFY_LEVEL 2
# else # else
# define __USE_FORTIFY_LEVEL 1 # define __USE_FORTIFY_LEVEL 1
--- glibc-2.11-175-gb34e12e/intl/locale.alias --- glibc-2.11-188-g0cbcca8/intl/locale.alias
+++ glibc-2.11.90-11/intl/locale.alias +++ glibc-2.11.90-12/intl/locale.alias
@@ -57,8 +57,6 @@ korean ko_KR.eucKR @@ -57,8 +57,6 @@ korean ko_KR.eucKR
korean.euc ko_KR.eucKR korean.euc ko_KR.eucKR
ko_KR ko_KR.eucKR ko_KR ko_KR.eucKR
@ -474,8 +491,8 @@
norwegian nb_NO.ISO-8859-1 norwegian nb_NO.ISO-8859-1
nynorsk nn_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1
polish pl_PL.ISO-8859-2 polish pl_PL.ISO-8859-2
--- glibc-2.11-175-gb34e12e/libio/stdio.h --- glibc-2.11-188-g0cbcca8/libio/stdio.h
+++ glibc-2.11.90-11/libio/stdio.h +++ glibc-2.11.90-12/libio/stdio.h
@@ -165,10 +165,12 @@ typedef _G_fpos64_t fpos64_t; @@ -165,10 +165,12 @@ typedef _G_fpos64_t fpos64_t;
extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdin; /* Standard input stream. */
extern struct _IO_FILE *stdout; /* Standard output stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */
@ -489,8 +506,8 @@
__BEGIN_NAMESPACE_STD __BEGIN_NAMESPACE_STD
/* Remove file FILENAME. */ /* Remove file FILENAME. */
--- glibc-2.11-175-gb34e12e/locale/iso-4217.def --- glibc-2.11-188-g0cbcca8/locale/iso-4217.def
+++ glibc-2.11.90-11/locale/iso-4217.def +++ glibc-2.11.90-12/locale/iso-4217.def
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
* *
* !!! The list has to be sorted !!! * !!! The list has to be sorted !!!
@ -582,8 +599,17 @@
DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */
DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("QAR") /* Qatar Rial */
DEFINE_INT_CURR("ROL") /* Romanian Leu */ DEFINE_INT_CURR("ROL") /* Romanian Leu */
--- glibc-2.11-175-gb34e12e/locale/programs/locarchive.c --- glibc-2.11-188-g0cbcca8/locale/programs/locarchive.c
+++ glibc-2.11.90-11/locale/programs/locarchive.c +++ glibc-2.11.90-12/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;
if (total < reserved
- && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
+ && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
-1, 0)) != MAP_FAILED))
xflags = MAP_FIXED;
else
@@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const void *b) @@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const void *b)
/* forward decls for below */ /* forward decls for below */
static uint32_t add_locale (struct locarhandle *ah, const char *name, static uint32_t add_locale (struct locarhandle *ah, const char *name,
@ -597,6 +623,24 @@
static bool static bool
@@ -396,7 +396,7 @@ enlarge_archive (struct locarhandle *ah, const struct locarhead *head)
size_t reserved = RESERVE_MMAP_SIZE;
int xflags = 0;
if (total < reserved
- && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
+ && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
-1, 0)) != MAP_FAILED))
xflags = MAP_FIXED;
else
@@ -614,7 +614,7 @@ open_archive (struct locarhandle *ah, bool readonly)
int xflags = 0;
void *p;
if (st.st_size < reserved
- && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
+ && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
-1, 0)) != MAP_FAILED))
xflags = MAP_FIXED;
else
@@ -649,7 +649,7 @@ close_archive (struct locarhandle *ah) @@ -649,7 +649,7 @@ close_archive (struct locarhandle *ah)
#include "../../intl/explodename.c" #include "../../intl/explodename.c"
#include "../../intl/l10nflist.c" #include "../../intl/l10nflist.c"
@ -615,8 +659,8 @@
add_alias (struct locarhandle *ah, const char *alias, bool replace, add_alias (struct locarhandle *ah, const char *alias, bool replace,
const char *oldname, uint32_t *locrec_offset_p) const char *oldname, uint32_t *locrec_offset_p)
{ {
--- glibc-2.11-175-gb34e12e/localedata/Makefile --- glibc-2.11-188-g0cbcca8/localedata/Makefile
+++ glibc-2.11.90-11/localedata/Makefile +++ glibc-2.11.90-12/localedata/Makefile
@@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
echo -n '...'; \ echo -n '...'; \
input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@ -625,8 +669,8 @@
-i locales/$$input -c -f charmaps/$$charset \ -i locales/$$input -c -f charmaps/$$charset \
$(addprefix --prefix=,$(install_root)) $$locale; \ $(addprefix --prefix=,$(install_root)) $$locale; \
echo ' done'; \ echo ' done'; \
--- glibc-2.11-175-gb34e12e/localedata/SUPPORTED --- glibc-2.11-188-g0cbcca8/localedata/SUPPORTED
+++ glibc-2.11.90-11/localedata/SUPPORTED +++ glibc-2.11.90-12/localedata/SUPPORTED
@@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \ @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
cy_GB/ISO-8859-14 \ cy_GB/ISO-8859-14 \
da_DK.UTF-8/UTF-8 \ da_DK.UTF-8/UTF-8 \
@ -668,8 +712,8 @@
ta_IN/UTF-8 \ ta_IN/UTF-8 \
te_IN/UTF-8 \ te_IN/UTF-8 \
tg_TJ.UTF-8/UTF-8 \ tg_TJ.UTF-8/UTF-8 \
--- glibc-2.11-175-gb34e12e/localedata/locales/cy_GB --- glibc-2.11-188-g0cbcca8/localedata/locales/cy_GB
+++ glibc-2.11.90-11/localedata/locales/cy_GB +++ glibc-2.11.90-12/localedata/locales/cy_GB
@@ -248,8 +248,11 @@ mon "<U0049><U006F><U006E><U0061><U0077><U0072>";/ @@ -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_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>" d_fmt "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@ -684,8 +728,8 @@
END LC_TIME END LC_TIME
LC_MESSAGES LC_MESSAGES
--- glibc-2.11-175-gb34e12e/localedata/locales/en_GB --- glibc-2.11-188-g0cbcca8/localedata/locales/en_GB
+++ glibc-2.11.90-11/localedata/locales/en_GB +++ glibc-2.11.90-12/localedata/locales/en_GB
@@ -116,8 +116,8 @@ mon "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/ @@ -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_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>" d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@ -697,8 +741,8 @@
date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/ date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/ <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
<U0025><U005A><U0020><U0025><U0059>" <U0025><U005A><U0020><U0025><U0059>"
--- glibc-2.11-175-gb34e12e/localedata/locales/no_NO --- glibc-2.11-188-g0cbcca8/localedata/locales/no_NO
+++ glibc-2.11.90-11/localedata/locales/no_NO +++ glibc-2.11.90-12/localedata/locales/no_NO
@@ -0,0 +1,69 @@ @@ -0,0 +1,69 @@
+escape_char / +escape_char /
+comment_char % +comment_char %
@ -769,8 +813,8 @@
+LC_ADDRESS +LC_ADDRESS
+copy "nb_NO" +copy "nb_NO"
+END LC_ADDRESS +END LC_ADDRESS
--- glibc-2.11-175-gb34e12e/localedata/locales/zh_TW --- glibc-2.11-188-g0cbcca8/localedata/locales/zh_TW
+++ glibc-2.11.90-11/localedata/locales/zh_TW +++ glibc-2.11.90-12/localedata/locales/zh_TW
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
comment_char % comment_char %
escape_char / escape_char /
@ -798,8 +842,8 @@
revision "0.2" revision "0.2"
date "2000-08-02" date "2000-08-02"
% %
--- glibc-2.11-175-gb34e12e/malloc/mcheck.c --- glibc-2.11-188-g0cbcca8/malloc/mcheck.c
+++ glibc-2.11.90-11/malloc/mcheck.c +++ glibc-2.11.90-12/malloc/mcheck.c
@@ -24,9 +24,25 @@ @@ -24,9 +24,25 @@
# include <mcheck.h> # include <mcheck.h>
# include <stdint.h> # include <stdint.h>
@ -875,8 +919,8 @@
old_free_hook = __free_hook; old_free_hook = __free_hook;
__free_hook = freehook; __free_hook = freehook;
--- glibc-2.11-175-gb34e12e/manual/libc.texinfo --- glibc-2.11-188-g0cbcca8/manual/libc.texinfo
+++ glibc-2.11.90-11/manual/libc.texinfo +++ glibc-2.11.90-12/manual/libc.texinfo
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
@c setchapternewpage odd @c setchapternewpage odd
@ -886,8 +930,8 @@
@direntry @direntry
* Libc: (libc). C library. * Libc: (libc). C library.
@end direntry @end direntry
--- glibc-2.11-175-gb34e12e/misc/sys/cdefs.h --- glibc-2.11-188-g0cbcca8/misc/sys/cdefs.h
+++ glibc-2.11.90-11/misc/sys/cdefs.h +++ glibc-2.11.90-12/misc/sys/cdefs.h
@@ -132,7 +132,10 @@ @@ -132,7 +132,10 @@
#define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
#define __bos0(ptr) __builtin_object_size (ptr, 0) #define __bos0(ptr) __builtin_object_size (ptr, 0)
@ -931,16 +975,16 @@
# define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack() __builtin_va_arg_pack ()
# define __va_arg_pack_len() __builtin_va_arg_pack_len () # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
#endif #endif
--- glibc-2.11-175-gb34e12e/nis/nss --- glibc-2.11-188-g0cbcca8/nis/nss
+++ glibc-2.11.90-11/nis/nss +++ glibc-2.11.90-12/nis/nss
@@ -25,4 +25,4 @@ @@ -25,4 +25,4 @@
# memory with every getXXent() call. Otherwise each getXXent() call # memory with every getXXent() call. Otherwise each getXXent() call
# might result into a network communication with the server to get # might result into a network communication with the server to get
# the next entry. # the next entry.
-#SETENT_BATCH_READ=TRUE -#SETENT_BATCH_READ=TRUE
+SETENT_BATCH_READ=TRUE +SETENT_BATCH_READ=TRUE
--- glibc-2.11-175-gb34e12e/nptl/ChangeLog --- glibc-2.11-188-g0cbcca8/nptl/ChangeLog
+++ glibc-2.11.90-11/nptl/ChangeLog +++ glibc-2.11.90-12/nptl/ChangeLog
@@ -3834,6 +3834,15 @@ @@ -3834,6 +3834,15 @@
Use __sigfillset. Document that sigfillset does the right thing wrt Use __sigfillset. Document that sigfillset does the right thing wrt
to SIGSETXID. to SIGSETXID.
@ -981,8 +1025,8 @@
2003-07-25 Jakub Jelinek <jakub@redhat.com> 2003-07-25 Jakub Jelinek <jakub@redhat.com>
* tst-cancel17.c (do_test): Check if aio_cancel failed. * tst-cancel17.c (do_test): Check if aio_cancel failed.
--- glibc-2.11-175-gb34e12e/nptl/Makefile --- glibc-2.11-188-g0cbcca8/nptl/Makefile
+++ glibc-2.11.90-11/nptl/Makefile +++ glibc-2.11.90-12/nptl/Makefile
@@ -339,7 +339,8 @@ endif @@ -339,7 +339,8 @@ endif
extra-objs += $(crti-objs) $(crtn-objs) extra-objs += $(crti-objs) $(crtn-objs)
omit-deps += crti crtn omit-deps += crti crtn
@ -1015,8 +1059,8 @@
else else
$(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
endif endif
--- glibc-2.11-175-gb34e12e/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h --- glibc-2.11-188-g0cbcca8/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+++ glibc-2.11.90-11/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +++ glibc-2.11.90-12/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
@@ -189,4 +189,7 @@ @@ -189,4 +189,7 @@
/* Typed memory objects are not available. */ /* Typed memory objects are not available. */
#define _POSIX_TYPED_MEMORY_OBJECTS -1 #define _POSIX_TYPED_MEMORY_OBJECTS -1
@ -1025,8 +1069,8 @@
+#define _XOPEN_STREAMS -1 +#define _XOPEN_STREAMS -1
+ +
#endif /* bits/posix_opt.h */ #endif /* bits/posix_opt.h */
--- glibc-2.11-175-gb34e12e/nptl/sysdeps/unix/sysv/linux/kernel-features.h --- glibc-2.11-188-g0cbcca8/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+++ glibc-2.11.90-11/nptl/sysdeps/unix/sysv/linux/kernel-features.h +++ glibc-2.11.90-12/nptl/sysdeps/unix/sysv/linux/kernel-features.h
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
+#include_next <kernel-features.h> +#include_next <kernel-features.h>
+ +
@ -1034,8 +1078,8 @@
+#ifndef __ASSUME_CLONE_THREAD_FLAGS +#ifndef __ASSUME_CLONE_THREAD_FLAGS
+# define __ASSUME_CLONE_THREAD_FLAGS 1 +# define __ASSUME_CLONE_THREAD_FLAGS 1
+#endif +#endif
--- glibc-2.11-175-gb34e12e/nptl/tst-stackguard1.c --- glibc-2.11-188-g0cbcca8/nptl/tst-stackguard1.c
+++ glibc-2.11.90-11/nptl/tst-stackguard1.c +++ glibc-2.11.90-12/nptl/tst-stackguard1.c
@@ -190,17 +190,21 @@ do_test (void) @@ -190,17 +190,21 @@ do_test (void)
the 16 runs, something is very wrong. */ the 16 runs, something is very wrong. */
int ndifferences = 0; int ndifferences = 0;
@ -1060,8 +1104,8 @@
{ {
puts ("stack guard canaries are not randomized enough"); puts ("stack guard canaries are not randomized enough");
puts ("nor equal to the default canary value"); puts ("nor equal to the default canary value");
--- glibc-2.11-175-gb34e12e/nscd/nscd.conf --- glibc-2.11-188-g0cbcca8/nscd/nscd.conf
+++ glibc-2.11.90-11/nscd/nscd.conf +++ glibc-2.11.90-12/nscd/nscd.conf
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
# logfile /var/log/nscd.log # logfile /var/log/nscd.log
# threads 4 # threads 4
@ -1071,8 +1115,8 @@
# stat-user somebody # stat-user somebody
debug-level 0 debug-level 0
# reload-count 5 # reload-count 5
--- glibc-2.11-175-gb34e12e/nscd/nscd.init --- glibc-2.11-188-g0cbcca8/nscd/nscd.init
+++ glibc-2.11.90-11/nscd/nscd.init +++ glibc-2.11.90-12/nscd/nscd.init
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
# slow naming services like NIS, NIS+, LDAP, or hesiod. # slow naming services like NIS, NIS+, LDAP, or hesiod.
# processname: /usr/sbin/nscd # processname: /usr/sbin/nscd
@ -1144,8 +1188,8 @@
;; ;;
*) *)
echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
--- glibc-2.11-175-gb34e12e/posix/Makefile --- glibc-2.11-188-g0cbcca8/posix/Makefile
+++ glibc-2.11.90-11/posix/Makefile +++ glibc-2.11.90-12/posix/Makefile
@@ -303,15 +303,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ @@ -303,15 +303,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
mv -f $@/$$spec.new $@/$$spec; \ mv -f $@/$$spec.new $@/$$spec; \
done < $(objpfx)getconf.speclist done < $(objpfx)getconf.speclist
@ -1166,8 +1210,8 @@
+ | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
+ > $@.new + > $@.new
mv -f $@.new $@ mv -f $@.new $@
--- glibc-2.11-175-gb34e12e/posix/getconf.speclist.h --- glibc-2.11-188-g0cbcca8/posix/getconf.speclist.h
+++ glibc-2.11.90-11/posix/getconf.speclist.h +++ glibc-2.11.90-12/posix/getconf.speclist.h
@@ -0,0 +1,39 @@ @@ -0,0 +1,39 @@
+#include <unistd.h> +#include <unistd.h>
+const char *START_OF_STRINGS = +const char *START_OF_STRINGS =
@ -1208,8 +1252,8 @@
+"XBS5_LPBIG_OFFBIG" +"XBS5_LPBIG_OFFBIG"
+#endif +#endif
+""; +"";
--- glibc-2.11-175-gb34e12e/streams/Makefile --- glibc-2.11-188-g0cbcca8/streams/Makefile
+++ glibc-2.11.90-11/streams/Makefile +++ glibc-2.11.90-12/streams/Makefile
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
# #
subdir := streams subdir := streams
@ -1219,8 +1263,8 @@
routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach
include ../Rules include ../Rules
--- glibc-2.11-175-gb34e12e/sysdeps/generic/dl-cache.h --- glibc-2.11-188-g0cbcca8/sysdeps/generic/dl-cache.h
+++ glibc-2.11.90-11/sysdeps/generic/dl-cache.h +++ glibc-2.11.90-12/sysdeps/generic/dl-cache.h
@@ -36,6 +36,14 @@ @@ -36,6 +36,14 @@
# define add_system_dir(dir) add_dir (dir) # define add_system_dir(dir) add_dir (dir)
#endif #endif
@ -1236,8 +1280,8 @@
#define CACHEMAGIC "ld.so-1.7.0" #define CACHEMAGIC "ld.so-1.7.0"
/* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another
--- glibc-2.11-175-gb34e12e/sysdeps/i386/Makefile --- glibc-2.11-188-g0cbcca8/sysdeps/i386/Makefile
+++ glibc-2.11.90-11/sysdeps/i386/Makefile +++ glibc-2.11.90-12/sysdeps/i386/Makefile
@@ -2,6 +2,8 @@ @@ -2,6 +2,8 @@
# Every i386 port in use uses gas syntax (I think). # Every i386 port in use uses gas syntax (I think).
asm-CPPFLAGS += -DGAS_SYNTAX asm-CPPFLAGS += -DGAS_SYNTAX
@ -1262,21 +1306,21 @@
endif endif
ifeq ($(subdir),elf) ifeq ($(subdir),elf)
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/bcopy.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/bcopy.S
+++ glibc-2.11.90-11//dev/null +++ glibc-2.11.90-12//dev/null
@@ -1,3 +0,0 @@ @@ -1,3 +0,0 @@
-#define USE_AS_BCOPY -#define USE_AS_BCOPY
-#define memmove bcopy -#define memmove bcopy
-#include <sysdeps/i386/i686/memmove.S> -#include <sysdeps/i386/i686/memmove.S>
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/cacheinfo.c --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/cacheinfo.c
+++ glibc-2.11.90-11/sysdeps/i386/i686/cacheinfo.c +++ glibc-2.11.90-12/sysdeps/i386/i686/cacheinfo.c
@@ -1,4 +1,3 @@ @@ -1,4 +1,3 @@
-#define __x86_64_data_cache_size __x86_data_cache_size -#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_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 __x86_shared_cache_size
#define __x86_64_shared_cache_size_half __x86_shared_cache_size_half #define __x86_64_shared_cache_size_half __x86_shared_cache_size_half
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/memcpy.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/memcpy.S
+++ glibc-2.11.90-11/sysdeps/i386/i686/memcpy.S +++ glibc-2.11.90-12/sysdeps/i386/i686/memcpy.S
@@ -32,11 +32,11 @@ @@ -32,11 +32,11 @@
.text .text
@ -1291,8 +1335,8 @@
#endif #endif
ENTRY (BP_SYM (memcpy)) ENTRY (BP_SYM (memcpy))
ENTER ENTER
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/memmove.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/memmove.S
+++ glibc-2.11.90-11/sysdeps/i386/i686/memmove.S +++ glibc-2.11.90-12/sysdeps/i386/i686/memmove.S
@@ -26,27 +26,18 @@ @@ -26,27 +26,18 @@
#define PARMS LINKAGE+4 /* one spilled register */ #define PARMS LINKAGE+4 /* one spilled register */
@ -1356,8 +1400,8 @@
-#ifndef USE_AS_BCOPY -#ifndef USE_AS_BCOPY
libc_hidden_builtin_def (memmove) libc_hidden_builtin_def (memmove)
-#endif -#endif
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/mempcpy.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/mempcpy.S
+++ glibc-2.11.90-11/sysdeps/i386/i686/mempcpy.S +++ glibc-2.11.90-12/sysdeps/i386/i686/mempcpy.S
@@ -32,11 +32,11 @@ @@ -32,11 +32,11 @@
.text .text
@ -1372,8 +1416,8 @@
#endif #endif
ENTRY (BP_SYM (__mempcpy)) ENTRY (BP_SYM (__mempcpy))
ENTER ENTER
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/memset.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/memset.S
+++ glibc-2.11.90-11/sysdeps/i386/i686/memset.S +++ glibc-2.11.90-12/sysdeps/i386/i686/memset.S
@@ -40,11 +40,11 @@ @@ -40,11 +40,11 @@
.text .text
@ -1388,8 +1432,8 @@
#endif #endif
ENTRY (BP_SYM (memset)) ENTRY (BP_SYM (memset))
ENTER ENTER
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/Makefile --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/multiarch/Makefile
+++ glibc-2.11.90-11/sysdeps/i386/i686/multiarch/Makefile +++ glibc-2.11.90-12/sysdeps/i386/i686/multiarch/Makefile
@@ -4,10 +4,6 @@ gen-as-const-headers += ifunc-defines.sym @@ -4,10 +4,6 @@ gen-as-const-headers += ifunc-defines.sym
endif endif
@ -1401,22 +1445,22 @@
ifeq (yes,$(config-cflags-sse4)) ifeq (yes,$(config-cflags-sse4))
sysdep_routines += strcspn-c strpbrk-c strspn-c strstr-c strcasestr-c sysdep_routines += strcspn-c strpbrk-c strspn-c strstr-c strcasestr-c
CFLAGS-strcspn-c.c += -msse4 CFLAGS-strcspn-c.c += -msse4
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/bcopy-ssse3-rep.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/multiarch/bcopy-ssse3-rep.S
+++ glibc-2.11.90-11//dev/null +++ glibc-2.11.90-12//dev/null
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
-#define USE_AS_MEMMOVE -#define USE_AS_MEMMOVE
-#define USE_AS_BCOPY -#define USE_AS_BCOPY
-#define MEMCPY __bcopy_ssse3_rep -#define MEMCPY __bcopy_ssse3_rep
-#include "memcpy-ssse3-rep.S" -#include "memcpy-ssse3-rep.S"
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/bcopy-ssse3.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/multiarch/bcopy-ssse3.S
+++ glibc-2.11.90-11//dev/null +++ glibc-2.11.90-12//dev/null
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
-#define USE_AS_MEMMOVE -#define USE_AS_MEMMOVE
-#define USE_AS_BCOPY -#define USE_AS_BCOPY
-#define MEMCPY __bcopy_ssse3 -#define MEMCPY __bcopy_ssse3
-#include "memcpy-ssse3.S" -#include "memcpy-ssse3.S"
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/bcopy.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/multiarch/bcopy.S
+++ glibc-2.11.90-11//dev/null +++ glibc-2.11.90-12//dev/null
@@ -1,89 +0,0 @@ @@ -1,89 +0,0 @@
-/* Multiple versions of bcopy -/* Multiple versions of bcopy
- Copyright (C) 2010 Free Software Foundation, Inc. - Copyright (C) 2010 Free Software Foundation, Inc.
@ -1507,20 +1551,20 @@
-#endif -#endif
- -
-#include "../bcopy.S" -#include "../bcopy.S"
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/bzero-sse2-rep.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/multiarch/bzero-sse2-rep.S
+++ glibc-2.11.90-11//dev/null +++ glibc-2.11.90-12//dev/null
@@ -1,3 +0,0 @@ @@ -1,3 +0,0 @@
-#define USE_AS_BZERO -#define USE_AS_BZERO
-#define __memset_sse2_rep __bzero_sse2_rep -#define __memset_sse2_rep __bzero_sse2_rep
-#include "memset-sse2-rep.S" -#include "memset-sse2-rep.S"
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/bzero-sse2.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/multiarch/bzero-sse2.S
+++ glibc-2.11.90-11//dev/null +++ glibc-2.11.90-12//dev/null
@@ -1,3 +0,0 @@ @@ -1,3 +0,0 @@
-#define USE_AS_BZERO -#define USE_AS_BZERO
-#define __memset_sse2 __bzero_sse2 -#define __memset_sse2 __bzero_sse2
-#include "memset-sse2.S" -#include "memset-sse2.S"
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/bzero.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/multiarch/bzero.S
+++ glibc-2.11.90-11//dev/null +++ glibc-2.11.90-12//dev/null
@@ -1,97 +0,0 @@ @@ -1,97 +0,0 @@
-/* Multiple versions of bzero -/* Multiple versions of bzero
- Copyright (C) 2010 Free Software Foundation, Inc. - Copyright (C) 2010 Free Software Foundation, Inc.
@ -1619,8 +1663,8 @@
-#endif -#endif
- -
-#include "../bzero.S" -#include "../bzero.S"
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/ifunc-defines.sym --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/multiarch/ifunc-defines.sym
+++ glibc-2.11.90-11/sysdeps/i386/i686/multiarch/ifunc-defines.sym +++ glibc-2.11.90-12/sysdeps/i386/i686/multiarch/ifunc-defines.sym
@@ -13,8 +13,5 @@ CPUID_ECX_OFFSET offsetof (struct cpuid_registers, ecx) @@ -13,8 +13,5 @@ CPUID_ECX_OFFSET offsetof (struct cpuid_registers, ecx)
CPUID_EDX_OFFSET offsetof (struct cpuid_registers, edx) CPUID_EDX_OFFSET offsetof (struct cpuid_registers, edx)
FAMILY_OFFSET offsetof (struct cpu_features, family) FAMILY_OFFSET offsetof (struct cpu_features, family)
@ -1630,8 +1674,8 @@
COMMON_CPUID_INDEX_1 COMMON_CPUID_INDEX_1
-FEATURE_INDEX_1 -FEATURE_INDEX_1
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
+++ glibc-2.11.90-11//dev/null +++ glibc-2.11.90-12//dev/null
@@ -1,1785 +0,0 @@ @@ -1,1785 +0,0 @@
-/* memcpy with SSSE3 and REP string. -/* memcpy with SSSE3 and REP string.
- Copyright (C) 2010 Free Software Foundation, Inc. - Copyright (C) 2010 Free Software Foundation, Inc.
@ -3418,8 +3462,8 @@
-END (MEMCPY) -END (MEMCPY)
- -
-#endif -#endif
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/memcpy-ssse3.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/multiarch/memcpy-ssse3.S
+++ glibc-2.11.90-11//dev/null +++ glibc-2.11.90-12//dev/null
@@ -1,1737 +0,0 @@ @@ -1,1737 +0,0 @@
-/* memcpy with SSSE3 -/* memcpy with SSSE3
- Copyright (C) 2010 Free Software Foundation, Inc. - Copyright (C) 2010 Free Software Foundation, Inc.
@ -5158,8 +5202,8 @@
-END (MEMCPY) -END (MEMCPY)
- -
-#endif -#endif
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/memcpy.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/multiarch/memcpy.S
+++ glibc-2.11.90-11//dev/null +++ glibc-2.11.90-12//dev/null
@@ -1,90 +0,0 @@ @@ -1,90 +0,0 @@
-/* Multiple versions of memcpy -/* Multiple versions of memcpy
- Copyright (C) 2010 Free Software Foundation, Inc. - Copyright (C) 2010 Free Software Foundation, Inc.
@ -5251,8 +5295,8 @@
-#endif -#endif
- -
-#include "../memcpy.S" -#include "../memcpy.S"
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/memcpy_chk.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/multiarch/memcpy_chk.S
+++ glibc-2.11.90-11//dev/null +++ glibc-2.11.90-12//dev/null
@@ -1,64 +0,0 @@ @@ -1,64 +0,0 @@
-/* Multiple versions of __memcpy_chk -/* Multiple versions of __memcpy_chk
- Copyright (C) 2010 Free Software Foundation, Inc. - Copyright (C) 2010 Free Software Foundation, Inc.
@ -5318,22 +5362,22 @@
-# include "../memcpy_chk.S" -# include "../memcpy_chk.S"
-# endif -# endif
-#endif -#endif
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/memmove-ssse3-rep.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/multiarch/memmove-ssse3-rep.S
+++ glibc-2.11.90-11//dev/null +++ glibc-2.11.90-12//dev/null
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
-#define USE_AS_MEMMOVE -#define USE_AS_MEMMOVE
-#define MEMCPY __memmove_ssse3_rep -#define MEMCPY __memmove_ssse3_rep
-#define MEMCPY_CHK __memmove_chk_ssse3_rep -#define MEMCPY_CHK __memmove_chk_ssse3_rep
-#include "memcpy-ssse3-rep.S" -#include "memcpy-ssse3-rep.S"
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/memmove-ssse3.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/multiarch/memmove-ssse3.S
+++ glibc-2.11.90-11//dev/null +++ glibc-2.11.90-12//dev/null
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
-#define USE_AS_MEMMOVE -#define USE_AS_MEMMOVE
-#define MEMCPY __memmove_ssse3 -#define MEMCPY __memmove_ssse3
-#define MEMCPY_CHK __memmove_chk_ssse3 -#define MEMCPY_CHK __memmove_chk_ssse3
-#include "memcpy-ssse3.S" -#include "memcpy-ssse3.S"
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/memmove.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/multiarch/memmove.S
+++ glibc-2.11.90-11//dev/null +++ glibc-2.11.90-12//dev/null
@@ -1,117 +0,0 @@ @@ -1,117 +0,0 @@
-/* Multiple versions of memmove -/* Multiple versions of memmove
- Copyright (C) 2010 Free Software Foundation, Inc. - Copyright (C) 2010 Free Software Foundation, Inc.
@ -5452,8 +5496,8 @@
-#endif -#endif
- -
-#include "../memmove.S" -#include "../memmove.S"
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/memmove_chk.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/multiarch/memmove_chk.S
+++ glibc-2.11.90-11//dev/null +++ glibc-2.11.90-12//dev/null
@@ -1,112 +0,0 @@ @@ -1,112 +0,0 @@
-/* Multiple versions of __memmove_chk -/* Multiple versions of __memmove_chk
- Copyright (C) 2010 Free Software Foundation, Inc. - Copyright (C) 2010 Free Software Foundation, Inc.
@ -5567,22 +5611,22 @@
- .size __memmove_chk_ia32, .-__memmove_chk_ia32 - .size __memmove_chk_ia32, .-__memmove_chk_ia32
-# endif -# endif
-#endif -#endif
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/mempcpy-ssse3-rep.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/multiarch/mempcpy-ssse3-rep.S
+++ glibc-2.11.90-11//dev/null +++ glibc-2.11.90-12//dev/null
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
-#define USE_AS_MEMPCPY -#define USE_AS_MEMPCPY
-#define MEMCPY __mempcpy_ssse3_rep -#define MEMCPY __mempcpy_ssse3_rep
-#define MEMCPY_CHK __mempcpy_chk_ssse3_rep -#define MEMCPY_CHK __mempcpy_chk_ssse3_rep
-#include "memcpy-ssse3-rep.S" -#include "memcpy-ssse3-rep.S"
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/mempcpy-ssse3.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/multiarch/mempcpy-ssse3.S
+++ glibc-2.11.90-11//dev/null +++ glibc-2.11.90-12//dev/null
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
-#define USE_AS_MEMPCPY -#define USE_AS_MEMPCPY
-#define MEMCPY __mempcpy_ssse3 -#define MEMCPY __mempcpy_ssse3
-#define MEMCPY_CHK __mempcpy_chk_ssse3 -#define MEMCPY_CHK __mempcpy_chk_ssse3
-#include "memcpy-ssse3.S" -#include "memcpy-ssse3.S"
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/mempcpy.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/multiarch/mempcpy.S
+++ glibc-2.11.90-11//dev/null +++ glibc-2.11.90-12//dev/null
@@ -1,93 +0,0 @@ @@ -1,93 +0,0 @@
-/* Multiple versions of mempcpy -/* Multiple versions of mempcpy
- Copyright (C) 2010 Free Software Foundation, Inc. - Copyright (C) 2010 Free Software Foundation, Inc.
@ -5677,8 +5721,8 @@
-#endif -#endif
- -
-#include "../mempcpy.S" -#include "../mempcpy.S"
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/mempcpy_chk.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/multiarch/mempcpy_chk.S
+++ glibc-2.11.90-11//dev/null +++ glibc-2.11.90-12//dev/null
@@ -1,64 +0,0 @@ @@ -1,64 +0,0 @@
-/* Multiple versions of __mempcpy_chk -/* Multiple versions of __mempcpy_chk
- Copyright (C) 2010 Free Software Foundation, Inc. - Copyright (C) 2010 Free Software Foundation, Inc.
@ -5744,8 +5788,8 @@
-# include "../mempcpy_chk.S" -# include "../mempcpy_chk.S"
-# endif -# endif
-#endif -#endif
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/memset-sse2-rep.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/multiarch/memset-sse2-rep.S
+++ glibc-2.11.90-11//dev/null +++ glibc-2.11.90-12//dev/null
@@ -1,821 +0,0 @@ @@ -1,821 +0,0 @@
-/* memset with SSE2 and REP string. -/* memset with SSE2 and REP string.
- Copyright (C) 2010 Free Software Foundation, Inc. - Copyright (C) 2010 Free Software Foundation, Inc.
@ -6568,8 +6612,8 @@
-END (__memset_sse2_rep) -END (__memset_sse2_rep)
- -
-#endif -#endif
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/memset-sse2.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/multiarch/memset-sse2.S
+++ glibc-2.11.90-11//dev/null +++ glibc-2.11.90-12//dev/null
@@ -1,867 +0,0 @@ @@ -1,867 +0,0 @@
-/* memset with SSE2 -/* memset with SSE2
- Copyright (C) 2010 Free Software Foundation, Inc. - Copyright (C) 2010 Free Software Foundation, Inc.
@ -7438,8 +7482,8 @@
-END (__memset_sse2) -END (__memset_sse2)
- -
-#endif -#endif
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/memset.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/multiarch/memset.S
+++ glibc-2.11.90-11//dev/null +++ glibc-2.11.90-12//dev/null
@@ -1,112 +0,0 @@ @@ -1,112 +0,0 @@
-/* Multiple versions of memset -/* Multiple versions of memset
- Copyright (C) 2010 Free Software Foundation, Inc. - Copyright (C) 2010 Free Software Foundation, Inc.
@ -7553,8 +7597,8 @@
-#endif -#endif
- -
-#include "../memset.S" -#include "../memset.S"
--- glibc-2.11-175-gb34e12e/sysdeps/i386/i686/multiarch/memset_chk.S --- glibc-2.11-188-g0cbcca8/sysdeps/i386/i686/multiarch/memset_chk.S
+++ glibc-2.11.90-11//dev/null +++ glibc-2.11.90-12//dev/null
@@ -1,116 +0,0 @@ @@ -1,116 +0,0 @@
-/* Multiple versions of __memset_chk -/* Multiple versions of __memset_chk
- Copyright (C) 2010 Free Software Foundation, Inc. - Copyright (C) 2010 Free Software Foundation, Inc.
@ -7672,8 +7716,8 @@
- .size __memset_chk_ia32, .-__memset_chk_ia32 - .size __memset_chk_ia32, .-__memset_chk_ia32
-# endif -# endif
-#endif -#endif
--- glibc-2.11-175-gb34e12e/sysdeps/i386/sysdep.h --- glibc-2.11-188-g0cbcca8/sysdeps/i386/sysdep.h
+++ glibc-2.11.90-11/sysdeps/i386/sysdep.h +++ glibc-2.11.90-12/sysdeps/i386/sysdep.h
@@ -67,9 +67,6 @@ @@ -67,9 +67,6 @@
ASM_SIZE_DIRECTIVE(name) \ ASM_SIZE_DIRECTIVE(name) \
STABS_FUN_END(name) STABS_FUN_END(name)
@ -7684,8 +7728,8 @@
#ifdef HAVE_CPP_ASM_DEBUGINFO #ifdef HAVE_CPP_ASM_DEBUGINFO
/* Disable that goop, because we just pass -g through to the assembler /* Disable that goop, because we just pass -g through to the assembler
and it generates proper line number information directly. */ and it generates proper line number information directly. */
--- glibc-2.11-175-gb34e12e/sysdeps/ia64/Makefile --- glibc-2.11-188-g0cbcca8/sysdeps/ia64/Makefile
+++ glibc-2.11.90-11/sysdeps/ia64/Makefile +++ glibc-2.11.90-12/sysdeps/ia64/Makefile
@@ -12,8 +12,8 @@ elide-routines.os += hp-timing @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
ifeq (yes,$(build-shared)) ifeq (yes,$(build-shared))
@ -7697,8 +7741,8 @@
endif endif
endif endif
--- glibc-2.11-175-gb34e12e/sysdeps/ia64/ia64libgcc.S --- glibc-2.11-188-g0cbcca8/sysdeps/ia64/ia64libgcc.S
+++ glibc-2.11.90-11/sysdeps/ia64/ia64libgcc.S +++ glibc-2.11.90-12/sysdeps/ia64/ia64libgcc.S
@@ -1,350 +0,0 @@ @@ -1,350 +0,0 @@
-/* From the Intel IA-64 Optimization Guide, choose the minimum latency -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
- alternative. */ - alternative. */
@ -8050,8 +8094,8 @@
- .symver ___multi3, __multi3@GLIBC_2.2 - .symver ___multi3, __multi3@GLIBC_2.2
- -
-#endif -#endif
--- glibc-2.11-175-gb34e12e/sysdeps/ia64/libgcc-compat.c --- glibc-2.11-188-g0cbcca8/sysdeps/ia64/libgcc-compat.c
+++ glibc-2.11.90-11/sysdeps/ia64/libgcc-compat.c +++ glibc-2.11.90-12/sysdeps/ia64/libgcc-compat.c
@@ -0,0 +1,84 @@ @@ -0,0 +1,84 @@
+/* pre-.hidden libgcc compatibility +/* pre-.hidden libgcc compatibility
+ Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002 Free Software Foundation, Inc.
@ -8137,8 +8181,8 @@
+symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
+ +
+#endif +#endif
--- glibc-2.11-175-gb34e12e/sysdeps/powerpc/powerpc64/Makefile --- glibc-2.11-188-g0cbcca8/sysdeps/powerpc/powerpc64/Makefile
+++ glibc-2.11.90-11/sysdeps/powerpc/powerpc64/Makefile +++ glibc-2.11.90-12/sysdeps/powerpc/powerpc64/Makefile
@@ -30,6 +30,7 @@ ifneq ($(elf),no) @@ -30,6 +30,7 @@ ifneq ($(elf),no)
# we use -fpic instead which is much better. # we use -fpic instead which is much better.
CFLAGS-initfini.s += -fpic -O1 CFLAGS-initfini.s += -fpic -O1
@ -8147,8 +8191,8 @@
endif endif
ifeq ($(subdir),elf) ifeq ($(subdir),elf)
--- glibc-2.11-175-gb34e12e/sysdeps/unix/nice.c --- glibc-2.11-188-g0cbcca8/sysdeps/unix/nice.c
+++ glibc-2.11.90-11/sysdeps/unix/nice.c +++ glibc-2.11.90-12/sysdeps/unix/nice.c
@@ -42,7 +42,12 @@ nice (int incr) @@ -42,7 +42,12 @@ nice (int incr)
__set_errno (save); __set_errno (save);
} }
@ -8163,8 +8207,8 @@
if (result == -1) if (result == -1)
{ {
if (errno == EACCES) if (errno == EACCES)
--- glibc-2.11-175-gb34e12e/sysdeps/unix/sysv/linux/check_pf.c --- glibc-2.11-188-g0cbcca8/sysdeps/unix/sysv/linux/check_pf.c
+++ glibc-2.11.90-11/sysdeps/unix/sysv/linux/check_pf.c +++ glibc-2.11.90-12/sysdeps/unix/sysv/linux/check_pf.c
@@ -27,13 +27,10 @@ @@ -27,13 +27,10 @@
#include <unistd.h> #include <unistd.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -8180,8 +8224,8 @@
#ifndef IFA_F_HOMEADDRESS #ifndef IFA_F_HOMEADDRESS
# define IFA_F_HOMEADDRESS 0 # define IFA_F_HOMEADDRESS 0
--- glibc-2.11-175-gb34e12e/sysdeps/unix/sysv/linux/dl-osinfo.h --- glibc-2.11-188-g0cbcca8/sysdeps/unix/sysv/linux/dl-osinfo.h
+++ glibc-2.11.90-11/sysdeps/unix/sysv/linux/dl-osinfo.h +++ glibc-2.11.90-12/sysdeps/unix/sysv/linux/dl-osinfo.h
@@ -17,10 +17,13 @@ @@ -17,10 +17,13 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */ 02111-1307 USA. */
@ -8229,8 +8273,8 @@
} }
else else
#endif #endif
--- glibc-2.11-175-gb34e12e/sysdeps/unix/sysv/linux/futimesat.c --- glibc-2.11-188-g0cbcca8/sysdeps/unix/sysv/linux/futimesat.c
+++ glibc-2.11.90-11/sysdeps/unix/sysv/linux/futimesat.c +++ glibc-2.11.90-12/sysdeps/unix/sysv/linux/futimesat.c
@@ -37,14 +37,14 @@ futimesat (fd, file, tvp) @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
{ {
int result; int result;
@ -8273,8 +8317,8 @@
{ {
size_t filelen = strlen (file); size_t filelen = strlen (file);
if (__builtin_expect (filelen == 0, 0)) if (__builtin_expect (filelen == 0, 0))
--- glibc-2.11-175-gb34e12e/sysdeps/unix/sysv/linux/i386/dl-cache.h --- glibc-2.11-188-g0cbcca8/sysdeps/unix/sysv/linux/i386/dl-cache.h
+++ glibc-2.11.90-11/sysdeps/unix/sysv/linux/i386/dl-cache.h +++ glibc-2.11.90-12/sysdeps/unix/sysv/linux/i386/dl-cache.h
@@ -0,0 +1,59 @@ @@ -0,0 +1,59 @@
+/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
+ Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004 Free Software Foundation, Inc.
@ -8335,8 +8379,8 @@
+ } while (0) + } while (0)
+ +
+#include_next <dl-cache.h> +#include_next <dl-cache.h>
--- glibc-2.11-175-gb34e12e/sysdeps/unix/sysv/linux/ia64/dl-cache.h --- glibc-2.11-188-g0cbcca8/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+++ glibc-2.11.90-11/sysdeps/unix/sysv/linux/ia64/dl-cache.h +++ glibc-2.11.90-12/sysdeps/unix/sysv/linux/ia64/dl-cache.h
@@ -22,4 +22,31 @@ @@ -22,4 +22,31 @@
#define _dl_cache_check_flags(flags) \ #define _dl_cache_check_flags(flags) \
((flags) == _DL_CACHE_DEFAULT_ID) ((flags) == _DL_CACHE_DEFAULT_ID)
@ -8369,29 +8413,29 @@
+ } while (0) + } while (0)
+ +
#include_next <dl-cache.h> #include_next <dl-cache.h>
--- glibc-2.11-175-gb34e12e/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c --- glibc-2.11-188-g0cbcca8/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+++ glibc-2.11.90-11/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +++ glibc-2.11.90-12/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
+#ifdef IS_IN_ldconfig +#ifdef IS_IN_ldconfig
+#include <sysdeps/i386/dl-procinfo.c> +#include <sysdeps/i386/dl-procinfo.c>
+#else +#else
+#include <sysdeps/generic/dl-procinfo.c> +#include <sysdeps/generic/dl-procinfo.c>
+#endif +#endif
--- glibc-2.11-175-gb34e12e/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h --- glibc-2.11-188-g0cbcca8/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+++ glibc-2.11.90-11/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +++ glibc-2.11.90-12/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
+#ifdef IS_IN_ldconfig +#ifdef IS_IN_ldconfig
+#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h> +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
+#else +#else
+#include <sysdeps/generic/dl-procinfo.h> +#include <sysdeps/generic/dl-procinfo.h>
+#endif +#endif
--- glibc-2.11-175-gb34e12e/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed --- glibc-2.11-188-g0cbcca8/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+++ glibc-2.11.90-11/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +++ glibc-2.11.90-12/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
@@ -1 +1 @@ @@ -1 +1 @@
-s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ -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"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
--- glibc-2.11-175-gb34e12e/sysdeps/unix/sysv/linux/netlinkaccess.h --- glibc-2.11-188-g0cbcca8/sysdeps/unix/sysv/linux/netlinkaccess.h
+++ glibc-2.11.90-11/sysdeps/unix/sysv/linux/netlinkaccess.h +++ glibc-2.11.90-12/sysdeps/unix/sysv/linux/netlinkaccess.h
@@ -25,6 +25,24 @@ @@ -25,6 +25,24 @@
#include <kernel-features.h> #include <kernel-features.h>
@ -8417,8 +8461,8 @@
struct netlink_res struct netlink_res
{ {
--- glibc-2.11-175-gb34e12e/sysdeps/unix/sysv/linux/paths.h --- glibc-2.11-188-g0cbcca8/sysdeps/unix/sysv/linux/paths.h
+++ glibc-2.11.90-11/sysdeps/unix/sysv/linux/paths.h +++ glibc-2.11.90-12/sysdeps/unix/sysv/linux/paths.h
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
#define _PATH_TTY "/dev/tty" #define _PATH_TTY "/dev/tty"
#define _PATH_UNIX "/boot/vmlinux" #define _PATH_UNIX "/boot/vmlinux"
@ -8428,8 +8472,13 @@
#define _PATH_WTMP "/var/log/wtmp" #define _PATH_WTMP "/var/log/wtmp"
/* Provide trailing slash, since mostly used for building pathnames. */ /* Provide trailing slash, since mostly used for building pathnames. */
--- glibc-2.11-175-gb34e12e/sysdeps/unix/sysv/linux/tcsetattr.c --- glibc-2.11-188-g0cbcca8/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c
+++ glibc-2.11.90-11/sysdeps/unix/sysv/linux/tcsetattr.c +++ glibc-2.11.90-12/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c
@@ -1 +1 @@
-#include "../../fxstat.c"
+#include "../../i386/fxstat.c"
--- glibc-2.11-188-g0cbcca8/sysdeps/unix/sysv/linux/tcsetattr.c
+++ glibc-2.11.90-12/sysdeps/unix/sysv/linux/tcsetattr.c
@@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
{ {
struct __kernel_termios k_termios; struct __kernel_termios k_termios;
@ -8475,8 +8524,8 @@
+ return retval; + return retval;
} }
libc_hidden_def (tcsetattr) libc_hidden_def (tcsetattr)
--- glibc-2.11-175-gb34e12e/sysdeps/x86_64/cacheinfo.c --- glibc-2.11-188-g0cbcca8/sysdeps/x86_64/cacheinfo.c
+++ glibc-2.11.90-11/sysdeps/x86_64/cacheinfo.c +++ glibc-2.11.90-12/sysdeps/x86_64/cacheinfo.c
@@ -74,7 +74,6 @@ static const struct intel_02_cache_info @@ -74,7 +74,6 @@ static const struct intel_02_cache_info
{ 0x0a, 2, 32, M(_SC_LEVEL1_DCACHE_SIZE), 8192 }, { 0x0a, 2, 32, M(_SC_LEVEL1_DCACHE_SIZE), 8192 },
{ 0x0c, 4, 32, M(_SC_LEVEL1_DCACHE_SIZE), 16384 }, { 0x0c, 4, 32, M(_SC_LEVEL1_DCACHE_SIZE), 16384 },
@ -8517,8 +8566,8 @@
if (shared > 0) if (shared > 0)
{ {
--- glibc-2.11-175-gb34e12e/sysdeps/x86_64/multiarch/ifunc-defines.sym --- glibc-2.11-188-g0cbcca8/sysdeps/x86_64/multiarch/ifunc-defines.sym
+++ glibc-2.11.90-11/sysdeps/x86_64/multiarch/ifunc-defines.sym +++ glibc-2.11.90-12/sysdeps/x86_64/multiarch/ifunc-defines.sym
@@ -13,8 +13,5 @@ CPUID_ECX_OFFSET offsetof (struct cpuid_registers, ecx) @@ -13,8 +13,5 @@ CPUID_ECX_OFFSET offsetof (struct cpuid_registers, ecx)
CPUID_EDX_OFFSET offsetof (struct cpuid_registers, edx) CPUID_EDX_OFFSET offsetof (struct cpuid_registers, edx)
FAMILY_OFFSET offsetof (struct cpu_features, family) FAMILY_OFFSET offsetof (struct cpu_features, family)
@ -8528,8 +8577,8 @@
COMMON_CPUID_INDEX_1 COMMON_CPUID_INDEX_1
-FEATURE_INDEX_1 -FEATURE_INDEX_1
--- glibc-2.11-175-gb34e12e/sysdeps/x86_64/multiarch/init-arch.c --- glibc-2.11-188-g0cbcca8/sysdeps/x86_64/multiarch/init-arch.c
+++ glibc-2.11.90-11/sysdeps/x86_64/multiarch/init-arch.c +++ glibc-2.11.90-12/sysdeps/x86_64/multiarch/init-arch.c
@@ -64,23 +64,7 @@ __init_cpu_features (void) @@ -64,23 +64,7 @@ __init_cpu_features (void)
__cpu_features.model += extended_model; __cpu_features.model += extended_model;
} }
@ -8555,8 +8604,8 @@
} }
/* This spells out "AuthenticAMD". */ /* This spells out "AuthenticAMD". */
else if (ebx == 0x68747541 && ecx == 0x444d4163 && edx == 0x69746e65) else if (ebx == 0x68747541 && ecx == 0x444d4163 && edx == 0x69746e65)
--- glibc-2.11-175-gb34e12e/sysdeps/x86_64/multiarch/init-arch.h --- glibc-2.11-188-g0cbcca8/sysdeps/x86_64/multiarch/init-arch.h
+++ glibc-2.11.90-11/sysdeps/x86_64/multiarch/init-arch.h +++ glibc-2.11.90-12/sysdeps/x86_64/multiarch/init-arch.h
@@ -16,8 +16,6 @@ @@ -16,8 +16,6 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */ 02111-1307 USA. */
@ -8604,8 +8653,8 @@
-#define index_Fast_Rep_String FEATURE_INDEX_1 -#define index_Fast_Rep_String FEATURE_INDEX_1
- -
#endif /* __ASSEMBLER__ */ #endif /* __ASSEMBLER__ */
--- glibc-2.11-175-gb34e12e/timezone/zic.c --- glibc-2.11-188-g0cbcca8/timezone/zic.c
+++ glibc-2.11.90-11/timezone/zic.c +++ glibc-2.11.90-12/timezone/zic.c
@@ -1921,7 +1921,7 @@ const int zonecount; @@ -1921,7 +1921,7 @@ const int zonecount;
if (stdrp != NULL && stdrp->r_hiyear == 2037) if (stdrp != NULL && stdrp->r_hiyear == 2037)
return; return;

15
glibc.spec
View File

@ -1,4 +1,4 @@
%define glibcsrcdir glibc-2.11-175-gb34e12e %define glibcsrcdir glibc-2.11-188-g0cbcca8
%define glibcversion 2.11.90 %define glibcversion 2.11.90
### glibc.spec.in follows: ### glibc.spec.in follows:
%define run_glibc_tests 1 %define run_glibc_tests 1
@ -24,7 +24,7 @@
Summary: The GNU libc libraries Summary: The GNU libc libraries
Name: glibc Name: glibc
Version: %{glibcversion} Version: %{glibcversion}
Release: 11 Release: 12
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
# Things that are linked directly into dynamically linked programs # Things that are linked directly into dynamically linked programs
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@ -1033,6 +1033,17 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Mon Feb 8 2010 Andreas Schwab <schwab@redhat.com> - 2.11.90-12
- Update from master
- Update constants in <sys/mount.h> for current kernels (#11235)
- Fix endless loop with invalid /etc/shells file (#11242)
- Fix sorting of malayalam letter 'na' (#10414)
- Add kok_IN locale
- Use common collation data in as_IN locale
- Avoid alloca in setenv for long strings
- Use shared mapping to reserve memory when creating locale archive (#10855)
- Fix fstat on Linux/sparc64 (#11155)
* Mon Feb 1 2010 Andreas Schwab <schwab@redhat.com> - 2.11.90-11 * Mon Feb 1 2010 Andreas Schwab <schwab@redhat.com> - 2.11.90-11
- Update from master - Update from master
- Fix error checking in iconv (#558053) - Fix error checking in iconv (#558053)

1
import.log
View File

@ -43,3 +43,4 @@ 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-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-10:HEAD:glibc-2.11.90-10.src.rpm:1264006094
glibc-2_11_90-11:HEAD:glibc-2.11.90-11.src.rpm:1265032871 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

4
sources
View File

@ -1,2 +1,2 @@
155e8075781b82df5980d4f100b6d85f glibc-2.11-175-gb34e12e-fedora.tar.bz2 bd4ead4a2f894434acb52840bed4c17d glibc-2.11-188-g0cbcca8-fedora.tar.bz2
4e2d854478870bee708fee7bf24d7d9c glibc-2.11-175-gb34e12e.tar.bz2 6f26cac5f9a78260e97a648b4ca46e7e glibc-2.11-188-g0cbcca8.tar.bz2