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

2.10.90-5

Browse Source
This commit is contained in:
Andreas Schwab 2009-07-22 13:05:11 +00:00
parent 50a003794b
commit 6227600d60
5 changed files with 173 additions and 131 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.10-181-g42e69bc-fedora.tar.bz2 glibc-2.10-187-gae612b0-fedora.tar.bz2
glibc-2.10-181-g42e69bc.tar.bz2 glibc-2.10-187-gae612b0.tar.bz2

284
glibc-fedora.patch
View File

@ -1,6 +1,15 @@
--- glibc-2.10-181-g42e69bc/ChangeLog --- glibc-2.10-187-gae612b0/ChangeLog
+++ glibc-2.10.90-4/ChangeLog +++ glibc-2.10.90-5/ChangeLog
@@ -222,6 +222,16 @@ @@ -1,3 +1,8 @@
+2009-07-22 Jakub Jelinek <jakub@redhat.com>
+
+ * Makeconfig (ASFLAGS): Append $(sysdep-ASFLAGS).
+ * sysdeps/i386/Makefile (sysdep-ASFLAGS): Add -U__i686.
+
2009-07-21 Ulrich Drepper <drepper@redhat.com>
* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove
@@ -263,6 +268,16 @@
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.
@ -17,7 +26,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.
@@ -8620,6 +8630,13 @@ @@ -8661,6 +8676,13 @@
* include/sys/cdefs.h: Redefine __nonnull so that test for * include/sys/cdefs.h: Redefine __nonnull so that test for
incorrect parameters in the libc code itself are not omitted. incorrect parameters in the libc code itself are not omitted.
@ -31,7 +40,7 @@
2007-05-09 Jakub Jelinek <jakub@redhat.com> 2007-05-09 Jakub Jelinek <jakub@redhat.com>
* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow * sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
@@ -8915,6 +8932,10 @@ @@ -8956,6 +8978,10 @@
[BZ #4368] [BZ #4368]
* stdlib/stdlib.h: Remove obsolete part of comment for realpath. * stdlib/stdlib.h: Remove obsolete part of comment for realpath.
@ -42,7 +51,7 @@
2007-04-16 Ulrich Drepper <drepper@redhat.com> 2007-04-16 Ulrich Drepper <drepper@redhat.com>
[BZ #4364] [BZ #4364]
@@ -10172,6 +10193,15 @@ @@ -10213,6 +10239,15 @@
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.
@ -58,8 +67,8 @@
2006-12-09 Ulrich Drepper <drepper@redhat.com> 2006-12-09 Ulrich Drepper <drepper@redhat.com>
[BZ #3632] [BZ #3632]
--- glibc-2.10-181-g42e69bc/ChangeLog.15 --- glibc-2.10-187-gae612b0/ChangeLog.15
+++ glibc-2.10.90-4/ChangeLog.15 +++ glibc-2.10.90-5/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>
@ -125,8 +134,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.10-181-g42e69bc/ChangeLog.16 --- glibc-2.10-187-gae612b0/ChangeLog.16
+++ glibc-2.10.90-4/ChangeLog.16 +++ glibc-2.10.90-5/ChangeLog.16
@@ -171,6 +171,11 @@ @@ -171,6 +171,11 @@
[BZ #2611] [BZ #2611]
* stdio-common/renameat.c (renameat): Fix typo. * stdio-common/renameat.c (renameat): Fix typo.
@ -298,8 +307,26 @@
2005-02-10 Roland McGrath <roland@redhat.com> 2005-02-10 Roland McGrath <roland@redhat.com>
[BZ #157] [BZ #157]
--- glibc-2.10-181-g42e69bc/csu/Makefile --- glibc-2.10-187-gae612b0/Makeconfig
+++ glibc-2.10.90-4/csu/Makefile +++ glibc-2.10.90-5/Makeconfig
@@ -780,12 +780,12 @@ endif
# The assembler can generate debug information too.
ifndef ASFLAGS
ifeq ($(have-cpp-asm-debuginfo),yes)
-ASFLAGS := $(filter -g%,$(CFLAGS))
+ASFLAGS = $(filter -g%,$(CFLAGS))
else
-ASFLAGS :=
+ASFLAGS =
endif
endif
-ASFLAGS += $(ASFLAGS-config) $(asflags-cpu)
+ASFLAGS += $(ASFLAGS-config) $(asflags-cpu) $(sysdep-ASFLAGS)
ifndef BUILD_CC
BUILD_CC = $(CC)
--- glibc-2.10-187-gae612b0/csu/Makefile
+++ glibc-2.10.90-5/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 $@
@ -310,8 +337,8 @@
vpath initfini.c $(sysdirs) vpath initfini.c $(sysdirs)
--- glibc-2.10-181-g42e69bc/csu/elf-init.c --- glibc-2.10-187-gae612b0/csu/elf-init.c
+++ glibc-2.10.90-4/csu/elf-init.c +++ glibc-2.10.90-5/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;
@ -336,8 +363,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.10-181-g42e69bc/debug/tst-chk1.c --- glibc-2.10-187-gae612b0/debug/tst-chk1.c
+++ glibc-2.10.90-4/debug/tst-chk1.c +++ glibc-2.10.90-5/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. */
@ -366,8 +393,8 @@
# define O 0 # define O 0
# else # else
# define O 1 # define O 1
--- glibc-2.10-181-g42e69bc/elf/ldconfig.c --- glibc-2.10-187-gae612b0/elf/ldconfig.c
+++ glibc-2.10.90-4/elf/ldconfig.c +++ glibc-2.10.90-5/elf/ldconfig.c
@@ -1020,17 +1020,19 @@ search_dirs (void) @@ -1020,17 +1020,19 @@ search_dirs (void)
@ -449,8 +476,8 @@
} }
if (! opt_ignore_aux_cache) if (! opt_ignore_aux_cache)
--- glibc-2.10-181-g42e69bc/elf/tst-stackguard1.c --- glibc-2.10-187-gae612b0/elf/tst-stackguard1.c
+++ glibc-2.10.90-4/elf/tst-stackguard1.c +++ glibc-2.10.90-5/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;
@ -475,16 +502,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.10-181-g42e69bc/include/bits/stdlib-ldbl.h --- glibc-2.10-187-gae612b0/include/bits/stdlib-ldbl.h
+++ glibc-2.10.90-4/include/bits/stdlib-ldbl.h +++ glibc-2.10.90-5/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.10-181-g42e69bc/include/bits/wchar-ldbl.h --- glibc-2.10-187-gae612b0/include/bits/wchar-ldbl.h
+++ glibc-2.10.90-4/include/bits/wchar-ldbl.h +++ glibc-2.10.90-5/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.10-181-g42e69bc/include/features.h --- glibc-2.10-187-gae612b0/include/features.h
+++ glibc-2.10.90-4/include/features.h +++ glibc-2.10.90-5/include/features.h
@@ -299,8 +299,13 @@ @@ -299,8 +299,13 @@
#endif #endif
@ -501,8 +528,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.10-181-g42e69bc/intl/locale.alias --- glibc-2.10-187-gae612b0/intl/locale.alias
+++ glibc-2.10.90-4/intl/locale.alias +++ glibc-2.10.90-5/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
@ -512,8 +539,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.10-181-g42e69bc/libio/stdio.h --- glibc-2.10-187-gae612b0/libio/stdio.h
+++ glibc-2.10.90-4/libio/stdio.h +++ glibc-2.10.90-5/libio/stdio.h
@@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t; @@ -145,10 +145,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. */
@ -527,8 +554,8 @@
__BEGIN_NAMESPACE_STD __BEGIN_NAMESPACE_STD
/* Remove file FILENAME. */ /* Remove file FILENAME. */
--- glibc-2.10-181-g42e69bc/locale/iso-4217.def --- glibc-2.10-187-gae612b0/locale/iso-4217.def
+++ glibc-2.10.90-4/locale/iso-4217.def +++ glibc-2.10.90-5/locale/iso-4217.def
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
* *
* !!! The list has to be sorted !!! * !!! The list has to be sorted !!!
@ -620,8 +647,8 @@
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.10-181-g42e69bc/locale/programs/locarchive.c --- glibc-2.10-187-gae612b0/locale/programs/locarchive.c
+++ glibc-2.10.90-4/locale/programs/locarchive.c +++ glibc-2.10.90-5/locale/programs/locarchive.c
@@ -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,
@ -653,8 +680,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.10-181-g42e69bc/localedata/Makefile --- glibc-2.10-187-gae612b0/localedata/Makefile
+++ glibc-2.10.90-4/localedata/Makefile +++ glibc-2.10.90-5/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/'`; \
@ -663,8 +690,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.10-181-g42e69bc/localedata/SUPPORTED --- glibc-2.10-187-gae612b0/localedata/SUPPORTED
+++ glibc-2.10.90-4/localedata/SUPPORTED +++ glibc-2.10.90-5/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 \
@ -706,8 +733,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.10-181-g42e69bc/localedata/locales/cy_GB --- glibc-2.10-187-gae612b0/localedata/locales/cy_GB
+++ glibc-2.10.90-4/localedata/locales/cy_GB +++ glibc-2.10.90-5/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>"
@ -722,8 +749,8 @@
END LC_TIME END LC_TIME
LC_MESSAGES LC_MESSAGES
--- glibc-2.10-181-g42e69bc/localedata/locales/en_GB --- glibc-2.10-187-gae612b0/localedata/locales/en_GB
+++ glibc-2.10.90-4/localedata/locales/en_GB +++ glibc-2.10.90-5/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>"
@ -735,8 +762,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.10-181-g42e69bc/localedata/locales/no_NO --- glibc-2.10-187-gae612b0/localedata/locales/no_NO
+++ glibc-2.10.90-4/localedata/locales/no_NO +++ glibc-2.10.90-5/localedata/locales/no_NO
@@ -0,0 +1,69 @@ @@ -0,0 +1,69 @@
+escape_char / +escape_char /
+comment_char % +comment_char %
@ -807,8 +834,8 @@
+LC_ADDRESS +LC_ADDRESS
+copy "nb_NO" +copy "nb_NO"
+END LC_ADDRESS +END LC_ADDRESS
--- glibc-2.10-181-g42e69bc/localedata/locales/zh_TW --- glibc-2.10-187-gae612b0/localedata/locales/zh_TW
+++ glibc-2.10.90-4/localedata/locales/zh_TW +++ glibc-2.10.90-5/localedata/locales/zh_TW
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
comment_char % comment_char %
escape_char / escape_char /
@ -836,8 +863,8 @@
revision "0.2" revision "0.2"
date "2000-08-02" date "2000-08-02"
% %
--- glibc-2.10-181-g42e69bc/malloc/mcheck.c --- glibc-2.10-187-gae612b0/malloc/mcheck.c
+++ glibc-2.10.90-4/malloc/mcheck.c +++ glibc-2.10.90-5/malloc/mcheck.c
@@ -24,9 +24,25 @@ @@ -24,9 +24,25 @@
# include <mcheck.h> # include <mcheck.h>
# include <stdint.h> # include <stdint.h>
@ -913,8 +940,8 @@
old_free_hook = __free_hook; old_free_hook = __free_hook;
__free_hook = freehook; __free_hook = freehook;
--- glibc-2.10-181-g42e69bc/manual/libc.texinfo --- glibc-2.10-187-gae612b0/manual/libc.texinfo
+++ glibc-2.10.90-4/manual/libc.texinfo +++ glibc-2.10.90-5/manual/libc.texinfo
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
@c setchapternewpage odd @c setchapternewpage odd
@ -924,8 +951,8 @@
@direntry @direntry
* Libc: (libc). C library. * Libc: (libc). C library.
@end direntry @end direntry
--- glibc-2.10-181-g42e69bc/misc/sys/cdefs.h --- glibc-2.10-187-gae612b0/misc/sys/cdefs.h
+++ glibc-2.10.90-4/misc/sys/cdefs.h +++ glibc-2.10.90-5/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)
@ -969,17 +996,17 @@
# 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.10-181-g42e69bc/nis/nss --- glibc-2.10-187-gae612b0/nis/nss
+++ glibc-2.10.90-4/nis/nss +++ glibc-2.10.90-5/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.10-181-g42e69bc/nptl/ChangeLog --- glibc-2.10-187-gae612b0/nptl/ChangeLog
+++ glibc-2.10.90-4/nptl/ChangeLog +++ glibc-2.10.90-5/nptl/ChangeLog
@@ -3584,6 +3584,15 @@ @@ -3590,6 +3590,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.
@ -995,7 +1022,7 @@
2005-07-11 Jakub Jelinek <jakub@redhat.com> 2005-07-11 Jakub Jelinek <jakub@redhat.com>
[BZ #1102] [BZ #1102]
@@ -4320,6 +4329,11 @@ @@ -4326,6 +4335,11 @@
Move definition inside libpthread, libc, librt check. Provide Move definition inside libpthread, libc, librt check. Provide
definition for rtld. definition for rtld.
@ -1007,7 +1034,7 @@
2004-09-02 Ulrich Drepper <drepper@redhat.com> 2004-09-02 Ulrich Drepper <drepper@redhat.com>
* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
@@ -6394,6 +6408,11 @@ @@ -6400,6 +6414,11 @@
* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
@ -1019,8 +1046,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.10-181-g42e69bc/nptl/Makefile --- glibc-2.10-187-gae612b0/nptl/Makefile
+++ glibc-2.10.90-4/nptl/Makefile +++ glibc-2.10.90-5/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
@ -1053,8 +1080,8 @@
else else
$(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
endif endif
--- glibc-2.10-181-g42e69bc/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h --- glibc-2.10-187-gae612b0/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+++ glibc-2.10.90-4/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +++ glibc-2.10.90-5/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
@@ -187,4 +187,7 @@ @@ -187,4 +187,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
@ -1063,8 +1090,8 @@
+#define _XOPEN_STREAMS -1 +#define _XOPEN_STREAMS -1
+ +
#endif /* bits/posix_opt.h */ #endif /* bits/posix_opt.h */
--- glibc-2.10-181-g42e69bc/nptl/sysdeps/unix/sysv/linux/kernel-features.h --- glibc-2.10-187-gae612b0/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+++ glibc-2.10.90-4/nptl/sysdeps/unix/sysv/linux/kernel-features.h +++ glibc-2.10.90-5/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>
+ +
@ -1072,8 +1099,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.10-181-g42e69bc/nptl/tst-stackguard1.c --- glibc-2.10-187-gae612b0/nptl/tst-stackguard1.c
+++ glibc-2.10.90-4/nptl/tst-stackguard1.c +++ glibc-2.10.90-5/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;
@ -1098,8 +1125,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.10-181-g42e69bc/nscd/nscd.conf --- glibc-2.10-187-gae612b0/nscd/nscd.conf
+++ glibc-2.10.90-4/nscd/nscd.conf +++ glibc-2.10.90-5/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
@ -1109,8 +1136,8 @@
# stat-user somebody # stat-user somebody
debug-level 0 debug-level 0
# reload-count 5 # reload-count 5
--- glibc-2.10-181-g42e69bc/nscd/nscd.init --- glibc-2.10-187-gae612b0/nscd/nscd.init
+++ glibc-2.10.90-4/nscd/nscd.init +++ glibc-2.10.90-5/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
@ -1167,8 +1194,8 @@
;; ;;
*) *)
echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
--- glibc-2.10-181-g42e69bc/posix/Makefile --- glibc-2.10-187-gae612b0/posix/Makefile
+++ glibc-2.10.90-4/posix/Makefile +++ glibc-2.10.90-5/posix/Makefile
@@ -301,15 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ @@ -301,15 +301,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
@ -1189,8 +1216,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.10-181-g42e69bc/posix/getconf.speclist.h --- glibc-2.10-187-gae612b0/posix/getconf.speclist.h
+++ glibc-2.10.90-4/posix/getconf.speclist.h +++ glibc-2.10.90-5/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 =
@ -1231,8 +1258,8 @@
+"XBS5_LPBIG_OFFBIG" +"XBS5_LPBIG_OFFBIG"
+#endif +#endif
+""; +"";
--- glibc-2.10-181-g42e69bc/streams/Makefile --- glibc-2.10-187-gae612b0/streams/Makefile
+++ glibc-2.10.90-4/streams/Makefile +++ glibc-2.10.90-5/streams/Makefile
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
# #
subdir := streams subdir := streams
@ -1242,8 +1269,8 @@
routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach
include ../Rules include ../Rules
--- glibc-2.10-181-g42e69bc/sysdeps/generic/dl-cache.h --- glibc-2.10-187-gae612b0/sysdeps/generic/dl-cache.h
+++ glibc-2.10.90-4/sysdeps/generic/dl-cache.h +++ glibc-2.10.90-5/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
@ -1259,9 +1286,18 @@
#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.10-181-g42e69bc/sysdeps/i386/Makefile --- glibc-2.10-187-gae612b0/sysdeps/i386/Makefile
+++ glibc-2.10.90-4/sysdeps/i386/Makefile +++ glibc-2.10.90-5/sysdeps/i386/Makefile
@@ -64,6 +64,14 @@ endif @@ -2,6 +2,8 @@
# Every i386 port in use uses gas syntax (I think).
asm-CPPFLAGS += -DGAS_SYNTAX
+sysdep-ASFLAGS += -U__i686
+
# The i386 `long double' is a distinct type we support.
long-double-fcts = yes
@@ -64,6 +66,14 @@ endif
ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS))) ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
defines += -DNO_TLS_DIRECT_SEG_REFS defines += -DNO_TLS_DIRECT_SEG_REFS
@ -1276,8 +1312,8 @@
endif endif
ifeq ($(subdir),elf) ifeq ($(subdir),elf)
--- glibc-2.10-181-g42e69bc/sysdeps/ia64/Makefile --- glibc-2.10-187-gae612b0/sysdeps/ia64/Makefile
+++ glibc-2.10.90-4/sysdeps/ia64/Makefile +++ glibc-2.10.90-5/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))
@ -1289,8 +1325,8 @@
endif endif
endif endif
--- glibc-2.10-181-g42e69bc/sysdeps/ia64/ia64libgcc.S --- glibc-2.10-187-gae612b0/sysdeps/ia64/ia64libgcc.S
+++ glibc-2.10.90-4/sysdeps/ia64/ia64libgcc.S +++ glibc-2.10.90-5/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. */
@ -1642,8 +1678,8 @@
- .symver ___multi3, __multi3@GLIBC_2.2 - .symver ___multi3, __multi3@GLIBC_2.2
- -
-#endif -#endif
--- glibc-2.10-181-g42e69bc/sysdeps/ia64/libgcc-compat.c --- glibc-2.10-187-gae612b0/sysdeps/ia64/libgcc-compat.c
+++ glibc-2.10.90-4/sysdeps/ia64/libgcc-compat.c +++ glibc-2.10.90-5/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.
@ -1729,8 +1765,8 @@
+symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
+ +
+#endif +#endif
--- glibc-2.10-181-g42e69bc/sysdeps/powerpc/powerpc32/____longjmp_chk.S --- glibc-2.10-187-gae612b0/sysdeps/powerpc/powerpc32/____longjmp_chk.S
+++ glibc-2.10.90-4/sysdeps/powerpc/powerpc32/____longjmp_chk.S +++ glibc-2.10.90-5/sysdeps/powerpc/powerpc32/____longjmp_chk.S
@@ -49,8 +49,16 @@ @@ -49,8 +49,16 @@
#define CHECK_SP(reg) \ #define CHECK_SP(reg) \
cmplw reg, r1; \ cmplw reg, r1; \
@ -1748,8 +1784,8 @@
.Lok: .Lok:
#include <__longjmp-common.S> #include <__longjmp-common.S>
--- glibc-2.10-181-g42e69bc/sysdeps/powerpc/powerpc64/Makefile --- glibc-2.10-187-gae612b0/sysdeps/powerpc/powerpc64/Makefile
+++ glibc-2.10.90-4/sysdeps/powerpc/powerpc64/Makefile +++ glibc-2.10.90-5/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
@ -1758,8 +1794,8 @@
endif endif
ifeq ($(subdir),elf) ifeq ($(subdir),elf)
--- glibc-2.10-181-g42e69bc/sysdeps/powerpc/powerpc64/____longjmp_chk.S --- glibc-2.10-187-gae612b0/sysdeps/powerpc/powerpc64/____longjmp_chk.S
+++ glibc-2.10.90-4/sysdeps/powerpc/powerpc64/____longjmp_chk.S +++ glibc-2.10.90-5/sysdeps/powerpc/powerpc64/____longjmp_chk.S
@@ -32,8 +32,16 @@ @@ -32,8 +32,16 @@
#define CHECK_SP(reg) \ #define CHECK_SP(reg) \
cmpld reg, r1; \ cmpld reg, r1; \
@ -1777,8 +1813,8 @@
.Lok: .Lok:
#include <__longjmp-common.S> #include <__longjmp-common.S>
--- glibc-2.10-181-g42e69bc/sysdeps/unix/nice.c --- glibc-2.10-187-gae612b0/sysdeps/unix/nice.c
+++ glibc-2.10.90-4/sysdeps/unix/nice.c +++ glibc-2.10.90-5/sysdeps/unix/nice.c
@@ -42,7 +42,12 @@ nice (int incr) @@ -42,7 +42,12 @@ nice (int incr)
__set_errno (save); __set_errno (save);
} }
@ -1793,8 +1829,8 @@
if (result == -1) if (result == -1)
{ {
if (errno == EACCES) if (errno == EACCES)
--- glibc-2.10-181-g42e69bc/sysdeps/unix/sysv/linux/check_pf.c --- glibc-2.10-187-gae612b0/sysdeps/unix/sysv/linux/check_pf.c
+++ glibc-2.10.90-4/sysdeps/unix/sysv/linux/check_pf.c +++ glibc-2.10.90-5/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>
@ -1810,8 +1846,8 @@
#ifndef IFA_F_HOMEADDRESS #ifndef IFA_F_HOMEADDRESS
# define IFA_F_HOMEADDRESS 0 # define IFA_F_HOMEADDRESS 0
--- glibc-2.10-181-g42e69bc/sysdeps/unix/sysv/linux/dl-osinfo.h --- glibc-2.10-187-gae612b0/sysdeps/unix/sysv/linux/dl-osinfo.h
+++ glibc-2.10.90-4/sysdeps/unix/sysv/linux/dl-osinfo.h +++ glibc-2.10.90-5/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. */
@ -1859,8 +1895,8 @@
} }
else else
#endif #endif
--- glibc-2.10-181-g42e69bc/sysdeps/unix/sysv/linux/futimesat.c --- glibc-2.10-187-gae612b0/sysdeps/unix/sysv/linux/futimesat.c
+++ glibc-2.10.90-4/sysdeps/unix/sysv/linux/futimesat.c +++ glibc-2.10.90-5/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;
@ -1903,8 +1939,8 @@
{ {
size_t filelen = strlen (file); size_t filelen = strlen (file);
static const char procfd[] = "/proc/self/fd/%d/%s"; static const char procfd[] = "/proc/self/fd/%d/%s";
--- glibc-2.10-181-g42e69bc/sysdeps/unix/sysv/linux/i386/clone.S --- glibc-2.10-187-gae612b0/sysdeps/unix/sysv/linux/i386/clone.S
+++ glibc-2.10.90-4/sysdeps/unix/sysv/linux/i386/clone.S +++ glibc-2.10.90-5/sysdeps/unix/sysv/linux/i386/clone.S
@@ -120,9 +120,6 @@ L(pseudo_end): @@ -120,9 +120,6 @@ L(pseudo_end):
ret ret
@ -1923,8 +1959,8 @@
cfi_startproc cfi_startproc
PSEUDO_END (BP_SYM (__clone)) PSEUDO_END (BP_SYM (__clone))
--- glibc-2.10-181-g42e69bc/sysdeps/unix/sysv/linux/i386/dl-cache.h --- glibc-2.10-187-gae612b0/sysdeps/unix/sysv/linux/i386/dl-cache.h
+++ glibc-2.10.90-4/sysdeps/unix/sysv/linux/i386/dl-cache.h +++ glibc-2.10.90-5/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.
@ -1985,8 +2021,8 @@
+ } while (0) + } while (0)
+ +
+#include_next <dl-cache.h> +#include_next <dl-cache.h>
--- glibc-2.10-181-g42e69bc/sysdeps/unix/sysv/linux/ia64/dl-cache.h --- glibc-2.10-187-gae612b0/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+++ glibc-2.10.90-4/sysdeps/unix/sysv/linux/ia64/dl-cache.h +++ glibc-2.10.90-5/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)
@ -2019,29 +2055,29 @@
+ } while (0) + } while (0)
+ +
#include_next <dl-cache.h> #include_next <dl-cache.h>
--- glibc-2.10-181-g42e69bc/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c --- glibc-2.10-187-gae612b0/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+++ glibc-2.10.90-4/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +++ glibc-2.10.90-5/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.10-181-g42e69bc/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h --- glibc-2.10-187-gae612b0/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+++ glibc-2.10.90-4/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +++ glibc-2.10.90-5/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.10-181-g42e69bc/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed --- glibc-2.10-187-gae612b0/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+++ glibc-2.10.90-4/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +++ glibc-2.10.90-5/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.10-181-g42e69bc/sysdeps/unix/sysv/linux/netlinkaccess.h --- glibc-2.10-187-gae612b0/sysdeps/unix/sysv/linux/netlinkaccess.h
+++ glibc-2.10.90-4/sysdeps/unix/sysv/linux/netlinkaccess.h +++ glibc-2.10.90-5/sysdeps/unix/sysv/linux/netlinkaccess.h
@@ -25,6 +25,24 @@ @@ -25,6 +25,24 @@
#include <kernel-features.h> #include <kernel-features.h>
@ -2067,8 +2103,8 @@
struct netlink_res struct netlink_res
{ {
--- glibc-2.10-181-g42e69bc/sysdeps/unix/sysv/linux/paths.h --- glibc-2.10-187-gae612b0/sysdeps/unix/sysv/linux/paths.h
+++ glibc-2.10.90-4/sysdeps/unix/sysv/linux/paths.h +++ glibc-2.10.90-5/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"
@ -2078,8 +2114,8 @@
#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.10-181-g42e69bc/sysdeps/unix/sysv/linux/tcsetattr.c --- glibc-2.10-187-gae612b0/sysdeps/unix/sysv/linux/tcsetattr.c
+++ glibc-2.10.90-4/sysdeps/unix/sysv/linux/tcsetattr.c +++ glibc-2.10.90-5/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;
@ -2125,8 +2161,8 @@
+ return retval; + return retval;
} }
libc_hidden_def (tcsetattr) libc_hidden_def (tcsetattr)
--- glibc-2.10-181-g42e69bc/sysdeps/unix/sysv/linux/x86_64/clone.S --- glibc-2.10-187-gae612b0/sysdeps/unix/sysv/linux/x86_64/clone.S
+++ glibc-2.10.90-4/sysdeps/unix/sysv/linux/x86_64/clone.S +++ glibc-2.10.90-5/sysdeps/unix/sysv/linux/x86_64/clone.S
@@ -89,9 +89,6 @@ L(pseudo_end): @@ -89,9 +89,6 @@ L(pseudo_end):
ret ret
@ -2145,8 +2181,8 @@
cfi_startproc; cfi_startproc;
PSEUDO_END (BP_SYM (__clone)) PSEUDO_END (BP_SYM (__clone))
--- glibc-2.10-181-g42e69bc/timezone/zic.c --- glibc-2.10-187-gae612b0/timezone/zic.c
+++ glibc-2.10.90-4/timezone/zic.c +++ glibc-2.10.90-5/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;

11
glibc.spec
View File

@ -1,4 +1,4 @@
%define glibcsrcdir glibc-2.10-181-g42e69bc %define glibcsrcdir glibc-2.10-187-gae612b0
%define glibcversion 2.10.90 %define glibcversion 2.10.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: 4 Release: 5
# 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
@ -333,7 +333,8 @@ shift
rm -rf $builddir rm -rf $builddir
mkdir $builddir ; cd $builddir mkdir $builddir ; cd $builddir
build_CFLAGS="$BuildFlags -g -O3 $*" build_CFLAGS="$BuildFlags -g -O3 $*"
CC="$GCC" CXX="$GXX" CFLAGS="$build_CFLAGS" ../configure --prefix=%{_prefix} \ ../configure CC="$GCC" CXX="$GXX" CFLAGS="$build_CFLAGS" \
--prefix=%{_prefix} \
--enable-add-ons=nptl$AddOns --without-cvs $EnableKernel \ --enable-add-ons=nptl$AddOns --without-cvs $EnableKernel \
--with-headers=%{_prefix}/include --enable-bind-now \ --with-headers=%{_prefix}/include --enable-bind-now \
--with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \ --with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \
@ -1030,6 +1031,10 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Wed Jul 22 2009 Andreas Schwab <schwab@redhat.com> - 2.10.90-5
- Update from master.
- Undefine __i686 on x86 to fix build.
* Mon Jul 20 2009 Andreas Schwab <schwab@redhat.com> - 2.10.90-4 * Mon Jul 20 2009 Andreas Schwab <schwab@redhat.com> - 2.10.90-4
- Update from master. - Update from master.
- Don't build separate i686 package. - Don't build separate i686 package.

1
import.log
View File

@ -14,3 +14,4 @@ glibc-2_9_90-15:HEAD:glibc-2.9.90-15.src.rpm:1239312092
glibc-2_9_90-16:HEAD:glibc-2.9.90-16.src.rpm:1239744476 glibc-2_9_90-16:HEAD:glibc-2.9.90-16.src.rpm:1239744476
glibc-2_10_90-1:HEAD:glibc-2.10.90-1.src.rpm:1246030924 glibc-2_10_90-1:HEAD:glibc-2.10.90-1.src.rpm:1246030924
glibc-2_10_90-4:HEAD:glibc-2.10.90-4.src.rpm:1248096214 glibc-2_10_90-4:HEAD:glibc-2.10.90-4.src.rpm:1248096214
glibc-2_10_90-5:HEAD:glibc-2.10.90-5.src.rpm:1248267823

4
sources
View File

@ -1,2 +1,2 @@
398270f200e1ec186de374bb041c3b1e glibc-2.10-181-g42e69bc-fedora.tar.bz2 53b6215a18e3c8f48f401d2dbd28c484 glibc-2.10-187-gae612b0-fedora.tar.bz2
fffd37bec445c6f7599ea5796914b4b7 glibc-2.10-181-g42e69bc.tar.bz2 2ca111876cafe2b8701e27bc9d9f9c97 glibc-2.10-187-gae612b0.tar.bz2