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

2.12.90-21

Browse Source
This commit is contained in:
Andreas Schwab 2010-12-14 17:22:16 +01:00
parent 7dc6703b31
commit a1faa0a0a8
3 changed files with 179 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

269
glibc-fedora.patch
View File

@ -1,5 +1,5 @@
--- glibc-2.12-232-gdbb0472/ChangeLog --- glibc-2.12-232-gdbb0472/ChangeLog
+++ /ChangeLog +++ glibc-2.12.90-21/ChangeLog
@@ -68,6 +68,11 @@ @@ -68,6 +68,11 @@
* sysdeps/unix/sysv/linux/sys/swap.h (SWAP_FLAG_DISCARD): Define. * sysdeps/unix/sysv/linux/sys/swap.h (SWAP_FLAG_DISCARD): Define.
@ -118,7 +118,7 @@
* sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi. * sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi.
--- glibc-2.12-232-gdbb0472/ChangeLog.15 --- glibc-2.12-232-gdbb0472/ChangeLog.15
+++ /ChangeLog.15 +++ glibc-2.12.90-21/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>
@ -185,7 +185,7 @@
* scripts/extract-abilist.awk: If `lastversion' variable defined, omit * scripts/extract-abilist.awk: If `lastversion' variable defined, omit
--- glibc-2.12-232-gdbb0472/ChangeLog.16 --- glibc-2.12-232-gdbb0472/ChangeLog.16
+++ /ChangeLog.16 +++ glibc-2.12.90-21/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.
@ -240,7 +240,7 @@
[BZ #1137] [BZ #1137]
--- glibc-2.12-232-gdbb0472/ChangeLog.17 --- glibc-2.12-232-gdbb0472/ChangeLog.17
+++ /ChangeLog.17 +++ glibc-2.12.90-21/ChangeLog.17
@@ -256,6 +256,12 @@ @@ -256,6 +256,12 @@
* Makerules (libc-abis): Fix search for libc-abis in add-ons. * Makerules (libc-abis): Fix search for libc-abis in add-ons.
@ -326,7 +326,7 @@
[BZ #3632] [BZ #3632]
--- glibc-2.12-232-gdbb0472/Makeconfig --- glibc-2.12-232-gdbb0472/Makeconfig
+++ /Makeconfig +++ glibc-2.12.90-21/Makeconfig
@@ -789,12 +789,12 @@ endif @@ -789,12 +789,12 @@ endif
# The assembler can generate debug information too. # The assembler can generate debug information too.
ifndef ASFLAGS ifndef ASFLAGS
@ -344,7 +344,7 @@
ifndef BUILD_CC ifndef BUILD_CC
BUILD_CC = $(CC) BUILD_CC = $(CC)
--- glibc-2.12-232-gdbb0472/csu/Makefile --- glibc-2.12-232-gdbb0472/csu/Makefile
+++ /csu/Makefile +++ glibc-2.12.90-21/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 $@
@ -356,7 +356,7 @@
vpath initfini.c $(sysdirs) vpath initfini.c $(sysdirs)
--- glibc-2.12-232-gdbb0472/csu/elf-init.c --- glibc-2.12-232-gdbb0472/csu/elf-init.c
+++ /csu/elf-init.c +++ glibc-2.12.90-21/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;
@ -382,7 +382,7 @@
/* 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.12-232-gdbb0472/debug/tst-chk1.c --- glibc-2.12-232-gdbb0472/debug/tst-chk1.c
+++ /debug/tst-chk1.c +++ glibc-2.12.90-21/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. */
@ -412,7 +412,7 @@
# else # else
# define O 1 # define O 1
--- glibc-2.12-232-gdbb0472/elf/Makefile --- glibc-2.12-232-gdbb0472/elf/Makefile
+++ /elf/Makefile +++ glibc-2.12.90-21/elf/Makefile
@@ -89,6 +89,7 @@ distribute := rtld-Rules \ @@ -89,6 +89,7 @@ distribute := rtld-Rules \
unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \ unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \
unload6mod1.c unload6mod2.c unload6mod3.c \ unload6mod1.c unload6mod2.c unload6mod3.c \
@ -467,7 +467,7 @@
$(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a
$(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so
--- glibc-2.12-232-gdbb0472/elf/dl-close.c --- glibc-2.12-232-gdbb0472/elf/dl-close.c
+++ /elf/dl-close.c +++ glibc-2.12.90-21/elf/dl-close.c
@@ -421,6 +421,13 @@ _dl_close_worker (struct link_map *map) @@ -421,6 +421,13 @@ _dl_close_worker (struct link_map *map)
imap->l_scope_max = new_size; imap->l_scope_max = new_size;
@ -483,7 +483,7 @@
/* The loader is gone, so mark the object as not having one. /* The loader is gone, so mark the object as not having one.
Note: l_idx != IDX_STILL_USED -> object will be removed. */ Note: l_idx != IDX_STILL_USED -> object will be removed. */
--- glibc-2.12-232-gdbb0472/elf/dl-deps.c --- glibc-2.12-232-gdbb0472/elf/dl-deps.c
+++ /elf/dl-deps.c +++ glibc-2.12.90-21/elf/dl-deps.c
@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map, @@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
nneeded * sizeof needed[0]); nneeded * sizeof needed[0]);
atomic_write_barrier (); atomic_write_barrier ();
@ -501,7 +501,7 @@
{ {
atomic_write_barrier (); atomic_write_barrier ();
--- glibc-2.12-232-gdbb0472/elf/dl-init.c --- glibc-2.12-232-gdbb0472/elf/dl-init.c
+++ /elf/dl-init.c +++ glibc-2.12.90-21/elf/dl-init.c
@@ -24,11 +24,9 @@ @@ -24,11 +24,9 @@
/* Type of the initializer. */ /* Type of the initializer. */
typedef void (*init_t) (int, char **, char **); typedef void (*init_t) (int, char **, char **);
@ -525,7 +525,7 @@
} }
INTDEF (_dl_init) INTDEF (_dl_init)
--- glibc-2.12-232-gdbb0472/elf/dl-libc.c --- glibc-2.12-232-gdbb0472/elf/dl-libc.c
+++ /elf/dl-libc.c +++ glibc-2.12.90-21/elf/dl-libc.c
@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem) @@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
@ -553,7 +553,7 @@
if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
--- glibc-2.12-232-gdbb0472/elf/dl-object.c --- glibc-2.12-232-gdbb0472/elf/dl-object.c
+++ /elf/dl-object.c +++ glibc-2.12.90-21/elf/dl-object.c
@@ -220,6 +220,9 @@ _dl_new_object (char *realname, const char *libname, int type, @@ -220,6 +220,9 @@ _dl_new_object (char *realname, const char *libname, int type,
out: out:
new->l_origin = origin; new->l_origin = origin;
@ -565,7 +565,7 @@
return new; return new;
} }
--- glibc-2.12-232-gdbb0472/elf/dl-support.c --- glibc-2.12-232-gdbb0472/elf/dl-support.c
+++ /elf/dl-support.c +++ glibc-2.12.90-21/elf/dl-support.c
@@ -80,10 +80,8 @@ unsigned long long _dl_load_adds; @@ -80,10 +80,8 @@ unsigned long long _dl_load_adds;
create a fake scope containing nothing. */ create a fake scope containing nothing. */
struct r_scope_elem _dl_initial_searchlist; struct r_scope_elem _dl_initial_searchlist;
@ -578,7 +578,7 @@
/* Random data provided by the kernel. */ /* Random data provided by the kernel. */
void *_dl_random; void *_dl_random;
--- glibc-2.12-232-gdbb0472/elf/ldconfig.c --- glibc-2.12-232-gdbb0472/elf/ldconfig.c
+++ /elf/ldconfig.c +++ glibc-2.12.90-21/elf/ldconfig.c
@@ -1031,17 +1031,19 @@ search_dirs (void) @@ -1031,17 +1031,19 @@ search_dirs (void)
@ -661,7 +661,7 @@
const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;
--- glibc-2.12-232-gdbb0472/elf/rtld.c --- glibc-2.12-232-gdbb0472/elf/rtld.c
+++ /elf/rtld.c +++ glibc-2.12.90-21/elf/rtld.c
@@ -106,7 +106,6 @@ static struct audit_list @@ -106,7 +106,6 @@ static struct audit_list
struct audit_list *next; struct audit_list *next;
} *audit_list; } *audit_list;
@ -720,7 +720,7 @@
{ {
/* There was an explicit ref to the dynamic linker as a shared lib. /* There was an explicit ref to the dynamic linker as a shared lib.
--- glibc-2.12-232-gdbb0472/elf/tst-stackguard1.c --- glibc-2.12-232-gdbb0472/elf/tst-stackguard1.c
+++ /elf/tst-stackguard1.c +++ glibc-2.12.90-21/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;
@ -746,7 +746,7 @@
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.12-232-gdbb0472/elf/unload8.c --- glibc-2.12-232-gdbb0472/elf/unload8.c
+++ /elf/unload8.c +++ glibc-2.12.90-21/elf/unload8.c
@@ -0,0 +1,33 @@ @@ -0,0 +1,33 @@
+#include <dlfcn.h> +#include <dlfcn.h>
+#include <stdio.h> +#include <stdio.h>
@ -782,7 +782,7 @@
+ return 0; + return 0;
+} +}
--- glibc-2.12-232-gdbb0472/elf/unload8mod1.c --- glibc-2.12-232-gdbb0472/elf/unload8mod1.c
+++ /elf/unload8mod1.c +++ glibc-2.12.90-21/elf/unload8mod1.c
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
+extern void mod2 (void); +extern void mod2 (void);
+ +
@ -792,11 +792,11 @@
+ mod2 (); + mod2 ();
+} +}
--- glibc-2.12-232-gdbb0472/elf/unload8mod1x.c --- glibc-2.12-232-gdbb0472/elf/unload8mod1x.c
+++ /elf/unload8mod1x.c +++ glibc-2.12.90-21/elf/unload8mod1x.c
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+int mod1x; +int mod1x;
--- glibc-2.12-232-gdbb0472/elf/unload8mod2.c --- glibc-2.12-232-gdbb0472/elf/unload8mod2.c
+++ /elf/unload8mod2.c +++ glibc-2.12.90-21/elf/unload8mod2.c
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
+extern void mod3 (void); +extern void mod3 (void);
+ +
@ -806,7 +806,7 @@
+ mod3 (); + mod3 ();
+} +}
--- glibc-2.12-232-gdbb0472/elf/unload8mod3.c --- glibc-2.12-232-gdbb0472/elf/unload8mod3.c
+++ /elf/unload8mod3.c +++ glibc-2.12.90-21/elf/unload8mod3.c
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
+#include <dlfcn.h> +#include <dlfcn.h>
+#include <stdio.h> +#include <stdio.h>
@ -836,15 +836,15 @@
+ atexit (mod3_fini); + atexit (mod3_fini);
+} +}
--- glibc-2.12-232-gdbb0472/include/bits/stdlib-ldbl.h --- glibc-2.12-232-gdbb0472/include/bits/stdlib-ldbl.h
+++ /include/bits/stdlib-ldbl.h +++ glibc-2.12.90-21/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.12-232-gdbb0472/include/bits/wchar-ldbl.h --- glibc-2.12-232-gdbb0472/include/bits/wchar-ldbl.h
+++ /include/bits/wchar-ldbl.h +++ glibc-2.12.90-21/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.12-232-gdbb0472/include/features.h --- glibc-2.12-232-gdbb0472/include/features.h
+++ /include/features.h +++ glibc-2.12.90-21/include/features.h
@@ -308,8 +308,13 @@ @@ -308,8 +308,13 @@
#endif #endif
@ -862,7 +862,7 @@
# else # else
# define __USE_FORTIFY_LEVEL 1 # define __USE_FORTIFY_LEVEL 1
--- glibc-2.12-232-gdbb0472/include/link.h --- glibc-2.12-232-gdbb0472/include/link.h
+++ /include/link.h +++ glibc-2.12.90-21/include/link.h
@@ -192,6 +192,9 @@ struct link_map @@ -192,6 +192,9 @@ struct link_map
during LD_TRACE_PRELINKING=1 during LD_TRACE_PRELINKING=1
contains any DT_SYMBOLIC contains any DT_SYMBOLIC
@ -874,7 +874,7 @@
/* Collected information about own RPATH directories. */ /* Collected information about own RPATH directories. */
struct r_search_path_struct l_rpath_dirs; struct r_search_path_struct l_rpath_dirs;
--- glibc-2.12-232-gdbb0472/include/sys/resource.h --- glibc-2.12-232-gdbb0472/include/sys/resource.h
+++ /include/sys/resource.h +++ glibc-2.12.90-21/include/sys/resource.h
@@ -12,4 +12,5 @@ extern int __getrusage (enum __rusage_who __who, struct rusage *__usage) @@ -12,4 +12,5 @@ extern int __getrusage (enum __rusage_who __who, struct rusage *__usage)
extern int __setrlimit (enum __rlimit_resource __resource, extern int __setrlimit (enum __rlimit_resource __resource,
@ -882,7 +882,7 @@
+libc_hidden_proto (__getrlimit) +libc_hidden_proto (__getrlimit)
#endif #endif
--- glibc-2.12-232-gdbb0472/inet/Makefile --- glibc-2.12-232-gdbb0472/inet/Makefile
+++ /inet/Makefile +++ glibc-2.12.90-21/inet/Makefile
@@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \ @@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \
include ../Rules include ../Rules
@ -893,7 +893,7 @@
CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions
--- glibc-2.12-232-gdbb0472/intl/locale.alias --- glibc-2.12-232-gdbb0472/intl/locale.alias
+++ /intl/locale.alias +++ glibc-2.12.90-21/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
@ -904,7 +904,7 @@
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.12-232-gdbb0472/libio/stdio.h --- glibc-2.12-232-gdbb0472/libio/stdio.h
+++ /libio/stdio.h +++ glibc-2.12.90-21/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. */
@ -919,7 +919,7 @@
__BEGIN_NAMESPACE_STD __BEGIN_NAMESPACE_STD
/* Remove file FILENAME. */ /* Remove file FILENAME. */
--- glibc-2.12-232-gdbb0472/locale/iso-4217.def --- glibc-2.12-232-gdbb0472/locale/iso-4217.def
+++ /locale/iso-4217.def +++ glibc-2.12.90-21/locale/iso-4217.def
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
* *
* !!! The list has to be sorted !!! * !!! The list has to be sorted !!!
@ -1012,7 +1012,7 @@
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.12-232-gdbb0472/locale/programs/locarchive.c --- glibc-2.12-232-gdbb0472/locale/programs/locarchive.c
+++ /locale/programs/locarchive.c +++ glibc-2.12.90-21/locale/programs/locarchive.c
@@ -134,7 +134,7 @@ create_archive (const char *archivefname, struct locarhandle *ah) @@ -134,7 +134,7 @@ create_archive (const char *archivefname, struct locarhandle *ah)
size_t reserved = RESERVE_MMAP_SIZE; size_t reserved = RESERVE_MMAP_SIZE;
int xflags = 0; int xflags = 0;
@ -1072,7 +1072,7 @@
const char *oldname, uint32_t *locrec_offset_p) const char *oldname, uint32_t *locrec_offset_p)
{ {
--- glibc-2.12-232-gdbb0472/localedata/ChangeLog --- glibc-2.12-232-gdbb0472/localedata/ChangeLog
+++ /localedata/ChangeLog +++ glibc-2.12.90-21/localedata/ChangeLog
@@ -1,3 +1,8 @@ @@ -1,3 +1,8 @@
+2010-12-08 Andreas Schwab <schwab@redhat.com> +2010-12-08 Andreas Schwab <schwab@redhat.com>
+ +
@ -1083,7 +1083,7 @@
* locales/es_CR (LC_ADDRESS): Fix character names in lang_ab. * locales/es_CR (LC_ADDRESS): Fix character names in lang_ab.
--- glibc-2.12-232-gdbb0472/localedata/Makefile --- glibc-2.12-232-gdbb0472/localedata/Makefile
+++ /localedata/Makefile +++ glibc-2.12.90-21/localedata/Makefile
@@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir @@ -227,6 +227,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/'`; \
@ -1093,7 +1093,7 @@
$(addprefix --prefix=,$(install_root)) $$locale; \ $(addprefix --prefix=,$(install_root)) $$locale; \
echo ' done'; \ echo ' done'; \
--- glibc-2.12-232-gdbb0472/localedata/SUPPORTED --- glibc-2.12-232-gdbb0472/localedata/SUPPORTED
+++ /localedata/SUPPORTED +++ glibc-2.12.90-21/localedata/SUPPORTED
@@ -46,8 +46,8 @@ ar_TN.UTF-8/UTF-8 \ @@ -46,8 +46,8 @@ ar_TN.UTF-8/UTF-8 \
ar_TN/ISO-8859-6 \ ar_TN/ISO-8859-6 \
ar_YE.UTF-8/UTF-8 \ ar_YE.UTF-8/UTF-8 \
@ -1158,7 +1158,7 @@
uk_UA.UTF-8/UTF-8 \ uk_UA.UTF-8/UTF-8 \
uk_UA/KOI8-U \ uk_UA/KOI8-U \
--- glibc-2.12-232-gdbb0472/localedata/locales/cy_GB --- glibc-2.12-232-gdbb0472/localedata/locales/cy_GB
+++ /localedata/locales/cy_GB +++ glibc-2.12.90-21/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>"
@ -1174,7 +1174,7 @@
LC_MESSAGES LC_MESSAGES
--- glibc-2.12-232-gdbb0472/localedata/locales/en_GB --- glibc-2.12-232-gdbb0472/localedata/locales/en_GB
+++ /localedata/locales/en_GB +++ glibc-2.12.90-21/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>"
@ -1187,7 +1187,7 @@
<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.12-232-gdbb0472/localedata/locales/no_NO --- glibc-2.12-232-gdbb0472/localedata/locales/no_NO
+++ /localedata/locales/no_NO +++ glibc-2.12.90-21/localedata/locales/no_NO
@@ -0,0 +1,69 @@ @@ -0,0 +1,69 @@
+escape_char / +escape_char /
+comment_char % +comment_char %
@ -1259,7 +1259,7 @@
+copy "nb_NO" +copy "nb_NO"
+END LC_ADDRESS +END LC_ADDRESS
--- glibc-2.12-232-gdbb0472/localedata/locales/zh_TW --- glibc-2.12-232-gdbb0472/localedata/locales/zh_TW
+++ /localedata/locales/zh_TW +++ glibc-2.12.90-21/localedata/locales/zh_TW
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
comment_char % comment_char %
escape_char / escape_char /
@ -1288,7 +1288,7 @@
date "2000-08-02" date "2000-08-02"
% %
--- glibc-2.12-232-gdbb0472/malloc/mcheck.c --- glibc-2.12-232-gdbb0472/malloc/mcheck.c
+++ /malloc/mcheck.c +++ glibc-2.12.90-21/malloc/mcheck.c
@@ -25,10 +25,26 @@ @@ -25,10 +25,26 @@
# include <mcheck.h> # include <mcheck.h>
# include <stdint.h> # include <stdint.h>
@ -1366,7 +1366,7 @@
old_free_hook = __free_hook; old_free_hook = __free_hook;
__free_hook = freehook; __free_hook = freehook;
--- glibc-2.12-232-gdbb0472/manual/libc.texinfo --- glibc-2.12-232-gdbb0472/manual/libc.texinfo
+++ /manual/libc.texinfo +++ glibc-2.12.90-21/manual/libc.texinfo
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
@c setchapternewpage odd @c setchapternewpage odd
@ -1377,7 +1377,7 @@
* Libc: (libc). C library. * Libc: (libc). C library.
@end direntry @end direntry
--- glibc-2.12-232-gdbb0472/misc/sys/cdefs.h --- glibc-2.12-232-gdbb0472/misc/sys/cdefs.h
+++ /misc/sys/cdefs.h +++ glibc-2.12.90-21/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)
@ -1422,7 +1422,7 @@
# define __va_arg_pack_len() __builtin_va_arg_pack_len () # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
#endif #endif
--- glibc-2.12-232-gdbb0472/nis/Makefile --- glibc-2.12-232-gdbb0472/nis/Makefile
+++ /nis/Makefile +++ glibc-2.12.90-21/nis/Makefile
@@ -69,6 +69,8 @@ libnss_nisplus-inhibit-o = $(filter-out .os,$(object-suffixes)) @@ -69,6 +69,8 @@ libnss_nisplus-inhibit-o = $(filter-out .os,$(object-suffixes))
include ../Rules include ../Rules
@ -1433,7 +1433,7 @@
$(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version) $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version)
$(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \ $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \
--- glibc-2.12-232-gdbb0472/nis/nss --- glibc-2.12-232-gdbb0472/nis/nss
+++ /nis/nss +++ glibc-2.12.90-21/nis/nss
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
# 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
@ -1444,7 +1444,7 @@
# ADJUNCT_AS_SHADOW # ADJUNCT_AS_SHADOW
# If set to TRUE, the passwd routines in the NIS NSS module will not # If set to TRUE, the passwd routines in the NIS NSS module will not
--- glibc-2.12-232-gdbb0472/nptl/ChangeLog --- glibc-2.12-232-gdbb0472/nptl/ChangeLog
+++ /nptl/ChangeLog +++ glibc-2.12.90-21/nptl/ChangeLog
@@ -3965,6 +3965,15 @@ @@ -3965,6 +3965,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.
@ -1486,7 +1486,7 @@
* tst-cancel17.c (do_test): Check if aio_cancel failed. * tst-cancel17.c (do_test): Check if aio_cancel failed.
--- glibc-2.12-232-gdbb0472/nptl/Makefile --- glibc-2.12-232-gdbb0472/nptl/Makefile
+++ /nptl/Makefile +++ glibc-2.12.90-21/nptl/Makefile
@@ -342,7 +342,8 @@ endif @@ -342,7 +342,8 @@ endif
extra-objs += $(crti-objs) $(crtn-objs) extra-objs += $(crti-objs) $(crtn-objs)
omit-deps += crti crtn omit-deps += crti crtn
@ -1520,7 +1520,7 @@
$(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
endif endif
--- glibc-2.12-232-gdbb0472/nptl/Versions --- glibc-2.12-232-gdbb0472/nptl/Versions
+++ /nptl/Versions +++ glibc-2.12.90-21/nptl/Versions
@@ -29,6 +29,7 @@ libc { @@ -29,6 +29,7 @@ libc {
GLIBC_PRIVATE { GLIBC_PRIVATE {
# Internal libc interface to libpthread # Internal libc interface to libpthread
@ -1530,7 +1530,7 @@
} }
--- glibc-2.12-232-gdbb0472/nptl/allocatestack.c --- glibc-2.12-232-gdbb0472/nptl/allocatestack.c
+++ /nptl/allocatestack.c +++ glibc-2.12.90-21/nptl/allocatestack.c
@@ -994,7 +994,16 @@ setxid_mark_thread (struct xid_command *cmdp, struct pthread *t) @@ -994,7 +994,16 @@ setxid_mark_thread (struct xid_command *cmdp, struct pthread *t)
/* If the thread is exiting right now, ignore it. */ /* If the thread is exiting right now, ignore it. */
@ -1550,7 +1550,7 @@
while (atomic_compare_and_exchange_bool_acq (&t->cancelhandling, while (atomic_compare_and_exchange_bool_acq (&t->cancelhandling,
ch | SETXID_BITMASK, ch)); ch | SETXID_BITMASK, ch));
--- glibc-2.12-232-gdbb0472/nptl/nptl-init.c --- glibc-2.12-232-gdbb0472/nptl/nptl-init.c
+++ /nptl/nptl-init.c +++ glibc-2.12.90-21/nptl/nptl-init.c
@@ -396,7 +396,7 @@ __pthread_initialize_minimal_internal (void) @@ -396,7 +396,7 @@ __pthread_initialize_minimal_internal (void)
/* Determine the default allowed stack size. This is the size used /* Determine the default allowed stack size. This is the size used
in case the user does not specify one. */ in case the user does not specify one. */
@ -1561,7 +1561,7 @@
/* The system limit is not usable. Use an architecture-specific /* The system limit is not usable. Use an architecture-specific
default. */ default. */
--- glibc-2.12-232-gdbb0472/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h --- glibc-2.12-232-gdbb0472/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+++ /nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +++ glibc-2.12.90-21/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
@ -1571,7 +1571,7 @@
+ +
#endif /* bits/posix_opt.h */ #endif /* bits/posix_opt.h */
--- glibc-2.12-232-gdbb0472/nptl/sysdeps/unix/sysv/linux/i386/Versions --- glibc-2.12-232-gdbb0472/nptl/sysdeps/unix/sysv/linux/i386/Versions
+++ /nptl/sysdeps/unix/sysv/linux/i386/Versions +++ glibc-2.12.90-21/nptl/sysdeps/unix/sysv/linux/i386/Versions
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
+libc { +libc {
+ GLIBC_PRIVATE { + GLIBC_PRIVATE {
@ -1580,7 +1580,7 @@
+ } + }
+} +}
--- glibc-2.12-232-gdbb0472/nptl/sysdeps/unix/sysv/linux/i386/smp.h --- glibc-2.12-232-gdbb0472/nptl/sysdeps/unix/sysv/linux/i386/smp.h
+++ /nptl/sysdeps/unix/sysv/linux/i386/smp.h +++ glibc-2.12.90-21/nptl/sysdeps/unix/sysv/linux/i386/smp.h
@@ -37,7 +37,7 @@ is_smp_system (void) @@ -37,7 +37,7 @@ is_smp_system (void)
char *cp; char *cp;
@ -1591,7 +1591,7 @@
else else
{ {
--- glibc-2.12-232-gdbb0472/nptl/sysdeps/unix/sysv/linux/kernel-features.h --- glibc-2.12-232-gdbb0472/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+++ /nptl/sysdeps/unix/sysv/linux/kernel-features.h +++ glibc-2.12.90-21/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>
+ +
@ -1600,7 +1600,7 @@
+# define __ASSUME_CLONE_THREAD_FLAGS 1 +# define __ASSUME_CLONE_THREAD_FLAGS 1
+#endif +#endif
--- glibc-2.12-232-gdbb0472/nptl/tst-stackguard1.c --- glibc-2.12-232-gdbb0472/nptl/tst-stackguard1.c
+++ /nptl/tst-stackguard1.c +++ glibc-2.12.90-21/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;
@ -1626,7 +1626,7 @@
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.12-232-gdbb0472/nscd/nscd.conf --- glibc-2.12-232-gdbb0472/nscd/nscd.conf
+++ /nscd/nscd.conf +++ glibc-2.12.90-21/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
@ -1637,7 +1637,7 @@
debug-level 0 debug-level 0
# reload-count 5 # reload-count 5
--- glibc-2.12-232-gdbb0472/nscd/nscd.init --- glibc-2.12-232-gdbb0472/nscd/nscd.init
+++ /nscd/nscd.init +++ glibc-2.12.90-21/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
@ -1715,7 +1715,7 @@
*) *)
echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
--- glibc-2.12-232-gdbb0472/nss/Makefile --- glibc-2.12-232-gdbb0472/nss/Makefile
+++ /nss/Makefile +++ glibc-2.12.90-21/nss/Makefile
@@ -75,6 +75,7 @@ endif @@ -75,6 +75,7 @@ endif
include ../Rules include ../Rules
@ -1725,7 +1725,7 @@
ifeq (yes,$(build-static-nss)) ifeq (yes,$(build-static-nss))
$(objpfx)getent: $(objpfx)libnss_files.a $(objpfx)getent: $(objpfx)libnss_files.a
--- glibc-2.12-232-gdbb0472/nss/nss_files/files-XXX.c --- glibc-2.12-232-gdbb0472/nss/nss_files/files-XXX.c
+++ /nss/nss_files/files-XXX.c +++ glibc-2.12.90-21/nss/nss_files/files-XXX.c
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/* Common code for file-based databases in nss_files module. /* Common code for file-based databases in nss_files module.
- Copyright (C) 1996-1999,2001,2002,2004,2007,2008 - Copyright (C) 1996-1999,2001,2002,2004,2007,2008
@ -1743,7 +1743,7 @@
if (buflen < sizeof *data + 2) if (buflen < sizeof *data + 2)
--- glibc-2.12-232-gdbb0472/posix/Makefile --- glibc-2.12-232-gdbb0472/posix/Makefile
+++ /posix/Makefile +++ glibc-2.12.90-21/posix/Makefile
@@ -325,15 +325,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ @@ -325,15 +325,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
@ -1765,7 +1765,7 @@
+ > $@.new + > $@.new
mv -f $@.new $@ mv -f $@.new $@
--- glibc-2.12-232-gdbb0472/posix/gai.conf --- glibc-2.12-232-gdbb0472/posix/gai.conf
+++ /posix/gai.conf +++ glibc-2.12.90-21/posix/gai.conf
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
# #
# precedence <mask> <value> # precedence <mask> <value>
@ -1791,7 +1791,7 @@
+# +#
+# This is what the Red Hat setting currently uses. +# This is what the Red Hat setting currently uses.
--- glibc-2.12-232-gdbb0472/posix/getconf.speclist.h --- glibc-2.12-232-gdbb0472/posix/getconf.speclist.h
+++ /posix/getconf.speclist.h +++ glibc-2.12.90-21/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 =
@ -1833,7 +1833,7 @@
+#endif +#endif
+""; +"";
--- glibc-2.12-232-gdbb0472/posix/regcomp.c --- glibc-2.12-232-gdbb0472/posix/regcomp.c
+++ /posix/regcomp.c +++ glibc-2.12.90-21/posix/regcomp.c
@@ -2745,40 +2745,29 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, @@ -2745,40 +2745,29 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
/* Local function for parse_bracket_exp used in _LIBC environement. /* Local function for parse_bracket_exp used in _LIBC environement.
@ -1966,7 +1966,7 @@
/* No valid character, treat it as a normal /* No valid character, treat it as a normal
character. */ character. */
--- glibc-2.12-232-gdbb0472/resolv/Makefile --- glibc-2.12-232-gdbb0472/resolv/Makefile
+++ /resolv/Makefile +++ glibc-2.12.90-21/resolv/Makefile
@@ -77,6 +77,7 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \ @@ -77,6 +77,7 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \
-Dgetnetbyaddr=res_getnetbyaddr -Dgetnetbyaddr=res_getnetbyaddr
@ -1976,7 +1976,7 @@
# The BIND code elicits some harmless warnings. # The BIND code elicits some harmless warnings.
+cflags += -Wno-strict-prototypes -Wno-write-strings +cflags += -Wno-strict-prototypes -Wno-write-strings
--- glibc-2.12-232-gdbb0472/resource/getrlimit.c --- glibc-2.12-232-gdbb0472/resource/getrlimit.c
+++ /resource/getrlimit.c +++ glibc-2.12.90-21/resource/getrlimit.c
@@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) @@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
__set_errno (ENOSYS); __set_errno (ENOSYS);
return -1; return -1;
@ -1986,7 +1986,7 @@
stub_warning (getrlimit) stub_warning (getrlimit)
--- glibc-2.12-232-gdbb0472/stdio-common/vfprintf.c --- glibc-2.12-232-gdbb0472/stdio-common/vfprintf.c
+++ /stdio-common/vfprintf.c +++ glibc-2.12.90-21/stdio-common/vfprintf.c
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2008, 2009 Free Software Foundation, Inc. -/* Copyright (C) 1991-2008, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2008, 2009, 2010 Free Software Foundation, Inc. +/* Copyright (C) 1991-2008, 2009, 2010 Free Software Foundation, Inc.
@ -2039,7 +2039,7 @@
len = strlen (string); \ len = strlen (string); \
} \ } \
--- glibc-2.12-232-gdbb0472/streams/Makefile --- glibc-2.12-232-gdbb0472/streams/Makefile
+++ /streams/Makefile +++ glibc-2.12.90-21/streams/Makefile
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
# #
subdir := streams subdir := streams
@ -2050,7 +2050,7 @@
include ../Rules include ../Rules
--- glibc-2.12-232-gdbb0472/sunrpc/Makefile --- glibc-2.12-232-gdbb0472/sunrpc/Makefile
+++ /sunrpc/Makefile +++ glibc-2.12.90-21/sunrpc/Makefile
@@ -129,6 +129,10 @@ CFLAGS-openchild.c = -fexceptions @@ -129,6 +129,10 @@ CFLAGS-openchild.c = -fexceptions
CPPFLAGS += -D_RPC_THREAD_SAFE_ CPPFLAGS += -D_RPC_THREAD_SAFE_
@ -2063,7 +2063,7 @@
$(objpfx)rpcgen: $(addprefix $(objpfx),$(rpcgen-objs)) \ $(objpfx)rpcgen: $(addprefix $(objpfx),$(rpcgen-objs)) \
--- glibc-2.12-232-gdbb0472/sysdeps/generic/dl-cache.h --- glibc-2.12-232-gdbb0472/sysdeps/generic/dl-cache.h
+++ /sysdeps/generic/dl-cache.h +++ glibc-2.12.90-21/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
@ -2080,7 +2080,7 @@
/* 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.12-232-gdbb0472/sysdeps/i386/Makefile --- glibc-2.12-232-gdbb0472/sysdeps/i386/Makefile
+++ /sysdeps/i386/Makefile +++ glibc-2.12.90-21/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
@ -2106,7 +2106,7 @@
ifeq ($(subdir),elf) ifeq ($(subdir),elf)
--- glibc-2.12-232-gdbb0472/sysdeps/i386/i686/Makefile --- glibc-2.12-232-gdbb0472/sysdeps/i386/i686/Makefile
+++ /sysdeps/i386/i686/Makefile +++ glibc-2.12.90-21/sysdeps/i386/i686/Makefile
@@ -9,19 +9,3 @@ stack-align-test-flags += -msse @@ -9,19 +9,3 @@ stack-align-test-flags += -msse
ifeq ($(subdir),string) ifeq ($(subdir),string)
sysdep_routines += cacheinfo sysdep_routines += cacheinfo
@ -2127,8 +2127,87 @@
-ASFLAGS-.ob += -Wa,-mtune=i686 -ASFLAGS-.ob += -Wa,-mtune=i686
-ASFLAGS-.oS += -Wa,-mtune=i686 -ASFLAGS-.oS += -Wa,-mtune=i686
-endif -endif
--- glibc-2.12-232-gdbb0472/sysdeps/i386/i686/multiarch/strcmp.S
+++ glibc-2.12.90-21/sysdeps/i386/i686/multiarch/strcmp.S
@@ -40,32 +40,37 @@
need strncmp before the initialization happened. */
#if (defined SHARED || !defined USE_AS_STRNCMP) && !defined NOT_IN_libc
# ifdef SHARED
- .section .gnu.linkonce.t.__i686.get_pc_thunk.dx,"ax",@progbits
- .globl __i686.get_pc_thunk.dx
- .hidden __i686.get_pc_thunk.dx
- .p2align 2
- .type __i686.get_pc_thunk.dx,@function
-__i686.get_pc_thunk.dx:
- movl (%esp), %edx
+ .section .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits
+ .globl __i686.get_pc_thunk.bx
+ .hidden __i686.get_pc_thunk.bx
+ .p2align 4
+ .type __i686.get_pc_thunk.bx,@function
+__i686.get_pc_thunk.bx:
+ movl (%esp), %ebx
ret
- .size __i686.get_pc_thunk.dx, .-__i686.get_pc_thunk.dx
.text
ENTRY(STRCMP)
.type STRCMP, @gnu_indirect_function
- call __i686.get_pc_thunk.dx
- addl $_GLOBAL_OFFSET_TABLE_, %edx
- cmpl $0, KIND_OFFSET+__cpu_features@GOTOFF(%edx)
+ pushl %ebx
+ cfi_adjust_cfa_offset (4)
+ cfi_rel_offset (ebx, 0)
+ call __i686.get_pc_thunk.bx
+ addl $_GLOBAL_OFFSET_TABLE_, %ebx
+ cmpl $0, KIND_OFFSET+__cpu_features@GOTOFF(%ebx)
jne 1f
call __init_cpu_features
-1: leal __STRCMP_SSE4_2@GOTOFF(%edx), %eax
- testl $bit_SSE4_2, CPUID_OFFSET+index_SSE4_2+__cpu_features@GOTOFF(%edx)
- jnz 2f
- leal __STRCMP_SSSE3@GOTOFF(%edx), %eax
- testl $bit_SSSE3, CPUID_OFFSET+index_SSSE3+__cpu_features@GOTOFF(%edx)
- jnz 2f
- leal __STRCMP_IA32@GOTOFF(%edx), %ecx
-2: ret
+1: leal __STRCMP_IA32@GOTOFF(%ebx), %eax
+ testl $bit_SSSE3, CPUID_OFFSET+index_SSSE3+__cpu_features@GOTOFF(%ebx)
+ jz 2f
+ leal __STRCMP_SSSE3@GOTOFF(%ebx), %eax
+ testl $bit_SSE4_2, CPUID_OFFSET+index_SSE4_2+__cpu_features@GOTOFF(%ebx)
+ jz 2f
+ leal __STRCMP_SSE4_2@GOTOFF(%ebx), %eax
+2: popl %ebx
+ cfi_adjust_cfa_offset (-4)
+ cfi_restore (ebx)
+ ret
END(STRCMP)
# else
.text
@@ -74,13 +79,13 @@ ENTRY(STRCMP)
cmpl $0, KIND_OFFSET+__cpu_features
jne 1f
call __init_cpu_features
-1: leal __STRCMP_SSE4_2, %eax
- testl $bit_SSE4_2, CPUID_OFFSET+index_SSE4_2+__cpu_features
- jnz 2f
- leal __STRCMP_SSSE3, %eax
+1: leal __STRCMP_IA32, %eax
testl $bit_SSSE3, CPUID_OFFSET+index_SSSE3+__cpu_features
- jnz 2f
- leal __STRCMP_IA32, %eax
+ jz 2f
+ leal __STRCMP_SSSE3, %eax
+ testl $bit_SSE4_2, CPUID_OFFSET+index_SSE4_2+__cpu_features
+ jz 2f
+ leal __STRCMP_SSE4_2, %eax
2: ret
END(STRCMP)
# endif
--- glibc-2.12-232-gdbb0472/sysdeps/i386/i686/multiarch/strspn.S --- glibc-2.12-232-gdbb0472/sysdeps/i386/i686/multiarch/strspn.S
+++ /sysdeps/i386/i686/multiarch/strspn.S +++ glibc-2.12.90-21/sysdeps/i386/i686/multiarch/strspn.S
@@ -76,8 +76,8 @@ END(strspn) @@ -76,8 +76,8 @@ END(strspn)
# define ENTRY(name) \ # define ENTRY(name) \
.type __strspn_ia32, @function; \ .type __strspn_ia32, @function; \
@ -2141,7 +2220,7 @@
# undef END # undef END
# define END(name) \ # define END(name) \
--- glibc-2.12-232-gdbb0472/sysdeps/ia64/Makefile --- glibc-2.12-232-gdbb0472/sysdeps/ia64/Makefile
+++ /sysdeps/ia64/Makefile +++ glibc-2.12.90-21/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))
@ -2154,7 +2233,7 @@
endif endif
--- glibc-2.12-232-gdbb0472/sysdeps/ia64/ia64libgcc.S --- glibc-2.12-232-gdbb0472/sysdeps/ia64/ia64libgcc.S
+++ /sysdeps/ia64/ia64libgcc.S +++ glibc-2.12.90-21/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. */
@ -2507,7 +2586,7 @@
- -
-#endif -#endif
--- glibc-2.12-232-gdbb0472/sysdeps/ia64/libgcc-compat.c --- glibc-2.12-232-gdbb0472/sysdeps/ia64/libgcc-compat.c
+++ /sysdeps/ia64/libgcc-compat.c +++ glibc-2.12.90-21/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.
@ -2594,7 +2673,7 @@
+ +
+#endif +#endif
--- glibc-2.12-232-gdbb0472/sysdeps/mach/hurd/getrlimit.c --- glibc-2.12-232-gdbb0472/sysdeps/mach/hurd/getrlimit.c
+++ /sysdeps/mach/hurd/getrlimit.c +++ glibc-2.12.90-21/sysdeps/mach/hurd/getrlimit.c
@@ -44,4 +44,5 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) @@ -44,4 +44,5 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
return 0; return 0;
@ -2602,7 +2681,7 @@
+libc_hidden_def (__getrlimit) +libc_hidden_def (__getrlimit)
weak_alias (__getrlimit, getrlimit) weak_alias (__getrlimit, getrlimit)
--- glibc-2.12-232-gdbb0472/sysdeps/posix/getaddrinfo.c --- glibc-2.12-232-gdbb0472/sysdeps/posix/getaddrinfo.c
+++ /sysdeps/posix/getaddrinfo.c +++ glibc-2.12.90-21/sysdeps/posix/getaddrinfo.c
@@ -965,6 +965,7 @@ gaih_inet (const char *name, const struct gaih_service *service, @@ -965,6 +965,7 @@ gaih_inet (const char *name, const struct gaih_service *service,
make a copy. */ make a copy. */
if (out == canon) if (out == canon)
@ -2625,7 +2704,7 @@
{ { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 } { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 }
}; };
--- glibc-2.12-232-gdbb0472/sysdeps/powerpc/powerpc64/Makefile --- glibc-2.12-232-gdbb0472/sysdeps/powerpc/powerpc64/Makefile
+++ /sysdeps/powerpc/powerpc64/Makefile +++ glibc-2.12.90-21/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
@ -2635,7 +2714,7 @@
ifeq ($(subdir),elf) ifeq ($(subdir),elf)
--- glibc-2.12-232-gdbb0472/sysdeps/powerpc/powerpc64/elf/Makefile --- glibc-2.12-232-gdbb0472/sysdeps/powerpc/powerpc64/elf/Makefile
+++ /sysdeps/powerpc/powerpc64/elf/Makefile +++ glibc-2.12.90-21/sysdeps/powerpc/powerpc64/elf/Makefile
@@ -9,3 +9,5 @@ CFLAGS-rtld-mempcpy.os = $(no-special-regs) @@ -9,3 +9,5 @@ CFLAGS-rtld-mempcpy.os = $(no-special-regs)
CFLAGS-rtld-memmove.os = $(no-special-regs) CFLAGS-rtld-memmove.os = $(no-special-regs)
CFLAGS-rtld-memchr.os = $(no-special-regs) CFLAGS-rtld-memchr.os = $(no-special-regs)
@ -2643,7 +2722,7 @@
+ +
+CFLAGS-gmon-start.c = -fno-strict-aliasing +CFLAGS-gmon-start.c = -fno-strict-aliasing
--- glibc-2.12-232-gdbb0472/sysdeps/unix/nice.c --- glibc-2.12-232-gdbb0472/sysdeps/unix/nice.c
+++ /sysdeps/unix/nice.c +++ glibc-2.12.90-21/sysdeps/unix/nice.c
@@ -42,7 +42,12 @@ nice (int incr) @@ -42,7 +42,12 @@ nice (int incr)
__set_errno (save); __set_errno (save);
} }
@ -2659,7 +2738,7 @@
{ {
if (errno == EACCES) if (errno == EACCES)
--- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/check_pf.c --- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/check_pf.c
+++ /sysdeps/unix/sysv/linux/check_pf.c +++ glibc-2.12.90-21/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>
@ -2676,7 +2755,7 @@
#ifndef IFA_F_HOMEADDRESS #ifndef IFA_F_HOMEADDRESS
# define IFA_F_HOMEADDRESS 0 # define IFA_F_HOMEADDRESS 0
--- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/dl-osinfo.h --- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/dl-osinfo.h
+++ /sysdeps/unix/sysv/linux/dl-osinfo.h +++ glibc-2.12.90-21/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. */
@ -2725,7 +2804,7 @@
else else
#endif #endif
--- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/futimesat.c --- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/futimesat.c
+++ /sysdeps/unix/sysv/linux/futimesat.c +++ glibc-2.12.90-21/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;
@ -2769,7 +2848,7 @@
size_t filelen = strlen (file); size_t filelen = strlen (file);
if (__builtin_expect (filelen == 0, 0)) if (__builtin_expect (filelen == 0, 0))
--- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/getpagesize.c --- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/getpagesize.c
+++ /sysdeps/unix/sysv/linux/getpagesize.c +++ glibc-2.12.90-21/sysdeps/unix/sysv/linux/getpagesize.c
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
int int
__getpagesize () __getpagesize ()
@ -2780,7 +2859,7 @@
return GLRO(dl_pagesize); return GLRO(dl_pagesize);
#else #else
--- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/i386/dl-cache.h --- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/i386/dl-cache.h
+++ /sysdeps/unix/sysv/linux/i386/dl-cache.h +++ glibc-2.12.90-21/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.
@ -2842,7 +2921,7 @@
+ +
+#include_next <dl-cache.h> +#include_next <dl-cache.h>
--- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/i386/getrlimit.c --- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/i386/getrlimit.c
+++ /sysdeps/unix/sysv/linux/i386/getrlimit.c +++ glibc-2.12.90-21/sysdeps/unix/sysv/linux/i386/getrlimit.c
@@ -79,4 +79,5 @@ __new_getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) @@ -79,4 +79,5 @@ __new_getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
} }
@ -2850,7 +2929,7 @@
+libc_hidden_weak (__getrlimit) +libc_hidden_weak (__getrlimit)
versioned_symbol (libc, __new_getrlimit, getrlimit, GLIBC_2_2); versioned_symbol (libc, __new_getrlimit, getrlimit, GLIBC_2_2);
--- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/ia64/dl-cache.h --- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+++ /sysdeps/unix/sysv/linux/ia64/dl-cache.h +++ glibc-2.12.90-21/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)
@ -2884,7 +2963,7 @@
+ +
#include_next <dl-cache.h> #include_next <dl-cache.h>
--- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c --- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+++ /sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +++ glibc-2.12.90-21/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>
@ -2892,7 +2971,7 @@
+#include <sysdeps/generic/dl-procinfo.c> +#include <sysdeps/generic/dl-procinfo.c>
+#endif +#endif
--- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h --- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+++ /sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +++ glibc-2.12.90-21/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>
@ -2900,12 +2979,12 @@
+#include <sysdeps/generic/dl-procinfo.h> +#include <sysdeps/generic/dl-procinfo.h>
+#endif +#endif
--- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed --- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+++ /sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +++ glibc-2.12.90-21/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.12-232-gdbb0472/sysdeps/unix/sysv/linux/netlinkaccess.h --- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/netlinkaccess.h
+++ /sysdeps/unix/sysv/linux/netlinkaccess.h +++ glibc-2.12.90-21/sysdeps/unix/sysv/linux/netlinkaccess.h
@@ -25,6 +25,24 @@ @@ -25,6 +25,24 @@
#include <kernel-features.h> #include <kernel-features.h>
@ -2932,7 +3011,7 @@
struct netlink_res struct netlink_res
{ {
--- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/paths.h --- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/paths.h
+++ /sysdeps/unix/sysv/linux/paths.h +++ glibc-2.12.90-21/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"
@ -2943,12 +3022,12 @@
/* Provide trailing slash, since mostly used for building pathnames. */ /* Provide trailing slash, since mostly used for building pathnames. */
--- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c --- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c
+++ /sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c +++ glibc-2.12.90-21/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c
@@ -1 +1 @@ @@ -1 +1 @@
-#include "../../fxstat.c" -#include "../../fxstat.c"
+#include "../../i386/fxstat.c" +#include "../../i386/fxstat.c"
--- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/tcsetattr.c --- glibc-2.12-232-gdbb0472/sysdeps/unix/sysv/linux/tcsetattr.c
+++ /sysdeps/unix/sysv/linux/tcsetattr.c +++ glibc-2.12.90-21/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;
@ -2995,7 +3074,7 @@
} }
libc_hidden_def (tcsetattr) libc_hidden_def (tcsetattr)
--- glibc-2.12-232-gdbb0472/timezone/zic.c --- glibc-2.12-232-gdbb0472/timezone/zic.c
+++ /timezone/zic.c +++ glibc-2.12.90-21/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;

5
glibc.spec
View File

@ -24,7 +24,7 @@
Summary: The GNU libc libraries Summary: The GNU libc libraries
Name: glibc Name: glibc
Version: %{glibcversion} Version: %{glibcversion}
Release: 20 Release: 21
# 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
@ -1034,6 +1034,9 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Tue Dec 14 2010 Andreas Schwab <schwab@redhat.com> - 2.12.90-21
- Revert bogus change
* Mon Dec 13 2010 Andreas Schwab <schwab@redhat.com> - 2.12.90-20 * Mon Dec 13 2010 Andreas Schwab <schwab@redhat.com> - 2.12.90-20
- Update from master - Update from master
- Declare wcpcpy and wcpncpy only under _GNU_SOURCE - Declare wcpcpy and wcpncpy only under _GNU_SOURCE

2
sources
View File

@ -1,3 +1,3 @@
c571afbb5f53c9d1e9ac3e315a332e09 glibc-2.12-232-gdbb0472-fedora.tar.xz 025f62b12e0dff9b838331075d934923 glibc-2.12-232-gdbb0472-fedora.tar.xz
b7b064c5830c596a3e4127a1fc524127 glibc-2.12-232-gdbb0472.tar.xz b7b064c5830c596a3e4127a1fc524127 glibc-2.12-232-gdbb0472.tar.xz
fc53ab6e6f026d43b1ca297ab2ee1ad8 glibc-ports-2.12-45-g8349564.tar.xz fc53ab6e6f026d43b1ca297ab2ee1ad8 glibc-ports-2.12-45-g8349564.tar.xz