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

- Resync with upstream sources, drop obsolete patches.

Browse Source 
- Drop glibc-ports bits as they're part of the master
    sources now.
This commit is contained in:
Jeff Law 2012-08-13 22:49:13 -06:00
parent e784118c7b
commit 24dc568431
4 changed files with 224 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -34,3 +34,5 @@ glibc-2.14-394-g8f3b1ff
/glibc-2.16-75f0d304-fedora.tar.gz /glibc-2.16-75f0d304-fedora.tar.gz
/glibc-2.16-75f0d304.tar.gz /glibc-2.16-75f0d304.tar.gz
/glibc-ports-2.16-a20c2b3c.tar.gz /glibc-ports-2.16-a20c2b3c.tar.gz
/glibc-2.16.90-42443a47-fedora.tar.gz
/glibc-2.16.90-42443a47.tar.gz

370
glibc-fedora.patch
View File

@ -1,7 +1,7 @@
diff -Nrup a/ChangeLog b/ChangeLog diff -Nrup a/ChangeLog b/ChangeLog
--- a/ChangeLog 2012-06-05 07:42:49.000000000 -0600 --- a/ChangeLog 2012-08-13 13:12:18.000000000 -0600
+++ b/ChangeLog 2012-06-07 12:15:21.516319798 -0600 +++ b/ChangeLog 2012-08-13 13:31:50.488136763 -0600
@@ -12178,6 +12178,11 @@ @@ -14009,6 +14009,11 @@
* sysdeps/mach/hurd/sys/param.h (DEV_BSIZE): New macro. * sysdeps/mach/hurd/sys/param.h (DEV_BSIZE): New macro.
@ -13,7 +13,7 @@ diff -Nrup a/ChangeLog b/ChangeLog
2011-09-08 Andreas Schwab <schwab@redhat.com> 2011-09-08 Andreas Schwab <schwab@redhat.com>
* elf/dl-load.c (lose): Check for non-null L. * elf/dl-load.c (lose): Check for non-null L.
@@ -12440,6 +12445,11 @@ @@ -14271,6 +14276,11 @@
* sysdeps/i386/dl-trampoline.S (_dl_runtime_profile): Fix cfi * sysdeps/i386/dl-trampoline.S (_dl_runtime_profile): Fix cfi
directive. directive.
@ -25,7 +25,7 @@ diff -Nrup a/ChangeLog b/ChangeLog
2011-08-24 David S. Miller <davem@davemloft.net> 2011-08-24 David S. Miller <davem@davemloft.net>
* sysdeps/sparc/sparc64/strcmp.S: Rewrite. * sysdeps/sparc/sparc64/strcmp.S: Rewrite.
@@ -13245,6 +13255,14 @@ @@ -15076,6 +15086,14 @@
* config.make.in: Likewise. * config.make.in: Likewise.
* malloc/Makefile: Likewise. * malloc/Makefile: Likewise.
@ -40,7 +40,7 @@ diff -Nrup a/ChangeLog b/ChangeLog
2011-06-27 Andreas Schwab <schwab@redhat.com> 2011-06-27 Andreas Schwab <schwab@redhat.com>
* iconvdata/gb18030.c (BODY for TO_LOOP): Fix encoding of non-BMP * iconvdata/gb18030.c (BODY for TO_LOOP): Fix encoding of non-BMP
@@ -13376,6 +13394,10 @@ @@ -15207,6 +15225,10 @@
* inet/getnetgrent_r.c: Use DL_CALL_FCT in several places. * inet/getnetgrent_r.c: Use DL_CALL_FCT in several places.
@ -51,7 +51,7 @@ diff -Nrup a/ChangeLog b/ChangeLog
2011-06-20 David S. Miller <davem@davemloft.net> 2011-06-20 David S. Miller <davem@davemloft.net>
* sysdeps/sparc/sparc32/dl-plt.h: Protect against multiple * sysdeps/sparc/sparc32/dl-plt.h: Protect against multiple
@@ -13998,6 +14020,13 @@ @@ -15829,6 +15851,13 @@
* libio/Makefile (tests): Add bug-fclose1. * libio/Makefile (tests): Add bug-fclose1.
* libio/bug-fclose1.c: New file. * libio/bug-fclose1.c: New file.
@ -65,7 +65,7 @@ diff -Nrup a/ChangeLog b/ChangeLog
2011-05-12 Ulrich Drepper <drepper@gmail.com> 2011-05-12 Ulrich Drepper <drepper@gmail.com>
[BZ #12511] [BZ #12511]
@@ -14275,13 +14304,6 @@ @@ -16106,13 +16135,6 @@
* stdlib/bug-getcontext.c: New file. * stdlib/bug-getcontext.c: New file.
* stdlib/Makefile: Add rules to build and run bug-getcontext. * stdlib/Makefile: Add rules to build and run bug-getcontext.
@ -79,7 +79,7 @@ diff -Nrup a/ChangeLog b/ChangeLog
2011-04-11 Andreas Krebbel <Andreas.Krebbel@de.ibm.com> 2011-04-11 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
* sysdeps/s390/s390-32/elf/start.S (_start): Skip extra zeroes * sysdeps/s390/s390-32/elf/start.S (_start): Skip extra zeroes
@@ -14579,6 +14601,10 @@ @@ -16410,6 +16432,10 @@
$LDFLAGS and -nostdlib -nostartfiles to linking step. Change main $LDFLAGS and -nostdlib -nostartfiles to linking step. Change main
to _start. to _start.
@ -90,7 +90,7 @@ diff -Nrup a/ChangeLog b/ChangeLog
2011-03-06 Ulrich Drepper <drepper@gmail.com> 2011-03-06 Ulrich Drepper <drepper@gmail.com>
* elf/dl-load.c (_dl_map_object): If we are looking for the first * elf/dl-load.c (_dl_map_object): If we are looking for the first
@@ -14795,6 +14821,12 @@ @@ -16626,6 +16652,12 @@
* shadow/sgetspent.c: Check return value of __sgetspent_r instead * shadow/sgetspent.c: Check return value of __sgetspent_r instead
of errno. of errno.
@ -103,7 +103,7 @@ diff -Nrup a/ChangeLog b/ChangeLog
2011-01-19 Ulrich Drepper <drepper@gmail.com> 2011-01-19 Ulrich Drepper <drepper@gmail.com>
[BZ #11724] [BZ #11724]
@@ -15482,6 +15514,19 @@ @@ -17313,6 +17345,19 @@
* sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS): * sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS):
Mask out sign-bit copies when constructing f_fsid. Mask out sign-bit copies when constructing f_fsid.
@ -123,14 +123,13 @@ diff -Nrup a/ChangeLog b/ChangeLog
2010-09-24 Petr Baudis <pasky@suse.cz> 2010-09-24 Petr Baudis <pasky@suse.cz>
* debug/stack_chk_fail_local.c: Add missing licence exception. * debug/stack_chk_fail_local.c: Add missing licence exception.
@@ -16274,6 +16319,17 @@ @@ -18105,6 +18150,16 @@
call returning > 0 value. call returning > 0 value.
* sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise. * sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise.
+2010-07-01 Andreas Schwab <schwab@redhat.com> +2010-07-01 Andreas Schwab <schwab@redhat.com>
+ +
+ * include/sys/resource.h (__getrlimit): Add hidden proto. + * include/sys/resource.h (__getrlimit): Add hidden proto.
+ * sysdeps/unix/sysv/linux/i386/getrlimit.c: Add libc_hidden_weak.
+ * sysdeps/mach/hurd/getrlimit.c: Add libc_hidden_def. + * sysdeps/mach/hurd/getrlimit.c: Add libc_hidden_def.
+ * resource/getrlimit.c: Likewise. + * resource/getrlimit.c: Likewise.
+ +
@ -141,7 +140,7 @@ diff -Nrup a/ChangeLog b/ChangeLog
2010-06-07 Andreas Schwab <schwab@redhat.com> 2010-06-07 Andreas Schwab <schwab@redhat.com>
* dlfcn/Makefile: Remove explicit dependencies on libc.so and * dlfcn/Makefile: Remove explicit dependencies on libc.so and
@@ -16326,6 +16382,21 @@ @@ -18157,6 +18212,21 @@
* hurd/hurd/fd.h (__file_name_lookup_at): Update comment. * hurd/hurd/fd.h (__file_name_lookup_at): Update comment.
* sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS. * sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS.
@ -164,8 +163,8 @@ diff -Nrup a/ChangeLog b/ChangeLog
* sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi. * sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi.
diff -Nrup a/ChangeLog.15 b/ChangeLog.15 diff -Nrup a/ChangeLog.15 b/ChangeLog.15
--- a/ChangeLog.15 2012-06-05 07:42:49.000000000 -0600 --- a/ChangeLog.15 2012-08-13 13:12:18.000000000 -0600
+++ b/ChangeLog.15 2012-06-07 12:15:21.518319790 -0600 +++ b/ChangeLog.15 2012-08-13 13:31:50.490136755 -0600
@@ -477,6 +477,14 @@ @@ -477,6 +477,14 @@
2004-11-26 Jakub Jelinek <jakub@redhat.com> 2004-11-26 Jakub Jelinek <jakub@redhat.com>
@ -200,8 +199,8 @@ diff -Nrup a/ChangeLog.15 b/ChangeLog.15
* scripts/extract-abilist.awk: If `lastversion' variable defined, omit * scripts/extract-abilist.awk: If `lastversion' variable defined, omit
diff -Nrup a/ChangeLog.16 b/ChangeLog.16 diff -Nrup a/ChangeLog.16 b/ChangeLog.16
--- a/ChangeLog.16 2012-06-05 07:42:49.000000000 -0600 --- a/ChangeLog.16 2012-08-13 13:12:18.000000000 -0600
+++ b/ChangeLog.16 2012-06-07 12:15:21.523319772 -0600 +++ b/ChangeLog.16 2012-08-13 13:31:50.510136674 -0600
@@ -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.
@ -225,8 +224,8 @@ diff -Nrup a/ChangeLog.16 b/ChangeLog.16
* libio/genops.c: Include <stdbool.h>. * libio/genops.c: Include <stdbool.h>.
diff -Nrup a/ChangeLog.17 b/ChangeLog.17 diff -Nrup a/ChangeLog.17 b/ChangeLog.17
--- a/ChangeLog.17 2012-06-05 07:42:49.000000000 -0600 --- a/ChangeLog.17 2012-08-13 13:12:18.000000000 -0600
+++ b/ChangeLog.17 2012-06-07 12:15:21.564319619 -0600 +++ b/ChangeLog.17 2012-08-13 13:31:50.516136649 -0600
@@ -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.
@ -280,9 +279,9 @@ diff -Nrup a/ChangeLog.17 b/ChangeLog.17
[BZ #3632] [BZ #3632]
diff -Nrup a/Makeconfig b/Makeconfig diff -Nrup a/Makeconfig b/Makeconfig
--- a/Makeconfig 2012-06-05 07:42:49.000000000 -0600 --- a/Makeconfig 2012-08-13 13:12:18.000000000 -0600
+++ b/Makeconfig 2012-06-07 12:15:21.568319604 -0600 +++ b/Makeconfig 2012-08-13 13:31:50.520136634 -0600
@@ -753,12 +753,12 @@ endif @@ -799,12 +799,12 @@ endif
# The assembler can generate debug information too. # The assembler can generate debug information too.
ifndef ASFLAGS ifndef ASFLAGS
ifeq ($(have-cpp-asm-debuginfo),yes) ifeq ($(have-cpp-asm-debuginfo),yes)
@ -299,9 +298,9 @@ diff -Nrup a/Makeconfig b/Makeconfig
ifndef BUILD_CC ifndef BUILD_CC
BUILD_CC = $(CC) BUILD_CC = $(CC)
diff -Nrup a/NEWS b/NEWS diff -Nrup a/NEWS b/NEWS
--- a/NEWS 2012-06-05 07:42:49.000000000 -0600 --- a/NEWS 2012-08-13 13:12:18.000000000 -0600
+++ b/NEWS 2012-06-07 12:15:21.569319601 -0600 +++ b/NEWS 2012-08-13 13:31:50.521136630 -0600
@@ -196,16 +196,6 @@ Version 2.14 @@ -237,16 +237,6 @@ Version 2.14
12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792, 12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792,
12795, 12811, 12813, 12814, 12841 12795, 12811, 12813, 12814, 12841
@ -319,8 +318,8 @@ diff -Nrup a/NEWS b/NEWS
syncfs, setns, sendmmsg syncfs, setns, sendmmsg
diff -Nrup a/csu/elf-init.c b/csu/elf-init.c diff -Nrup a/csu/elf-init.c b/csu/elf-init.c
--- a/csu/elf-init.c 2012-06-05 07:42:49.000000000 -0600 --- a/csu/elf-init.c 2012-08-13 13:12:18.000000000 -0600
+++ b/csu/elf-init.c 2012-06-07 12:15:21.570319597 -0600 +++ b/csu/elf-init.c 2012-08-13 13:31:50.522136626 -0600
@@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, @@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int,
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;
@ -346,8 +345,8 @@ diff -Nrup a/csu/elf-init.c b/csu/elf-init.c
/* 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. */
diff -Nrup a/debug/tst-chk1.c b/debug/tst-chk1.c diff -Nrup a/debug/tst-chk1.c b/debug/tst-chk1.c
--- a/debug/tst-chk1.c 2012-06-05 07:42:49.000000000 -0600 --- a/debug/tst-chk1.c 2012-08-13 13:12:18.000000000 -0600
+++ b/debug/tst-chk1.c 2012-06-07 12:15:21.571319593 -0600 +++ b/debug/tst-chk1.c 2012-08-13 13:31:50.523136621 -0600
@@ -16,6 +16,9 @@ @@ -16,6 +16,9 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
@ -377,8 +376,8 @@ diff -Nrup a/debug/tst-chk1.c b/debug/tst-chk1.c
# else # else
# define O 1 # define O 1
diff -Nrup a/elf/Makefile b/elf/Makefile diff -Nrup a/elf/Makefile b/elf/Makefile
--- a/elf/Makefile 2012-06-05 07:42:49.000000000 -0600 --- a/elf/Makefile 2012-08-13 13:12:18.000000000 -0600
+++ b/elf/Makefile 2012-06-07 12:15:21.572319589 -0600 +++ b/elf/Makefile 2012-08-13 13:31:50.524136617 -0600
@@ -50,6 +50,7 @@ include ../Makeconfig @@ -50,6 +50,7 @@ include ../Makeconfig
ifeq ($(unwind-find-fde),yes) ifeq ($(unwind-find-fde),yes)
routines += unwind-dw2-fde-glibc routines += unwind-dw2-fde-glibc
@ -388,8 +387,8 @@ diff -Nrup a/elf/Makefile b/elf/Makefile
before-compile = $(objpfx)trusted-dirs.h before-compile = $(objpfx)trusted-dirs.h
diff -Nrup a/elf/dl-init.c b/elf/dl-init.c diff -Nrup a/elf/dl-init.c b/elf/dl-init.c
--- a/elf/dl-init.c 2012-06-05 07:42:49.000000000 -0600 --- a/elf/dl-init.c 2012-08-13 13:12:18.000000000 -0600
+++ b/elf/dl-init.c 2012-06-07 12:15:21.573319585 -0600 +++ b/elf/dl-init.c 2012-08-13 13:31:50.525136613 -0600
@@ -23,11 +23,9 @@ @@ -23,11 +23,9 @@
/* Type of the initializer. */ /* Type of the initializer. */
typedef void (*init_t) (int, char **, char **); typedef void (*init_t) (int, char **, char **);
@ -413,9 +412,9 @@ diff -Nrup a/elf/dl-init.c b/elf/dl-init.c
} }
INTDEF (_dl_init) INTDEF (_dl_init)
diff -Nrup a/elf/dl-load.c b/elf/dl-load.c diff -Nrup a/elf/dl-load.c b/elf/dl-load.c
--- a/elf/dl-load.c 2012-06-05 07:42:49.000000000 -0600 --- a/elf/dl-load.c 2012-08-13 13:12:18.000000000 -0600
+++ b/elf/dl-load.c 2012-06-07 12:15:21.575319577 -0600 +++ b/elf/dl-load.c 2012-08-13 13:31:50.526136609 -0600
@@ -249,8 +249,7 @@ is_trusted_path_normalize (const char *p @@ -250,8 +250,7 @@ is_trusted_path_normalize (const char *p
static size_t static size_t
@ -425,7 +424,7 @@ diff -Nrup a/elf/dl-load.c b/elf/dl-load.c
{ {
size_t len; size_t len;
bool is_curly = false; bool is_curly = false;
@@ -279,12 +278,6 @@ is_dst (const char *start, const char *n @@ -280,12 +279,6 @@ is_dst (const char *start, const char *n
&& (!is_path || name[len] != ':')) && (!is_path || name[len] != ':'))
return 0; return 0;
@ -438,7 +437,7 @@ diff -Nrup a/elf/dl-load.c b/elf/dl-load.c
return len; return len;
} }
@@ -299,13 +292,10 @@ _dl_dst_count (const char *name, int is_ @@ -300,13 +293,10 @@ _dl_dst_count (const char *name, int is_
{ {
size_t len; size_t len;
@ -455,7 +454,7 @@ diff -Nrup a/elf/dl-load.c b/elf/dl-load.c
++cnt; ++cnt;
name = strchr (name + len, '$'); name = strchr (name + len, '$');
@@ -338,9 +328,16 @@ _dl_dst_substitute (struct link_map *l, @@ -339,9 +329,16 @@ _dl_dst_substitute (struct link_map *l,
size_t len; size_t len;
++name; ++name;
@ -474,7 +473,7 @@ diff -Nrup a/elf/dl-load.c b/elf/dl-load.c
#ifndef SHARED #ifndef SHARED
if (l == NULL) if (l == NULL)
repl = _dl_get_origin (); repl = _dl_get_origin ();
@@ -351,9 +348,9 @@ _dl_dst_substitute (struct link_map *l, @@ -352,9 +349,9 @@ _dl_dst_substitute (struct link_map *l,
check_for_trusted = (INTUSE(__libc_enable_secure) check_for_trusted = (INTUSE(__libc_enable_secure)
&& l->l_type == lt_executable); && l->l_type == lt_executable);
} }
@ -486,7 +485,7 @@ diff -Nrup a/elf/dl-load.c b/elf/dl-load.c
repl = DL_DST_LIB; repl = DL_DST_LIB;
if (repl != NULL && repl != (const char *) -1) if (repl != NULL && repl != (const char *) -1)
@@ -373,6 +370,7 @@ _dl_dst_substitute (struct link_map *l, @@ -374,6 +371,7 @@ _dl_dst_substitute (struct link_map *l,
element, but keep an empty element at the end. */ element, but keep an empty element at the end. */
if (wp == result && is_path && *name == ':' && name[1] != '\0') if (wp == result && is_path && *name == ':' && name[1] != '\0')
++name; ++name;
@ -495,8 +494,8 @@ diff -Nrup a/elf/dl-load.c b/elf/dl-load.c
else else
/* No DST we recognize. */ /* No DST we recognize. */
diff -Nrup a/elf/dl-support.c b/elf/dl-support.c diff -Nrup a/elf/dl-support.c b/elf/dl-support.c
--- a/elf/dl-support.c 2012-06-05 07:42:49.000000000 -0600 --- a/elf/dl-support.c 2012-08-13 13:12:18.000000000 -0600
+++ b/elf/dl-support.c 2012-06-07 12:15:21.576319573 -0600 +++ b/elf/dl-support.c 2012-08-13 13:31:50.527136604 -0600
@@ -81,10 +81,8 @@ unsigned long long _dl_load_adds; @@ -81,10 +81,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;
@ -509,8 +508,8 @@ diff -Nrup a/elf/dl-support.c b/elf/dl-support.c
/* Random data provided by the kernel. */ /* Random data provided by the kernel. */
void *_dl_random; void *_dl_random;
diff -Nrup a/elf/ldconfig.c b/elf/ldconfig.c diff -Nrup a/elf/ldconfig.c b/elf/ldconfig.c
--- a/elf/ldconfig.c 2012-06-05 07:42:49.000000000 -0600 --- a/elf/ldconfig.c 2012-08-13 13:12:18.000000000 -0600
+++ b/elf/ldconfig.c 2012-06-07 12:15:21.577319570 -0600 +++ b/elf/ldconfig.c 2012-08-13 13:31:50.528136599 -0600
@@ -1033,17 +1033,19 @@ search_dirs (void) @@ -1033,17 +1033,19 @@ search_dirs (void)
@ -593,8 +592,8 @@ diff -Nrup a/elf/ldconfig.c b/elf/ldconfig.c
const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;
diff -Nrup a/elf/ldd.bash.in b/elf/ldd.bash.in diff -Nrup a/elf/ldd.bash.in b/elf/ldd.bash.in
--- a/elf/ldd.bash.in 2012-06-05 07:42:49.000000000 -0600 --- a/elf/ldd.bash.in 2012-08-13 13:12:18.000000000 -0600
+++ b/elf/ldd.bash.in 2012-06-07 12:15:21.577319570 -0600 +++ b/elf/ldd.bash.in 2012-08-13 13:31:50.529136595 -0600
@@ -166,18 +166,6 @@ warning: you do not have execution permi @@ -166,18 +166,6 @@ warning: you do not have execution permi
fi fi
done done
@ -624,9 +623,9 @@ diff -Nrup a/elf/ldd.bash.in b/elf/ldd.bash.in
;; ;;
*) *)
diff -Nrup a/elf/rtld.c b/elf/rtld.c diff -Nrup a/elf/rtld.c b/elf/rtld.c
--- a/elf/rtld.c 2012-06-05 07:42:49.000000000 -0600 --- a/elf/rtld.c 2012-08-13 13:12:18.000000000 -0600
+++ b/elf/rtld.c 2012-06-07 12:15:21.579319564 -0600 +++ b/elf/rtld.c 2012-08-13 13:31:50.530136592 -0600
@@ -106,7 +106,6 @@ static struct audit_list @@ -107,7 +107,6 @@ static struct audit_list
struct audit_list *next; struct audit_list *next;
} *audit_list; } *audit_list;
@ -634,7 +633,7 @@ diff -Nrup a/elf/rtld.c b/elf/rtld.c
/* Set nonzero during loading and initialization of executable and /* Set nonzero during loading and initialization of executable and
libraries, cleared before the executable's entry point runs. This libraries, cleared before the executable's entry point runs. This
must not be initialized to nonzero, because the unused dynamic must not be initialized to nonzero, because the unused dynamic
@@ -116,7 +115,6 @@ static struct audit_list @@ -117,7 +116,6 @@ static struct audit_list
never be called. */ never be called. */
int _dl_starting_up = 0; int _dl_starting_up = 0;
INTVARDEF(_dl_starting_up) INTVARDEF(_dl_starting_up)
@ -642,7 +641,7 @@ diff -Nrup a/elf/rtld.c b/elf/rtld.c
/* This is the structure which defines all variables global to ld.so /* This is the structure which defines all variables global to ld.so
(except those which cannot be added for some reason). */ (except those which cannot be added for some reason). */
@@ -929,10 +927,8 @@ dl_main (const ElfW(Phdr) *phdr, @@ -932,10 +930,8 @@ dl_main (const ElfW(Phdr) *phdr,
/* Process the environment variable which control the behaviour. */ /* Process the environment variable which control the behaviour. */
process_envvars (&mode); process_envvars (&mode);
@ -653,7 +652,7 @@ diff -Nrup a/elf/rtld.c b/elf/rtld.c
if (*user_entry == (ElfW(Addr)) ENTRY_POINT) if (*user_entry == (ElfW(Addr)) ENTRY_POINT)
{ {
@@ -1408,7 +1404,9 @@ of this helper program; chances are you @@ -1411,7 +1407,9 @@ of this helper program; chances are you
char *copy = malloc (len); char *copy = malloc (len);
if (copy == NULL) if (copy == NULL)
_dl_fatal_printf ("out of memory\n"); _dl_fatal_printf ("out of memory\n");
@ -664,7 +663,7 @@ diff -Nrup a/elf/rtld.c b/elf/rtld.c
} }
/* Add the vDSO to the object list. */ /* Add the vDSO to the object list. */
@@ -2343,7 +2341,6 @@ ERROR: ld.so: object '%s' cannot be load @@ -2349,7 +2347,6 @@ ERROR: ld.so: object '%s' cannot be load
/* Make sure no new search directories have been added. */ /* Make sure no new search directories have been added. */
assert (GLRO(dl_init_all_dirs) == GL(dl_all_dirs)); assert (GLRO(dl_init_all_dirs) == GL(dl_all_dirs));
@ -674,17 +673,17 @@ diff -Nrup a/elf/rtld.c b/elf/rtld.c
/* 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.
diff -Nrup a/include/bits/stdlib-ldbl.h b/include/bits/stdlib-ldbl.h diff -Nrup a/include/bits/stdlib-ldbl.h b/include/bits/stdlib-ldbl.h
--- a/include/bits/stdlib-ldbl.h 1969-12-31 17:00:00.000000000 -0700 --- a/include/bits/stdlib-ldbl.h 1969-12-31 17:00:00.000000000 -0700
+++ b/include/bits/stdlib-ldbl.h 2012-06-07 12:15:21.580319560 -0600 +++ b/include/bits/stdlib-ldbl.h 2012-08-13 13:31:50.531136589 -0600
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+#include <stdlib/bits/stdlib-ldbl.h> +#include <stdlib/bits/stdlib-ldbl.h>
diff -Nrup a/include/bits/wchar-ldbl.h b/include/bits/wchar-ldbl.h diff -Nrup a/include/bits/wchar-ldbl.h b/include/bits/wchar-ldbl.h
--- a/include/bits/wchar-ldbl.h 1969-12-31 17:00:00.000000000 -0700 --- a/include/bits/wchar-ldbl.h 1969-12-31 17:00:00.000000000 -0700
+++ b/include/bits/wchar-ldbl.h 2012-06-07 12:15:21.580319560 -0600 +++ b/include/bits/wchar-ldbl.h 2012-08-13 13:31:50.532136585 -0600
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+#include <wcsmbs/bits/wchar-ldbl.h> +#include <wcsmbs/bits/wchar-ldbl.h>
diff -Nrup a/include/link.h b/include/link.h diff -Nrup a/include/link.h b/include/link.h
--- a/include/link.h 2012-06-05 07:42:49.000000000 -0600 --- a/include/link.h 2012-08-13 13:12:18.000000000 -0600
+++ b/include/link.h 2012-06-07 12:15:21.581319556 -0600 +++ b/include/link.h 2012-08-13 13:31:50.533136581 -0600
@@ -289,7 +289,7 @@ struct link_map @@ -289,7 +289,7 @@ struct link_map
#endif #endif
#ifndef FORCED_DYNAMIC_TLS_OFFSET #ifndef FORCED_DYNAMIC_TLS_OFFSET
@ -695,8 +694,8 @@ diff -Nrup a/include/link.h b/include/link.h
# define FORCED_DYNAMIC_TLS_OFFSET -2 # define FORCED_DYNAMIC_TLS_OFFSET -2
# else # else
diff -Nrup a/include/sys/resource.h b/include/sys/resource.h diff -Nrup a/include/sys/resource.h b/include/sys/resource.h
--- a/include/sys/resource.h 2012-06-05 07:42:49.000000000 -0600 --- a/include/sys/resource.h 2012-08-13 13:12:18.000000000 -0600
+++ b/include/sys/resource.h 2012-06-07 12:15:21.582319552 -0600 +++ b/include/sys/resource.h 2012-08-13 13:31:50.533136581 -0600
@@ -14,5 +14,6 @@ extern int __getrusage (enum __rusage_wh @@ -14,5 +14,6 @@ extern int __getrusage (enum __rusage_wh
extern int __setrlimit (enum __rlimit_resource __resource, extern int __setrlimit (enum __rlimit_resource __resource,
@ -705,8 +704,8 @@ diff -Nrup a/include/sys/resource.h b/include/sys/resource.h
#endif #endif
#endif #endif
diff -Nrup a/inet/Makefile b/inet/Makefile diff -Nrup a/inet/Makefile b/inet/Makefile
--- a/inet/Makefile 2012-06-05 07:42:49.000000000 -0600 --- a/inet/Makefile 2012-08-13 13:12:18.000000000 -0600
+++ b/inet/Makefile 2012-06-07 12:15:21.582319552 -0600 +++ b/inet/Makefile 2012-08-13 13:31:50.534136577 -0600
@@ -54,6 +54,8 @@ tests := htontest test_ifindex tst-ntoa @@ -54,6 +54,8 @@ tests := htontest test_ifindex tst-ntoa
include ../Rules include ../Rules
@ -717,8 +716,8 @@ diff -Nrup a/inet/Makefile b/inet/Makefile
CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions
diff -Nrup a/intl/locale.alias b/intl/locale.alias diff -Nrup a/intl/locale.alias b/intl/locale.alias
--- a/intl/locale.alias 2012-06-05 07:42:49.000000000 -0600 --- a/intl/locale.alias 2012-08-13 13:12:18.000000000 -0600
+++ b/intl/locale.alias 2012-06-07 12:15:21.583319548 -0600 +++ b/intl/locale.alias 2012-08-13 13:31:50.535136573 -0600
@@ -56,8 +56,6 @@ korean ko_KR.eucKR @@ -56,8 +56,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
@ -729,8 +728,8 @@ diff -Nrup a/intl/locale.alias b/intl/locale.alias
nynorsk nn_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1
polish pl_PL.ISO-8859-2 polish pl_PL.ISO-8859-2
diff -Nrup a/libio/stdio.h b/libio/stdio.h diff -Nrup a/libio/stdio.h b/libio/stdio.h
--- a/libio/stdio.h 2012-06-05 07:42:49.000000000 -0600 --- a/libio/stdio.h 2012-08-13 13:12:18.000000000 -0600
+++ b/libio/stdio.h 2012-06-07 12:15:21.584319544 -0600 +++ b/libio/stdio.h 2012-08-13 13:31:50.536136569 -0600
@@ -168,10 +168,12 @@ typedef _G_fpos64_t fpos64_t; @@ -168,10 +168,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. */
@ -745,8 +744,8 @@ diff -Nrup a/libio/stdio.h b/libio/stdio.h
__BEGIN_NAMESPACE_STD __BEGIN_NAMESPACE_STD
/* Remove file FILENAME. */ /* Remove file FILENAME. */
diff -Nrup a/locale/iso-4217.def b/locale/iso-4217.def diff -Nrup a/locale/iso-4217.def b/locale/iso-4217.def
--- a/locale/iso-4217.def 2012-06-05 07:42:49.000000000 -0600 --- a/locale/iso-4217.def 2012-08-13 13:12:18.000000000 -0600
+++ b/locale/iso-4217.def 2012-06-07 12:15:21.584319544 -0600 +++ b/locale/iso-4217.def 2012-08-13 13:31:50.536136569 -0600
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
* *
* !!! The list has to be sorted !!! * !!! The list has to be sorted !!!
@ -839,8 +838,8 @@ diff -Nrup a/locale/iso-4217.def b/locale/iso-4217.def
DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("QAR") /* Qatar Rial */
DEFINE_INT_CURR("ROL") /* Romanian Leu */ DEFINE_INT_CURR("ROL") /* Romanian Leu */
diff -Nrup a/locale/programs/locarchive.c b/locale/programs/locarchive.c diff -Nrup a/locale/programs/locarchive.c b/locale/programs/locarchive.c
--- a/locale/programs/locarchive.c 2012-06-05 07:42:49.000000000 -0600 --- a/locale/programs/locarchive.c 2012-08-13 13:12:18.000000000 -0600
+++ b/locale/programs/locarchive.c 2012-06-07 12:15:21.585319540 -0600 +++ b/locale/programs/locarchive.c 2012-08-13 13:31:50.537136564 -0600
@@ -252,9 +252,9 @@ oldlocrecentcmp (const void *a, const vo @@ -252,9 +252,9 @@ oldlocrecentcmp (const void *a, const vo
/* 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,
@ -873,9 +872,9 @@ diff -Nrup a/locale/programs/locarchive.c b/locale/programs/locarchive.c
const char *oldname, uint32_t *locrec_offset_p) const char *oldname, uint32_t *locrec_offset_p)
{ {
diff -Nrup a/localedata/ChangeLog b/localedata/ChangeLog diff -Nrup a/localedata/ChangeLog b/localedata/ChangeLog
--- a/localedata/ChangeLog 2012-06-05 07:42:49.000000000 -0600 --- a/localedata/ChangeLog 2012-08-13 13:12:18.000000000 -0600
+++ b/localedata/ChangeLog 2012-06-07 12:15:21.683319174 -0600 +++ b/localedata/ChangeLog 2012-08-13 13:31:50.611136263 -0600
@@ -181,6 +181,14 @@ @@ -187,6 +187,14 @@
* tests-mbwc/tst_funcs.h (TST_DECL_VARS, TST_HEAD_LOCALE): * tests-mbwc/tst_funcs.h (TST_DECL_VARS, TST_HEAD_LOCALE):
Remove unused variable. Remove unused variable.
@ -891,8 +890,8 @@ diff -Nrup a/localedata/ChangeLog b/localedata/ChangeLog
[BZ #12788] [BZ #12788]
diff -Nrup a/localedata/Makefile b/localedata/Makefile diff -Nrup a/localedata/Makefile b/localedata/Makefile
--- a/localedata/Makefile 2012-06-05 07:42:49.000000000 -0600 --- a/localedata/Makefile 2012-08-13 13:12:18.000000000 -0600
+++ b/localedata/Makefile 2012-06-07 12:15:21.776318827 -0600 +++ b/localedata/Makefile 2012-08-13 13:31:50.612136258 -0600
@@ -211,6 +211,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo @@ -211,6 +211,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
echo -n '...'; \ echo -n '...'; \
input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@ -902,8 +901,8 @@ diff -Nrup a/localedata/Makefile b/localedata/Makefile
$(addprefix --prefix=,$(install_root)) $$locale; \ $(addprefix --prefix=,$(install_root)) $$locale; \
echo ' done'; \ echo ' done'; \
diff -Nrup a/localedata/SUPPORTED b/localedata/SUPPORTED diff -Nrup a/localedata/SUPPORTED b/localedata/SUPPORTED
--- a/localedata/SUPPORTED 2012-06-05 07:42:49.000000000 -0600 --- a/localedata/SUPPORTED 2012-08-13 13:12:18.000000000 -0600
+++ b/localedata/SUPPORTED 2012-06-07 12:15:21.805318719 -0600 +++ b/localedata/SUPPORTED 2012-08-13 13:31:50.613136253 -0600
@@ -88,6 +88,7 @@ cy_GB.UTF-8/UTF-8 \ @@ -88,6 +88,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 \
@ -946,8 +945,8 @@ diff -Nrup a/localedata/SUPPORTED b/localedata/SUPPORTED
sw_TZ/UTF-8 \ sw_TZ/UTF-8 \
ta_IN/UTF-8 \ ta_IN/UTF-8 \
diff -Nrup a/localedata/locales/cy_GB b/localedata/locales/cy_GB diff -Nrup a/localedata/locales/cy_GB b/localedata/locales/cy_GB
--- a/localedata/locales/cy_GB 2012-06-05 07:42:49.000000000 -0600 --- a/localedata/locales/cy_GB 2012-08-13 13:12:18.000000000 -0600
+++ b/localedata/locales/cy_GB 2012-06-07 12:15:21.805318719 -0600 +++ b/localedata/locales/cy_GB 2012-08-13 13:31:50.614136249 -0600
@@ -248,9 +248,9 @@ mon "<U0049><U006F><U006E><U0061 @@ -248,9 +248,9 @@ mon "<U0049><U006F><U006E><U0061
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>"
@ -961,8 +960,8 @@ diff -Nrup a/localedata/locales/cy_GB b/localedata/locales/cy_GB
<U0025><U005A><U0020><U0025><U0059>" <U0025><U005A><U0020><U0025><U0059>"
first_workday 2 first_workday 2
diff -Nrup a/localedata/locales/en_GB b/localedata/locales/en_GB diff -Nrup a/localedata/locales/en_GB b/localedata/locales/en_GB
--- a/localedata/locales/en_GB 2012-06-05 07:42:49.000000000 -0600 --- a/localedata/locales/en_GB 2012-08-13 13:12:18.000000000 -0600
+++ b/localedata/locales/en_GB 2012-06-07 12:15:21.806318715 -0600 +++ b/localedata/locales/en_GB 2012-08-13 13:31:50.614136249 -0600
@@ -116,7 +116,7 @@ mon "<U004A><U0061><U006E><U0075 @@ -116,7 +116,7 @@ mon "<U004A><U0061><U006E><U0075
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>"
@ -974,7 +973,7 @@ diff -Nrup a/localedata/locales/en_GB b/localedata/locales/en_GB
<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/ <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
diff -Nrup a/localedata/locales/no_NO b/localedata/locales/no_NO diff -Nrup a/localedata/locales/no_NO b/localedata/locales/no_NO
--- a/localedata/locales/no_NO 1969-12-31 17:00:00.000000000 -0700 --- a/localedata/locales/no_NO 1969-12-31 17:00:00.000000000 -0700
+++ b/localedata/locales/no_NO 2012-06-07 12:15:21.806318715 -0600 +++ b/localedata/locales/no_NO 2012-08-13 13:31:50.614136249 -0600
@@ -0,0 +1,69 @@ @@ -0,0 +1,69 @@
+escape_char / +escape_char /
+comment_char % +comment_char %
@ -1046,8 +1045,8 @@ diff -Nrup a/localedata/locales/no_NO b/localedata/locales/no_NO
+copy "nb_NO" +copy "nb_NO"
+END LC_ADDRESS +END LC_ADDRESS
diff -Nrup a/localedata/locales/zh_TW b/localedata/locales/zh_TW diff -Nrup a/localedata/locales/zh_TW b/localedata/locales/zh_TW
--- a/localedata/locales/zh_TW 2012-06-05 07:42:49.000000000 -0600 --- a/localedata/locales/zh_TW 2012-08-13 13:12:18.000000000 -0600
+++ b/localedata/locales/zh_TW 2012-06-07 12:15:21.807318711 -0600 +++ b/localedata/locales/zh_TW 2012-08-13 13:31:50.614136249 -0600
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
comment_char % comment_char %
escape_char / escape_char /
@ -1076,8 +1075,8 @@ diff -Nrup a/localedata/locales/zh_TW b/localedata/locales/zh_TW
date "2000-08-02" date "2000-08-02"
% %
diff -Nrup a/login/programs/pt_chown.c b/login/programs/pt_chown.c diff -Nrup a/login/programs/pt_chown.c b/login/programs/pt_chown.c
--- a/login/programs/pt_chown.c 2012-06-05 07:42:49.000000000 -0600 --- a/login/programs/pt_chown.c 2012-08-13 13:12:18.000000000 -0600
+++ b/login/programs/pt_chown.c 2012-06-07 12:15:21.807318711 -0600 +++ b/login/programs/pt_chown.c 2012-08-13 13:31:50.615136246 -0600
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
#include <string.h> #include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -1120,8 +1119,8 @@ diff -Nrup a/login/programs/pt_chown.c b/login/programs/pt_chown.c
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
diff -Nrup a/manual/libc.texinfo b/manual/libc.texinfo diff -Nrup a/manual/libc.texinfo b/manual/libc.texinfo
--- a/manual/libc.texinfo 2012-06-05 07:42:49.000000000 -0600 --- a/manual/libc.texinfo 2012-08-13 13:12:18.000000000 -0600
+++ b/manual/libc.texinfo 2012-06-07 12:15:21.808318708 -0600 +++ b/manual/libc.texinfo 2012-08-13 13:31:50.615136246 -0600
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
@include macros.texi @include macros.texi
@ -1132,8 +1131,8 @@ diff -Nrup a/manual/libc.texinfo b/manual/libc.texinfo
* Libc: (libc). C library. * Libc: (libc). C library.
@end direntry @end direntry
diff -Nrup a/misc/sys/cdefs.h b/misc/sys/cdefs.h diff -Nrup a/misc/sys/cdefs.h b/misc/sys/cdefs.h
--- a/misc/sys/cdefs.h 2012-06-05 07:42:49.000000000 -0600 --- a/misc/sys/cdefs.h 2012-08-13 13:12:18.000000000 -0600
+++ b/misc/sys/cdefs.h 2012-06-07 12:15:21.808318708 -0600 +++ b/misc/sys/cdefs.h 2012-08-13 13:31:50.615136246 -0600
@@ -142,7 +142,10 @@ @@ -142,7 +142,10 @@
#define __bos0(ptr) __builtin_object_size (ptr, 0) #define __bos0(ptr) __builtin_object_size (ptr, 0)
#define __fortify_function __extern_always_inline __attribute_artificial__ #define __fortify_function __extern_always_inline __attribute_artificial__
@ -1171,8 +1170,8 @@ diff -Nrup a/misc/sys/cdefs.h b/misc/sys/cdefs.h
# define __va_arg_pack_len() __builtin_va_arg_pack_len () # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
#endif #endif
diff -Nrup a/nis/Makefile b/nis/Makefile diff -Nrup a/nis/Makefile b/nis/Makefile
--- a/nis/Makefile 2012-06-05 07:42:49.000000000 -0600 --- a/nis/Makefile 2012-08-13 13:12:18.000000000 -0600
+++ b/nis/Makefile 2012-06-07 12:15:21.810318702 -0600 +++ b/nis/Makefile 2012-08-13 13:31:50.615136246 -0600
@@ -71,6 +71,8 @@ libnss_nisplus-inhibit-o = $(filter-out @@ -71,6 +71,8 @@ libnss_nisplus-inhibit-o = $(filter-out
include ../Rules include ../Rules
@ -1183,8 +1182,8 @@ diff -Nrup a/nis/Makefile b/nis/Makefile
$(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) \
diff -Nrup a/nis/nss b/nis/nss diff -Nrup a/nis/nss b/nis/nss
--- a/nis/nss 2012-06-05 07:42:49.000000000 -0600 --- a/nis/nss 2012-08-13 13:12:18.000000000 -0600
+++ b/nis/nss 2012-06-07 12:15:21.811318698 -0600 +++ b/nis/nss 2012-08-13 13:31:50.616136243 -0600
@@ -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
@ -1195,9 +1194,9 @@ diff -Nrup a/nis/nss b/nis/nss
# 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
diff -Nrup a/nptl/ChangeLog b/nptl/ChangeLog diff -Nrup a/nptl/ChangeLog b/nptl/ChangeLog
--- a/nptl/ChangeLog 2012-06-05 07:42:49.000000000 -0600 --- a/nptl/ChangeLog 2012-08-13 13:12:18.000000000 -0600
+++ b/nptl/ChangeLog 2012-06-07 12:15:21.813318690 -0600 +++ b/nptl/ChangeLog 2012-08-13 13:31:50.619136231 -0600
@@ -5562,6 +5562,11 @@ @@ -5655,6 +5655,11 @@
Move definition inside libpthread, libc, librt check. Provide Move definition inside libpthread, libc, librt check. Provide
definition for rtld. definition for rtld.
@ -1209,7 +1208,7 @@ diff -Nrup a/nptl/ChangeLog b/nptl/ChangeLog
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.
@@ -7636,6 +7641,11 @@ @@ -7729,6 +7734,11 @@
* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
@ -1222,8 +1221,8 @@ diff -Nrup a/nptl/ChangeLog b/nptl/ChangeLog
* tst-cancel17.c (do_test): Check if aio_cancel failed. * tst-cancel17.c (do_test): Check if aio_cancel failed.
diff -Nrup a/nptl/Makefile b/nptl/Makefile diff -Nrup a/nptl/Makefile b/nptl/Makefile
--- a/nptl/Makefile 2012-06-05 07:42:49.000000000 -0600 --- a/nptl/Makefile 2012-08-13 13:12:18.000000000 -0600
+++ b/nptl/Makefile 2012-06-07 12:15:21.816318678 -0600 +++ b/nptl/Makefile 2012-08-13 13:31:50.621136223 -0600
@@ -529,15 +529,19 @@ $(addprefix $(objpfx), \ @@ -529,15 +529,19 @@ $(addprefix $(objpfx), \
$(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
$(objpfx)libpthread_nonshared.a $(objpfx)libpthread_nonshared.a
@ -1247,8 +1246,8 @@ diff -Nrup a/nptl/Makefile b/nptl/Makefile
$(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
endif endif
diff -Nrup a/nptl/Versions b/nptl/Versions diff -Nrup a/nptl/Versions b/nptl/Versions
--- a/nptl/Versions 2012-06-05 07:42:49.000000000 -0600 --- a/nptl/Versions 2012-08-13 13:12:18.000000000 -0600
+++ b/nptl/Versions 2012-06-07 12:15:21.817318674 -0600 +++ b/nptl/Versions 2012-08-13 13:31:50.622136218 -0600
@@ -30,6 +30,7 @@ libc { @@ -30,6 +30,7 @@ libc {
__libc_alloca_cutoff; __libc_alloca_cutoff;
# Internal libc interface to libpthread # Internal libc interface to libpthread
@ -1258,9 +1257,9 @@ diff -Nrup a/nptl/Versions b/nptl/Versions
} }
diff -Nrup a/nptl/nptl-init.c b/nptl/nptl-init.c diff -Nrup a/nptl/nptl-init.c b/nptl/nptl-init.c
--- a/nptl/nptl-init.c 2012-06-05 07:42:49.000000000 -0600 --- a/nptl/nptl-init.c 2012-08-13 13:12:18.000000000 -0600
+++ b/nptl/nptl-init.c 2012-06-07 12:15:21.817318674 -0600 +++ b/nptl/nptl-init.c 2012-08-13 13:31:50.622136218 -0600
@@ -414,7 +414,7 @@ __pthread_initialize_minimal_internal (v @@ -404,7 +404,7 @@ __pthread_initialize_minimal_internal (v
/* 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. */
struct rlimit limit; struct rlimit limit;
@ -1270,8 +1269,8 @@ diff -Nrup a/nptl/nptl-init.c b/nptl/nptl-init.c
/* The system limit is not usable. Use an architecture-specific /* The system limit is not usable. Use an architecture-specific
default. */ default. */
diff -Nrup a/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h b/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h diff -Nrup a/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h b/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
--- a/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 2012-06-05 07:42:49.000000000 -0600 --- a/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 2012-08-13 13:12:18.000000000 -0600
+++ b/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 2012-06-07 12:15:21.817318674 -0600 +++ b/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 2012-08-13 13:31:50.623136214 -0600
@@ -188,4 +188,7 @@ @@ -188,4 +188,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
@ -1282,7 +1281,7 @@ diff -Nrup a/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h b/nptl/sysdeps/unix/s
#endif /* bits/posix_opt.h */ #endif /* bits/posix_opt.h */
diff -Nrup a/nptl/sysdeps/unix/sysv/linux/i386/Versions b/nptl/sysdeps/unix/sysv/linux/i386/Versions diff -Nrup a/nptl/sysdeps/unix/sysv/linux/i386/Versions b/nptl/sysdeps/unix/sysv/linux/i386/Versions
--- a/nptl/sysdeps/unix/sysv/linux/i386/Versions 1969-12-31 17:00:00.000000000 -0700 --- a/nptl/sysdeps/unix/sysv/linux/i386/Versions 1969-12-31 17:00:00.000000000 -0700
+++ b/nptl/sysdeps/unix/sysv/linux/i386/Versions 2012-06-07 12:15:21.818318670 -0600 +++ b/nptl/sysdeps/unix/sysv/linux/i386/Versions 2012-08-13 13:31:50.623136214 -0600
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
+libc { +libc {
+ GLIBC_PRIVATE { + GLIBC_PRIVATE {
@ -1291,8 +1290,8 @@ diff -Nrup a/nptl/sysdeps/unix/sysv/linux/i386/Versions b/nptl/sysdeps/unix/sysv
+ } + }
+} +}
diff -Nrup a/nptl/sysdeps/unix/sysv/linux/i386/smp.h b/nptl/sysdeps/unix/sysv/linux/i386/smp.h diff -Nrup a/nptl/sysdeps/unix/sysv/linux/i386/smp.h b/nptl/sysdeps/unix/sysv/linux/i386/smp.h
--- a/nptl/sysdeps/unix/sysv/linux/i386/smp.h 2012-06-05 07:42:49.000000000 -0600 --- a/nptl/sysdeps/unix/sysv/linux/i386/smp.h 2012-08-13 13:12:18.000000000 -0600
+++ b/nptl/sysdeps/unix/sysv/linux/i386/smp.h 2012-06-07 12:15:21.818318670 -0600 +++ b/nptl/sysdeps/unix/sysv/linux/i386/smp.h 2012-08-13 13:31:50.623136214 -0600
@@ -36,7 +36,7 @@ is_smp_system (void) @@ -36,7 +36,7 @@ is_smp_system (void)
char *cp; char *cp;
@ -1304,7 +1303,7 @@ diff -Nrup a/nptl/sysdeps/unix/sysv/linux/i386/smp.h b/nptl/sysdeps/unix/sysv/li
{ {
diff -Nrup a/nptl/sysdeps/unix/sysv/linux/kernel-features.h b/nptl/sysdeps/unix/sysv/linux/kernel-features.h diff -Nrup a/nptl/sysdeps/unix/sysv/linux/kernel-features.h b/nptl/sysdeps/unix/sysv/linux/kernel-features.h
--- a/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1969-12-31 17:00:00.000000000 -0700 --- a/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1969-12-31 17:00:00.000000000 -0700
+++ b/nptl/sysdeps/unix/sysv/linux/kernel-features.h 2012-06-07 12:15:21.818318670 -0600 +++ b/nptl/sysdeps/unix/sysv/linux/kernel-features.h 2012-08-13 13:31:50.623136214 -0600
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
+#include_next <kernel-features.h> +#include_next <kernel-features.h>
+ +
@ -1313,8 +1312,8 @@ diff -Nrup a/nptl/sysdeps/unix/sysv/linux/kernel-features.h b/nptl/sysdeps/unix/
+# define __ASSUME_CLONE_THREAD_FLAGS 1 +# define __ASSUME_CLONE_THREAD_FLAGS 1
+#endif +#endif
diff -Nrup a/nscd/nscd.conf b/nscd/nscd.conf diff -Nrup a/nscd/nscd.conf b/nscd/nscd.conf
--- a/nscd/nscd.conf 2012-06-05 07:42:49.000000000 -0600 --- a/nscd/nscd.conf 2012-08-13 13:12:18.000000000 -0600
+++ b/nscd/nscd.conf 2012-06-07 12:15:21.818318670 -0600 +++ b/nscd/nscd.conf 2012-08-13 13:31:50.623136214 -0600
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
# logfile /var/log/nscd.log # logfile /var/log/nscd.log
# threads 4 # threads 4
@ -1325,8 +1324,8 @@ diff -Nrup a/nscd/nscd.conf b/nscd/nscd.conf
debug-level 0 debug-level 0
# reload-count 5 # reload-count 5
diff -Nrup a/nscd/nscd.init b/nscd/nscd.init diff -Nrup a/nscd/nscd.init b/nscd/nscd.init
--- a/nscd/nscd.init 2012-06-05 07:42:49.000000000 -0600 --- a/nscd/nscd.init 2012-08-13 13:12:18.000000000 -0600
+++ b/nscd/nscd.init 2012-06-07 12:15:21.818318670 -0600 +++ b/nscd/nscd.init 2012-08-13 13:31:50.624136210 -0600
@@ -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
@ -1404,8 +1403,8 @@ diff -Nrup a/nscd/nscd.init b/nscd/nscd.init
*) *)
echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
diff -Nrup a/nscd/selinux.c b/nscd/selinux.c diff -Nrup a/nscd/selinux.c b/nscd/selinux.c
--- a/nscd/selinux.c 2012-06-05 07:42:49.000000000 -0600 --- a/nscd/selinux.c 2012-08-13 13:12:18.000000000 -0600
+++ b/nscd/selinux.c 2012-06-07 12:15:21.819318667 -0600 +++ b/nscd/selinux.c 2012-08-13 13:31:50.624136210 -0600
@@ -269,6 +269,18 @@ avc_create_thread (void (*run) (void)) @@ -269,6 +269,18 @@ avc_create_thread (void (*run) (void))
{ {
int rc; int rc;
@ -1426,8 +1425,8 @@ diff -Nrup a/nscd/selinux.c b/nscd/selinux.c
pthread_create (&avc_notify_thread, NULL, (void *(*) (void *)) run, NULL); pthread_create (&avc_notify_thread, NULL, (void *(*) (void *)) run, NULL);
if (rc != 0) if (rc != 0)
diff -Nrup a/nss/Makefile b/nss/Makefile diff -Nrup a/nss/Makefile b/nss/Makefile
--- a/nss/Makefile 2012-06-05 07:42:49.000000000 -0600 --- a/nss/Makefile 2012-08-13 13:12:18.000000000 -0600
+++ b/nss/Makefile 2012-06-07 12:15:21.819318667 -0600 +++ b/nss/Makefile 2012-08-13 13:31:50.624136210 -0600
@@ -101,6 +101,7 @@ $(libnss_db-dbs:%=$(objpfx)%.c): $(objpf @@ -101,6 +101,7 @@ $(libnss_db-dbs:%=$(objpfx)%.c): $(objpf
echo '#include "$<"') > $@.new echo '#include "$<"') > $@.new
mv -f $@.new $@ mv -f $@.new $@
@ -1437,8 +1436,8 @@ diff -Nrup a/nss/Makefile b/nss/Makefile
$(objpfx)makedb: $(makedb-modules:%=$(objpfx)%.o) $(objpfx)makedb: $(makedb-modules:%=$(objpfx)%.o)
diff -Nrup a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c diff -Nrup a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c
--- a/nss/nss_files/files-XXX.c 2012-06-05 07:42:49.000000000 -0600 --- a/nss/nss_files/files-XXX.c 2012-08-13 13:12:18.000000000 -0600
+++ b/nss/nss_files/files-XXX.c 2012-06-07 12:15:21.819318667 -0600 +++ b/nss/nss_files/files-XXX.c 2012-08-13 13:31:50.624136210 -0600
@@ -189,7 +189,7 @@ internal_getent (struct STRUCTURE *resul @@ -189,7 +189,7 @@ internal_getent (struct STRUCTURE *resul
{ {
char *p; char *p;
@ -1449,8 +1448,8 @@ diff -Nrup a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c
if (buflen < sizeof *data + 2) if (buflen < sizeof *data + 2)
diff -Nrup a/posix/Makefile b/posix/Makefile diff -Nrup a/posix/Makefile b/posix/Makefile
--- a/posix/Makefile 2012-06-05 07:42:49.000000000 -0600 --- a/posix/Makefile 2012-08-13 13:12:18.000000000 -0600
+++ b/posix/Makefile 2012-06-07 12:15:21.820318664 -0600 +++ b/posix/Makefile 2012-08-13 13:31:50.625136206 -0600
@@ -305,15 +305,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi @@ -305,15 +305,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
mv -f $@/$$spec.new $@/$$spec; \ mv -f $@/$$spec.new $@/$$spec; \
done < $(objpfx)getconf.speclist done < $(objpfx)getconf.speclist
@ -1472,8 +1471,8 @@ diff -Nrup a/posix/Makefile b/posix/Makefile
+ > $@.new + > $@.new
mv -f $@.new $@ mv -f $@.new $@
diff -Nrup a/posix/gai.conf b/posix/gai.conf diff -Nrup a/posix/gai.conf b/posix/gai.conf
--- a/posix/gai.conf 2012-06-05 07:42:49.000000000 -0600 --- a/posix/gai.conf 2012-08-13 13:12:18.000000000 -0600
+++ b/posix/gai.conf 2012-06-07 12:15:21.820318664 -0600 +++ b/posix/gai.conf 2012-08-13 13:31:50.625136206 -0600
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
# #
# precedence <mask> <value> # precedence <mask> <value>
@ -1500,7 +1499,7 @@ diff -Nrup a/posix/gai.conf b/posix/gai.conf
+# This is what the Red Hat setting currently uses. +# This is what the Red Hat setting currently uses.
diff -Nrup a/posix/getconf.speclist.h b/posix/getconf.speclist.h diff -Nrup a/posix/getconf.speclist.h b/posix/getconf.speclist.h
--- a/posix/getconf.speclist.h 1969-12-31 17:00:00.000000000 -0700 --- a/posix/getconf.speclist.h 1969-12-31 17:00:00.000000000 -0700
+++ b/posix/getconf.speclist.h 2012-06-07 12:15:21.820318664 -0600 +++ b/posix/getconf.speclist.h 2012-08-13 13:31:50.625136206 -0600
@@ -0,0 +1,39 @@ @@ -0,0 +1,39 @@
+#include <unistd.h> +#include <unistd.h>
+const char *START_OF_STRINGS = +const char *START_OF_STRINGS =
@ -1542,8 +1541,8 @@ diff -Nrup a/posix/getconf.speclist.h b/posix/getconf.speclist.h
+#endif +#endif
+""; +"";
diff -Nrup a/posix/regcomp.c b/posix/regcomp.c diff -Nrup a/posix/regcomp.c b/posix/regcomp.c
--- a/posix/regcomp.c 2012-06-05 07:42:49.000000000 -0600 --- a/posix/regcomp.c 2012-08-13 13:12:18.000000000 -0600
+++ b/posix/regcomp.c 2012-06-07 12:15:21.821318661 -0600 +++ b/posix/regcomp.c 2012-08-13 13:31:50.626136201 -0600
@@ -2772,40 +2772,29 @@ parse_bracket_exp (re_string_t *regexp, @@ -2772,40 +2772,29 @@ parse_bracket_exp (re_string_t *regexp,
/* Local function for parse_bracket_exp used in _LIBC environement. /* Local function for parse_bracket_exp used in _LIBC environement.
@ -1676,8 +1675,8 @@ diff -Nrup a/posix/regcomp.c b/posix/regcomp.c
/* No valid character, treat it as a normal /* No valid character, treat it as a normal
character. */ character. */
diff -Nrup a/resolv/Makefile b/resolv/Makefile diff -Nrup a/resolv/Makefile b/resolv/Makefile
--- a/resolv/Makefile 2012-06-05 07:42:49.000000000 -0600 --- a/resolv/Makefile 2012-08-13 13:12:18.000000000 -0600
+++ b/resolv/Makefile 2012-06-07 12:15:21.822318657 -0600 +++ b/resolv/Makefile 2012-08-13 13:31:50.628136192 -0600
@@ -80,6 +80,7 @@ ifeq (yes,$(have-ssp)) @@ -80,6 +80,7 @@ ifeq (yes,$(have-ssp))
CFLAGS-libresolv += -fstack-protector CFLAGS-libresolv += -fstack-protector
endif endif
@ -1687,8 +1686,8 @@ diff -Nrup a/resolv/Makefile b/resolv/Makefile
# 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
diff -Nrup a/resource/getrlimit.c b/resource/getrlimit.c diff -Nrup a/resource/getrlimit.c b/resource/getrlimit.c
--- a/resource/getrlimit.c 2012-06-05 07:42:49.000000000 -0600 --- a/resource/getrlimit.c 2012-08-13 13:12:18.000000000 -0600
+++ b/resource/getrlimit.c 2012-06-07 12:15:21.823318653 -0600 +++ b/resource/getrlimit.c 2012-08-13 13:31:50.629136189 -0600
@@ -27,6 +27,7 @@ __getrlimit (enum __rlimit_resource reso @@ -27,6 +27,7 @@ __getrlimit (enum __rlimit_resource reso
__set_errno (ENOSYS); __set_errno (ENOSYS);
return -1; return -1;
@ -1698,8 +1697,8 @@ diff -Nrup a/resource/getrlimit.c b/resource/getrlimit.c
stub_warning (getrlimit) stub_warning (getrlimit)
diff -Nrup a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c diff -Nrup a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
--- a/stdio-common/vfprintf.c 2012-06-05 07:42:49.000000000 -0600 --- a/stdio-common/vfprintf.c 2012-08-13 13:12:18.000000000 -0600
+++ b/stdio-common/vfprintf.c 2012-06-07 12:15:21.823318653 -0600 +++ b/stdio-common/vfprintf.c 2012-08-13 13:31:50.629136189 -0600
@@ -1168,42 +1168,9 @@ vfprintf (FILE *s, const CHAR_T *format, @@ -1168,42 +1168,9 @@ vfprintf (FILE *s, const CHAR_T *format,
else if (!is_long && spec != L_('S')) \ else if (!is_long && spec != L_('S')) \
{ \ { \
@ -1747,8 +1746,8 @@ diff -Nrup a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
len = strlen (string); \ len = strlen (string); \
} \ } \
diff -Nrup a/streams/Makefile b/streams/Makefile diff -Nrup a/streams/Makefile b/streams/Makefile
--- a/streams/Makefile 2012-06-05 07:42:49.000000000 -0600 --- a/streams/Makefile 2012-08-13 13:12:18.000000000 -0600
+++ b/streams/Makefile 2012-06-07 12:15:21.824318649 -0600 +++ b/streams/Makefile 2012-08-13 13:31:50.630136186 -0600
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
# #
subdir := streams subdir := streams
@ -1759,8 +1758,8 @@ diff -Nrup a/streams/Makefile b/streams/Makefile
include ../Rules include ../Rules
diff -Nrup a/sunrpc/Makefile b/sunrpc/Makefile diff -Nrup a/sunrpc/Makefile b/sunrpc/Makefile
--- a/sunrpc/Makefile 2012-06-05 07:42:49.000000000 -0600 --- a/sunrpc/Makefile 2012-08-13 13:12:18.000000000 -0600
+++ b/sunrpc/Makefile 2012-06-07 12:15:21.825318645 -0600 +++ b/sunrpc/Makefile 2012-08-13 13:31:50.631136182 -0600
@@ -52,7 +52,7 @@ headers-in-tirpc = $(addprefix rpc/,auth @@ -52,7 +52,7 @@ headers-in-tirpc = $(addprefix rpc/,auth
des_crypt.h) des_crypt.h)
headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \ headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
@ -1782,8 +1781,8 @@ diff -Nrup a/sunrpc/Makefile b/sunrpc/Makefile
$(objpfx)tst-xdrmem: $(common-objpfx)linkobj/libc.so $(objpfx)tst-xdrmem: $(common-objpfx)linkobj/libc.so
$(objpfx)tst-xdrmem2: $(common-objpfx)linkobj/libc.so $(objpfx)tst-xdrmem2: $(common-objpfx)linkobj/libc.so
diff -Nrup a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h diff -Nrup a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h
--- a/sysdeps/generic/dl-cache.h 2012-06-05 07:42:49.000000000 -0600 --- a/sysdeps/generic/dl-cache.h 2012-08-13 13:12:18.000000000 -0600
+++ b/sysdeps/generic/dl-cache.h 2012-06-07 12:15:21.825318645 -0600 +++ b/sysdeps/generic/dl-cache.h 2012-08-13 13:31:50.631136182 -0600
@@ -35,6 +35,14 @@ @@ -35,6 +35,14 @@
# define add_system_dir(dir) add_dir (dir) # define add_system_dir(dir) add_dir (dir)
#endif #endif
@ -1800,8 +1799,8 @@ diff -Nrup a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h
/* 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
diff -Nrup a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile diff -Nrup a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile
--- a/sysdeps/i386/Makefile 2012-06-05 07:42:49.000000000 -0600 --- a/sysdeps/i386/Makefile 2012-08-13 13:12:18.000000000 -0600
+++ b/sysdeps/i386/Makefile 2012-06-07 12:15:21.826318641 -0600 +++ b/sysdeps/i386/Makefile 2012-08-13 13:31:50.632136178 -0600
@@ -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
@ -1827,8 +1826,8 @@ diff -Nrup a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile
ifeq ($(subdir),elf) ifeq ($(subdir),elf)
diff -Nrup a/sysdeps/i386/i686/Makefile b/sysdeps/i386/i686/Makefile diff -Nrup a/sysdeps/i386/i686/Makefile b/sysdeps/i386/i686/Makefile
--- a/sysdeps/i386/i686/Makefile 2012-06-05 07:42:49.000000000 -0600 --- a/sysdeps/i386/i686/Makefile 2012-08-13 13:12:18.000000000 -0600
+++ b/sysdeps/i386/i686/Makefile 2012-06-07 12:15:21.826318641 -0600 +++ b/sysdeps/i386/i686/Makefile 2012-08-13 13:31:50.632136178 -0600
@@ -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
@ -1851,7 +1850,7 @@ diff -Nrup a/sysdeps/i386/i686/Makefile b/sysdeps/i386/i686/Makefile
-endif -endif
diff -Nrup a/sysdeps/ia64/libgcc-compat.c b/sysdeps/ia64/libgcc-compat.c diff -Nrup a/sysdeps/ia64/libgcc-compat.c b/sysdeps/ia64/libgcc-compat.c
--- a/sysdeps/ia64/libgcc-compat.c 1969-12-31 17:00:00.000000000 -0700 --- a/sysdeps/ia64/libgcc-compat.c 1969-12-31 17:00:00.000000000 -0700
+++ b/sysdeps/ia64/libgcc-compat.c 2012-06-07 12:15:21.826318641 -0600 +++ b/sysdeps/ia64/libgcc-compat.c 2012-08-13 13:31:50.632136178 -0600
@@ -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.
@ -1938,8 +1937,8 @@ diff -Nrup a/sysdeps/ia64/libgcc-compat.c b/sysdeps/ia64/libgcc-compat.c
+ +
+#endif +#endif
diff -Nrup a/sysdeps/mach/hurd/getrlimit.c b/sysdeps/mach/hurd/getrlimit.c diff -Nrup a/sysdeps/mach/hurd/getrlimit.c b/sysdeps/mach/hurd/getrlimit.c
--- a/sysdeps/mach/hurd/getrlimit.c 2012-06-05 07:42:49.000000000 -0600 --- a/sysdeps/mach/hurd/getrlimit.c 2012-08-13 13:12:18.000000000 -0600
+++ b/sysdeps/mach/hurd/getrlimit.c 2012-06-07 12:15:21.826318641 -0600 +++ b/sysdeps/mach/hurd/getrlimit.c 2012-08-13 13:31:50.632136178 -0600
@@ -43,4 +43,5 @@ __getrlimit (enum __rlimit_resource reso @@ -43,4 +43,5 @@ __getrlimit (enum __rlimit_resource reso
return 0; return 0;
@ -1947,8 +1946,8 @@ diff -Nrup a/sysdeps/mach/hurd/getrlimit.c b/sysdeps/mach/hurd/getrlimit.c
+libc_hidden_def (__getrlimit) +libc_hidden_def (__getrlimit)
weak_alias (__getrlimit, getrlimit) weak_alias (__getrlimit, getrlimit)
diff -Nrup a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c diff -Nrup a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
--- a/sysdeps/posix/getaddrinfo.c 2012-06-05 07:42:49.000000000 -0600 --- a/sysdeps/posix/getaddrinfo.c 2012-08-13 13:12:18.000000000 -0600
+++ b/sysdeps/posix/getaddrinfo.c 2012-06-07 12:15:21.827318637 -0600 +++ b/sysdeps/posix/getaddrinfo.c 2012-08-13 13:34:42.817465705 -0600
@@ -565,8 +565,8 @@ gaih_inet (const char *name, const struc @@ -565,8 +565,8 @@ gaih_inet (const char *name, const struc
/* If we do not have to look for IPv6 addresses, use /* If we do not have to look for IPv6 addresses, use
@ -1958,9 +1957,9 @@ diff -Nrup a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
+ IPv6 scope ids, nor retrieving the canonical name. */ + IPv6 scope ids, nor retrieving the canonical name. */
+ if (req->ai_family == AF_INET && (req->ai_flags & AI_CANONNAME) == 0) + if (req->ai_family == AF_INET && (req->ai_flags & AI_CANONNAME) == 0)
{ {
size_t tmpbuflen = 512; /* Allocate additional room for struct host_data. */
assert (tmpbuf == NULL); size_t tmpbuflen = (512 + MAX_NR_ALIASES * sizeof(char*)
@@ -1105,68 +1105,10 @@ gaih_inet (const char *name, const struc @@ -1107,70 +1107,10 @@ gaih_inet (const char *name, const struc
/* Only the first entry gets the canonical name. */ /* Only the first entry gets the canonical name. */
if (at2 == at && (req->ai_flags & AI_CANONNAME) != 0) if (at2 == at && (req->ai_flags & AI_CANONNAME) != 0)
{ {
@ -1972,7 +1971,9 @@ diff -Nrup a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
- struct hostent *h = NULL; - struct hostent *h = NULL;
- int herrno; - int herrno;
- struct hostent th; - struct hostent th;
- size_t tmpbuf2len = 512; - /* Add room for struct host_data. */
- size_t tmpbuf2len = (512 + (MAX_NR_ALIASES+MAX_NR_ADDRS+1)
- * sizeof(char*) + 16 * sizeof(char));
- -
- do - do
- { - {
@ -2032,7 +2033,7 @@ diff -Nrup a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
#ifdef HAVE_LIBIDN #ifdef HAVE_LIBIDN
if (req->ai_flags & AI_CANONIDN) if (req->ai_flags & AI_CANONIDN)
@@ -1181,9 +1123,6 @@ gaih_inet (const char *name, const struc @@ -1185,9 +1125,6 @@ gaih_inet (const char *name, const struc
int rc = __idna_to_unicode_lzlz (canon, &out, idn_flags); int rc = __idna_to_unicode_lzlz (canon, &out, idn_flags);
if (rc != IDNA_SUCCESS) if (rc != IDNA_SUCCESS)
{ {
@ -2042,7 +2043,7 @@ diff -Nrup a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
if (rc == IDNA_MALLOC_ERROR) if (rc == IDNA_MALLOC_ERROR)
result = -EAI_MEMORY; result = -EAI_MEMORY;
else if (rc == IDNA_DLOPEN_ERROR) else if (rc == IDNA_DLOPEN_ERROR)
@@ -1213,17 +1152,11 @@ gaih_inet (const char *name, const struc @@ -1217,17 +1154,11 @@ gaih_inet (const char *name, const struc
canon = strdup (canon); canon = strdup (canon);
if (canon == NULL) if (canon == NULL)
{ {
@ -2060,7 +2061,7 @@ diff -Nrup a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
} }
family = at2->family; family = at2->family;
@@ -1360,10 +1293,12 @@ static const struct scopeentry @@ -1364,10 +1295,12 @@ static const struct scopeentry
/* Link-local addresses: scope 2. */ /* Link-local addresses: scope 2. */
{ { { 169, 254, 0, 0 } }, htonl_c (0xffff0000), 2 }, { { { 169, 254, 0, 0 } }, htonl_c (0xffff0000), 2 },
{ { { 127, 0, 0, 0 } }, htonl_c (0xff000000), 2 }, { { { 127, 0, 0, 0 } }, htonl_c (0xff000000), 2 },
@ -2074,8 +2075,8 @@ diff -Nrup a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
{ { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 } { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 }
}; };
diff -Nrup a/sysdeps/powerpc/powerpc64/Makefile b/sysdeps/powerpc/powerpc64/Makefile diff -Nrup a/sysdeps/powerpc/powerpc64/Makefile b/sysdeps/powerpc/powerpc64/Makefile
--- a/sysdeps/powerpc/powerpc64/Makefile 2012-06-05 07:42:49.000000000 -0600 --- a/sysdeps/powerpc/powerpc64/Makefile 2012-08-13 13:12:18.000000000 -0600
+++ b/sysdeps/powerpc/powerpc64/Makefile 2012-06-07 12:15:21.828318633 -0600 +++ b/sysdeps/powerpc/powerpc64/Makefile 2012-08-13 13:31:50.635136166 -0600
@@ -35,6 +35,9 @@ CFLAGS-rtld-memmove.os = $(no-special-re @@ -35,6 +35,9 @@ CFLAGS-rtld-memmove.os = $(no-special-re
CFLAGS-rtld-memchr.os = $(no-special-regs) CFLAGS-rtld-memchr.os = $(no-special-regs)
CFLAGS-rtld-strnlen.os = $(no-special-regs) CFLAGS-rtld-strnlen.os = $(no-special-regs)
@ -2087,8 +2088,8 @@ diff -Nrup a/sysdeps/powerpc/powerpc64/Makefile b/sysdeps/powerpc/powerpc64/Make
sysdep_routines += hp-timing sysdep_routines += hp-timing
elide-routines.os += hp-timing elide-routines.os += hp-timing
diff -Nrup a/sysdeps/s390/s390-64/utf16-utf32-z9.c b/sysdeps/s390/s390-64/utf16-utf32-z9.c diff -Nrup a/sysdeps/s390/s390-64/utf16-utf32-z9.c b/sysdeps/s390/s390-64/utf16-utf32-z9.c
--- a/sysdeps/s390/s390-64/utf16-utf32-z9.c 2012-06-05 07:42:49.000000000 -0600 --- a/sysdeps/s390/s390-64/utf16-utf32-z9.c 2012-08-13 13:12:18.000000000 -0600
+++ b/sysdeps/s390/s390-64/utf16-utf32-z9.c 2012-06-07 12:15:21.829318630 -0600 +++ b/sysdeps/s390/s390-64/utf16-utf32-z9.c 2012-08-13 13:31:50.635136166 -0600
@@ -168,10 +168,7 @@ gconv_end (struct __gconv_step *data) @@ -168,10 +168,7 @@ gconv_end (struct __gconv_step *data)
register unsigned long long outlen asm("11") = outend - outptr; \ register unsigned long long outlen asm("11") = outend - outptr; \
uint64_t cc = 0; \ uint64_t cc = 0; \
@ -2102,8 +2103,8 @@ diff -Nrup a/sysdeps/s390/s390-64/utf16-utf32-z9.c b/sysdeps/s390/s390-64/utf16-
" ipm %2 \n" \ " ipm %2 \n" \
: "+a" (pOutput), "+a" (pInput), "+d" (cc), \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \
diff -Nrup a/sysdeps/s390/s390-64/utf8-utf16-z9.c b/sysdeps/s390/s390-64/utf8-utf16-z9.c diff -Nrup a/sysdeps/s390/s390-64/utf8-utf16-z9.c b/sysdeps/s390/s390-64/utf8-utf16-z9.c
--- a/sysdeps/s390/s390-64/utf8-utf16-z9.c 2012-06-05 07:42:49.000000000 -0600 --- a/sysdeps/s390/s390-64/utf8-utf16-z9.c 2012-08-13 13:12:18.000000000 -0600
+++ b/sysdeps/s390/s390-64/utf8-utf16-z9.c 2012-06-07 12:15:21.829318630 -0600 +++ b/sysdeps/s390/s390-64/utf8-utf16-z9.c 2012-08-13 13:31:50.635136166 -0600
@@ -150,10 +150,7 @@ gconv_end (struct __gconv_step *data) @@ -150,10 +150,7 @@ gconv_end (struct __gconv_step *data)
register unsigned long long outlen asm("11") = outend - outptr; \ register unsigned long long outlen asm("11") = outend - outptr; \
uint64_t cc = 0; \ uint64_t cc = 0; \
@ -2117,8 +2118,8 @@ diff -Nrup a/sysdeps/s390/s390-64/utf8-utf16-z9.c b/sysdeps/s390/s390-64/utf8-ut
" ipm %2 \n" \ " ipm %2 \n" \
: "+a" (pOutput), "+a" (pInput), "+d" (cc), \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \
diff -Nrup a/sysdeps/s390/s390-64/utf8-utf32-z9.c b/sysdeps/s390/s390-64/utf8-utf32-z9.c diff -Nrup a/sysdeps/s390/s390-64/utf8-utf32-z9.c b/sysdeps/s390/s390-64/utf8-utf32-z9.c
--- a/sysdeps/s390/s390-64/utf8-utf32-z9.c 2012-06-05 07:42:49.000000000 -0600 --- a/sysdeps/s390/s390-64/utf8-utf32-z9.c 2012-08-13 13:12:18.000000000 -0600
+++ b/sysdeps/s390/s390-64/utf8-utf32-z9.c 2012-06-07 12:15:21.829318630 -0600 +++ b/sysdeps/s390/s390-64/utf8-utf32-z9.c 2012-08-13 13:31:50.636136161 -0600
@@ -154,10 +154,7 @@ gconv_end (struct __gconv_step *data) @@ -154,10 +154,7 @@ gconv_end (struct __gconv_step *data)
register unsigned long long outlen asm("11") = outend - outptr; \ register unsigned long long outlen asm("11") = outend - outptr; \
uint64_t cc = 0; \ uint64_t cc = 0; \
@ -2132,8 +2133,8 @@ diff -Nrup a/sysdeps/s390/s390-64/utf8-utf32-z9.c b/sysdeps/s390/s390-64/utf8-ut
" ipm %2 \n" \ " ipm %2 \n" \
: "+a" (pOutput), "+a" (pInput), "+d" (cc), \ : "+a" (pOutput), "+a" (pInput), "+d" (cc), \
diff -Nrup a/sysdeps/unix/nice.c b/sysdeps/unix/nice.c diff -Nrup a/sysdeps/unix/nice.c b/sysdeps/unix/nice.c
--- a/sysdeps/unix/nice.c 2012-06-05 07:42:49.000000000 -0600 --- a/sysdeps/unix/nice.c 2012-08-13 13:12:18.000000000 -0600
+++ b/sysdeps/unix/nice.c 2012-06-07 12:15:21.829318630 -0600 +++ b/sysdeps/unix/nice.c 2012-08-13 13:31:50.636136161 -0600
@@ -41,7 +41,12 @@ nice (int incr) @@ -41,7 +41,12 @@ nice (int incr)
__set_errno (save); __set_errno (save);
} }
@ -2149,8 +2150,8 @@ diff -Nrup a/sysdeps/unix/nice.c b/sysdeps/unix/nice.c
{ {
if (errno == EACCES) if (errno == EACCES)
diff -Nrup a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c diff -Nrup a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c
--- a/sysdeps/unix/sysv/linux/check_pf.c 2012-06-05 07:42:49.000000000 -0600 --- a/sysdeps/unix/sysv/linux/check_pf.c 2012-08-13 13:12:18.000000000 -0600
+++ b/sysdeps/unix/sysv/linux/check_pf.c 2012-06-07 12:15:21.830318627 -0600 +++ b/sysdeps/unix/sysv/linux/check_pf.c 2012-08-13 13:31:50.636136161 -0600
@@ -26,16 +26,14 @@ @@ -26,16 +26,14 @@
#include <unistd.h> #include <unistd.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -2171,8 +2172,8 @@ diff -Nrup a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_
#ifndef IFA_F_HOMEADDRESS #ifndef IFA_F_HOMEADDRESS
# define IFA_F_HOMEADDRESS 0 # define IFA_F_HOMEADDRESS 0
diff -Nrup a/sysdeps/unix/sysv/linux/futimesat.c b/sysdeps/unix/sysv/linux/futimesat.c diff -Nrup a/sysdeps/unix/sysv/linux/futimesat.c b/sysdeps/unix/sysv/linux/futimesat.c
--- a/sysdeps/unix/sysv/linux/futimesat.c 2012-06-05 07:42:49.000000000 -0600 --- a/sysdeps/unix/sysv/linux/futimesat.c 2012-08-13 13:12:18.000000000 -0600
+++ b/sysdeps/unix/sysv/linux/futimesat.c 2012-06-07 12:15:21.830318627 -0600 +++ b/sysdeps/unix/sysv/linux/futimesat.c 2012-08-13 13:31:50.636136161 -0600
@@ -36,14 +36,14 @@ futimesat (fd, file, tvp) @@ -36,14 +36,14 @@ futimesat (fd, file, tvp)
{ {
int result; int result;
@ -2217,7 +2218,7 @@ diff -Nrup a/sysdeps/unix/sysv/linux/futimesat.c b/sysdeps/unix/sysv/linux/futim
if (__builtin_expect (filelen == 0, 0)) if (__builtin_expect (filelen == 0, 0))
diff -Nrup a/sysdeps/unix/sysv/linux/i386/dl-cache.h b/sysdeps/unix/sysv/linux/i386/dl-cache.h diff -Nrup a/sysdeps/unix/sysv/linux/i386/dl-cache.h b/sysdeps/unix/sysv/linux/i386/dl-cache.h
--- a/sysdeps/unix/sysv/linux/i386/dl-cache.h 1969-12-31 17:00:00.000000000 -0700 --- a/sysdeps/unix/sysv/linux/i386/dl-cache.h 1969-12-31 17:00:00.000000000 -0700
+++ b/sysdeps/unix/sysv/linux/i386/dl-cache.h 2012-06-07 12:15:21.830318627 -0600 +++ b/sysdeps/unix/sysv/linux/i386/dl-cache.h 2012-08-13 13:31:50.637136157 -0600
@@ -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.
@ -2278,18 +2279,9 @@ diff -Nrup a/sysdeps/unix/sysv/linux/i386/dl-cache.h b/sysdeps/unix/sysv/linux/i
+ } while (0) + } while (0)
+ +
+#include_next <dl-cache.h> +#include_next <dl-cache.h>
diff -Nrup a/sysdeps/unix/sysv/linux/i386/getrlimit.c b/sysdeps/unix/sysv/linux/i386/getrlimit.c
--- a/sysdeps/unix/sysv/linux/i386/getrlimit.c 2012-06-05 07:42:49.000000000 -0600
+++ b/sysdeps/unix/sysv/linux/i386/getrlimit.c 2012-06-07 12:15:21.830318627 -0600
@@ -35,4 +35,5 @@ __new_getrlimit (enum __rlimit_resource
}
weak_alias (__new_getrlimit, __getrlimit);
+libc_hidden_weak (__getrlimit)
versioned_symbol (libc, __new_getrlimit, getrlimit, GLIBC_2_2);
diff -Nrup a/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c b/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c diff -Nrup a/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c b/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
--- a/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1969-12-31 17:00:00.000000000 -0700 --- a/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1969-12-31 17:00:00.000000000 -0700
+++ b/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 2012-06-07 12:15:21.831318623 -0600 +++ b/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 2012-08-13 13:31:50.637136157 -0600
@@ -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>
@ -2298,7 +2290,7 @@ diff -Nrup a/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c b/sysdeps/unix/sysv/linu
+#endif +#endif
diff -Nrup a/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h b/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h diff -Nrup a/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h b/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
--- a/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1969-12-31 17:00:00.000000000 -0700 --- a/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1969-12-31 17:00:00.000000000 -0700
+++ b/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 2012-06-07 12:15:21.831318623 -0600 +++ b/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 2012-08-13 13:31:50.637136157 -0600
@@ -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>
@ -2306,8 +2298,8 @@ diff -Nrup a/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h b/sysdeps/unix/sysv/linu
+#include <sysdeps/generic/dl-procinfo.h> +#include <sysdeps/generic/dl-procinfo.h>
+#endif +#endif
diff -Nrup a/sysdeps/unix/sysv/linux/netlinkaccess.h b/sysdeps/unix/sysv/linux/netlinkaccess.h diff -Nrup a/sysdeps/unix/sysv/linux/netlinkaccess.h b/sysdeps/unix/sysv/linux/netlinkaccess.h
--- a/sysdeps/unix/sysv/linux/netlinkaccess.h 2012-06-05 07:42:49.000000000 -0600 --- a/sysdeps/unix/sysv/linux/netlinkaccess.h 2012-08-13 13:12:18.000000000 -0600
+++ b/sysdeps/unix/sysv/linux/netlinkaccess.h 2012-06-07 12:15:21.831318623 -0600 +++ b/sysdeps/unix/sysv/linux/netlinkaccess.h 2012-08-13 13:31:50.637136157 -0600
@@ -24,6 +24,24 @@ @@ -24,6 +24,24 @@
#include <kernel-features.h> #include <kernel-features.h>
@ -2334,8 +2326,8 @@ diff -Nrup a/sysdeps/unix/sysv/linux/netlinkaccess.h b/sysdeps/unix/sysv/linux/n
struct netlink_res struct netlink_res
{ {
diff -Nrup a/sysdeps/unix/sysv/linux/paths.h b/sysdeps/unix/sysv/linux/paths.h diff -Nrup a/sysdeps/unix/sysv/linux/paths.h b/sysdeps/unix/sysv/linux/paths.h
--- a/sysdeps/unix/sysv/linux/paths.h 2012-06-05 07:42:49.000000000 -0600 --- a/sysdeps/unix/sysv/linux/paths.h 2012-08-13 13:12:18.000000000 -0600
+++ b/sysdeps/unix/sysv/linux/paths.h 2012-06-07 12:15:21.831318623 -0600 +++ b/sysdeps/unix/sysv/linux/paths.h 2012-08-13 13:31:50.637136157 -0600
@@ -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"
@ -2346,8 +2338,8 @@ diff -Nrup a/sysdeps/unix/sysv/linux/paths.h b/sysdeps/unix/sysv/linux/paths.h
/* Provide trailing slash, since mostly used for building pathnames. */ /* Provide trailing slash, since mostly used for building pathnames. */
diff -Nrup a/sysdeps/unix/sysv/linux/tcsetattr.c b/sysdeps/unix/sysv/linux/tcsetattr.c diff -Nrup a/sysdeps/unix/sysv/linux/tcsetattr.c b/sysdeps/unix/sysv/linux/tcsetattr.c
--- a/sysdeps/unix/sysv/linux/tcsetattr.c 2012-06-05 07:42:49.000000000 -0600 --- a/sysdeps/unix/sysv/linux/tcsetattr.c 2012-08-13 13:12:18.000000000 -0600
+++ b/sysdeps/unix/sysv/linux/tcsetattr.c 2012-06-07 12:15:21.831318623 -0600 +++ b/sysdeps/unix/sysv/linux/tcsetattr.c 2012-08-13 13:31:50.638136153 -0600
@@ -48,6 +48,7 @@ tcsetattr (fd, optional_actions, termios @@ -48,6 +48,7 @@ tcsetattr (fd, optional_actions, termios
{ {
struct __kernel_termios k_termios; struct __kernel_termios k_termios;

87
glibc.spec
View File

@ -1,6 +1,5 @@
%define glibcsrcdir glibc-2.16-75f0d304 %define glibcsrcdir glibc-2.16.90-42443a47
%define glibcversion 2.16 %define glibcversion 2.16.90
%define glibcportsdir glibc-ports-2.16-a20c2b3c
### glibc.spec.in follows: ### glibc.spec.in follows:
%define run_glibc_tests 1 %define run_glibc_tests 1
%define auxarches athlon alphaev6 %define auxarches athlon alphaev6
@ -28,7 +27,7 @@
Summary: The GNU libc libraries Summary: The GNU libc libraries
Name: glibc Name: glibc
Version: %{glibcversion} Version: %{glibcversion}
Release: 9%{?dist} Release: 1%{?dist}
# 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
@ -38,8 +37,7 @@ License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.gnu.org/software/glibc/ URL: http://www.gnu.org/software/glibc/
Source0: %{?glibc_release_url}%{glibcsrcdir}.tar.gz Source0: %{?glibc_release_url}%{glibcsrcdir}.tar.gz
Source1: %{?glibc_release_url}%{glibcportsdir}.tar.gz Source1: %{glibcsrcdir}-fedora.tar.gz
Source2: %{glibcsrcdir}-fedora.tar.gz
# 0000-0999 for patches which are unlikely to ever go upstream or which # 0000-0999 for patches which are unlikely to ever go upstream or which
# have not been analyzed to see if they ought to go upstream yet. # have not been analyzed to see if they ought to go upstream yet.
@ -86,27 +84,23 @@ Patch0006: %{name}-arm-hardfloat-3.patch
# Needs to be sent upstream # Needs to be sent upstream
Patch0008: %{name}-rh697421.patch Patch0007: %{name}-rh697421.patch
# Needs to be sent upstream # Needs to be sent upstream
Patch0009: %{name}-rh740682.patch Patch0008: %{name}-rh740682.patch
# Needs to be sent upstream # Needs to be sent upstream
Patch0010: %{name}-rh657588.patch Patch0009: %{name}-rh657588.patch
# stap, needs to be sent upstream # stap, needs to be sent upstream
Patch0012: %{name}-stap-libm.patch Patch0010: %{name}-stap-libm.patch
# Needs to be sent upstream # Needs to be sent upstream
Patch0034: %{name}-rh841318.patch Patch0029: %{name}-rh841318.patch
# #
# Patches from upstream # Patches from upstream
# #
Patch1007: %{name}-rh179072.patch
Patch1025: %{name}-rh789238.patch
Patch1035: %{name}-rh845960.patch
# #
@ -115,52 +109,49 @@ Patch1035: %{name}-rh845960.patch
# Obviously we're not there right now, but that's the goal # Obviously we're not there right now, but that's the goal
# #
# http://sourceware.org/ml/libc-alpha/2012-08/msg00224.html Patch2011: %{name}-rh757881.patch
Patch2011: %{name}-rh564528.patch
Patch2013: %{name}-rh757881.patch
# Upstream BZ 13013 # Upstream BZ 13013
Patch2014: %{name}-rh730856.patch Patch2012: %{name}-rh730856.patch
Patch2015: %{name}-rh741105.patch Patch2013: %{name}-rh741105.patch
Patch2016: %{name}-rh770869.patch Patch2014: %{name}-rh770869.patch
Patch2017: %{name}-rh770439.patch Patch2015: %{name}-rh770439.patch
Patch2018: %{name}-rh789209.patch Patch2016: %{name}-rh789209.patch
Patch2019: %{name}-rh691912.patch Patch2017: %{name}-rh691912.patch
# Upstream BZ 13604 # Upstream BZ 13604
Patch2020: %{name}-rh790292.patch Patch2018: %{name}-rh790292.patch
# Upstream BZ 13603 # Upstream BZ 13603
Patch2021: %{name}-rh790298.patch Patch2019: %{name}-rh790298.patch
# Upstream BZ 13698 # Upstream BZ 13698
Patch2022: %{name}-rh791161.patch Patch2020: %{name}-rh791161.patch
# Upstream BZ 9954 # Upstream BZ 9954
Patch2024: %{name}-rh739743.patch Patch2021: %{name}-rh739743.patch
#Upstream BZ 13818 #Upstream BZ 13818
Patch2026: %{name}-rh800224.patch Patch2022: %{name}-rh800224.patch
# Upstream BZ 14247 # Upstream BZ 14247
Patch2027: %{name}-rh827510.patch Patch2023: %{name}-rh827510.patch
Patch2028: %{name}-rh803286.patch Patch2024: %{name}-rh803286.patch
# Upstream BZ 13761 # Upstream BZ 13761
Patch2030: %{name}-rh788989-2.patch Patch2025: %{name}-rh788989-2.patch
# Upstream BZ 13028 # Upstream BZ 13028
Patch2031: %{name}-rh841787.patch Patch2026: %{name}-rh841787.patch
# Upstream BZ 14185 # Upstream BZ 14185
Patch2032: %{name}-rh819430.patch Patch2027: %{name}-rh819430.patch
# See http://sourceware.org/ml/libc-alpha/2012-06/msg00074.html # See http://sourceware.org/ml/libc-alpha/2012-06/msg00074.html
Patch2033: %{name}-rh767693-2.patch Patch2028: %{name}-rh767693-2.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Obsoletes: glibc-profile < 2.4 Obsoletes: glibc-profile < 2.4
@ -380,8 +371,7 @@ package or when debugging this package.
%endif %endif
%prep %prep
rm -rf %{glibcportsdir} %setup -q -n %{glibcsrcdir} -b1
%setup -q -n %{glibcsrcdir} -b1 -b2
%patch0000 -E -p1 %patch0000 -E -p1
%patch0001 -E -p1 %patch0001 -E -p1
@ -390,12 +380,12 @@ rm -rf %{glibcportsdir}
%patch0004 -p1 %patch0004 -p1
%patch0005 -p1 %patch0005 -p1
%patch0006 -p1 %patch0006 -p1
%patch1007 -p1 %patch0007 -p1
%patch0008 -p1 %patch0008 -p1
%patch0009 -p1 %patch0009 -p1
%patch0010 -p1 %patch0010 -p1
%patch2011 -p1 %patch2011 -p1
%patch0012 -p1 %patch2012 -p1
%patch2013 -p1 %patch2013 -p1
%patch2014 -p1 %patch2014 -p1
%patch2015 -p1 %patch2015 -p1
@ -406,17 +396,13 @@ rm -rf %{glibcportsdir}
%patch2020 -p1 %patch2020 -p1
%patch2021 -p1 %patch2021 -p1
%patch2022 -p1 %patch2022 -p1
%patch2023 -p1
%patch2024 -p1 %patch2024 -p1
%patch1025 -p1 %patch2025 -p1
%patch2026 -p1 %patch2026 -p1
%patch2027 -p1 %patch2027 -p1
%patch2028 -p1 %patch2028 -p1
%patch2030 -p1 %patch0029 -p1
%patch2031 -p1
%patch2032 -p1
%patch2033 -p1
%patch0034 -p1
%patch1035 -p1
# On powerpc32, hp timing is only available in power4/power6 # On powerpc32, hp timing is only available in power4/power6
# libs, not in base, so pre-power4 dynamic linker is incompatible # libs, not in base, so pre-power4 dynamic linker is incompatible
@ -502,7 +488,7 @@ build_CFLAGS="$BuildFlags -g -O3 $*"
configure_CFLAGS="$build_CFLAGS -fno-asynchronous-unwind-tables" configure_CFLAGS="$build_CFLAGS -fno-asynchronous-unwind-tables"
../configure CC="$GCC" CXX="$GXX" CFLAGS="$configure_CFLAGS" \ ../configure CC="$GCC" CXX="$GXX" CFLAGS="$configure_CFLAGS" \
--prefix=%{_prefix} \ --prefix=%{_prefix} \
--enable-add-ons=../%{glibcportsdir},nptl$AddOns \ --enable-add-ons=nptl$AddOns \
--with-headers=%{_prefix}/include $EnableKernel --enable-bind-now \ --with-headers=%{_prefix}/include $EnableKernel --enable-bind-now \
--build=%{target} \ --build=%{target} \
%ifarch %{multiarcharches} %ifarch %{multiarcharches}
@ -1301,6 +1287,11 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Mon Aug 13 2012 Jeff Law <law@redhat.com> - 2.16.90-1
- Resync with upstream sources, drop obsolete patches.
- Drop glibc-ports bits as they're part of the master
sources now.
* Mon Aug 13 2012 Jeff Law <law@redhat.com> - 2.16-9 * Mon Aug 13 2012 Jeff Law <law@redhat.com> - 2.16-9
- Replace patch for 179072 with official version from upstream. - Replace patch for 179072 with official version from upstream.

5
sources
View File

@ -1,3 +1,2 @@
43ea1885a798f02927bd581d8a5aa65d glibc-2.16-75f0d304-fedora.tar.gz f2b81feae818a1de5a8574ff62c209f4 glibc-2.16.90-42443a47-fedora.tar.gz
96de549f6c78b090e73b5eae6cfc7afb glibc-2.16-75f0d304.tar.gz e11887afe8b88386af13da1b87d829f8 glibc-2.16.90-42443a47.tar.gz
29ce8bef5237f8eccccfc5f8d14cef9b glibc-ports-2.16-a20c2b3c.tar.gz