From ff798471238935f07a95d6adebc61ff8cf9498ef Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Sat, 5 Mar 2005 14:14:54 +0000 Subject: [PATCH] auto-import glibc-2.3.4-12 on branch devel from glibc-2.3.4-12.src.rpm --- glibc-fedora.patch | 143 +++++++++++++++++++++++++++++---------------- glibc.spec | 14 ++++- sources | 2 +- 3 files changed, 105 insertions(+), 54 deletions(-) diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 45d08f9..4c95fb5 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,22 @@ --- glibc-20050303T1335/ChangeLog 3 Mar 2005 08:28:23 -0000 1.9240 -+++ glibc-20050303T1335-fedora/ChangeLog 3 Mar 2005 17:29:55 -0000 1.8782.2.82 -@@ -10,6 +10,7 @@ ++++ glibc-20050303T1335-fedora/ChangeLog 5 Mar 2005 13:13:04 -0000 1.8782.2.85 +@@ -1,3 +1,15 @@ ++2005-03-05 Jakub Jelinek ++ ++ * Makerules ($(inst_libdir)/libc.so): Use $(slibdir) instead of ++ $(inst_slibdir) in AS_NEEDED directive. ++ ++ * include/bits/unistd.h: New file. ++ * include/bits/socket2.h: New file. ++ ++ * sysdeps/i386/dl-machine.h (ELF_MACHINE_NO_RELA): Define ++ unconditionally to (defined RTLD_BOOTSTRAP). ++ * sysdeps/arm/dl-machine.h (ELF_MACHINE_NO_RELA): Likewise. ++ + 2005-03-01 H.J. Lu + + [BZ #776] +@@ -10,6 +22,7 @@ loader is closed. Fixes unload3. * elf/tst-global1.c: New file. * elf/Makefile (tests): Add tst-global1. @@ -8,7 +24,7 @@ 2005-03-03 Jakub Jelinek -@@ -529,6 +530,18 @@ +@@ -529,6 +542,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -188,6 +204,17 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit +--- glibc-20050303T1335/Makerules 24 Feb 2005 02:10:30 -0000 1.429 ++++ glibc-20050303T1335-fedora/Makerules 5 Mar 2005 13:13:06 -0000 1.423.2.5 +@@ -972,7 +972,7 @@ $(inst_libdir)/libc.so: $(common-objpfx) + cat $<; \ + echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \ + '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\ +- ' AS_NEEDED (' $(inst_slibdir)/$(rtld-installed-name) ') )' \ ++ ' AS_NEEDED (' $(slibdir)/$(rtld-installed-name) ') )' \ + ) > $@.new + mv -f $@.new $@ + --- glibc-20050303T1335/Versions.def 21 Feb 2005 23:06:21 -0000 1.59 +++ glibc-20050303T1335-fedora/Versions.def 3 Mar 2005 16:52:24 -0000 1.58.2.2 @@ -20,7 +20,6 @@ libc { @@ -774,6 +801,14 @@ #define __GLIBC_PREREQ(maj, min) \ ((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min)) +--- glibc-20050303T1335/include/bits/socket2.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050303T1335-fedora/include/bits/socket2.h 5 Mar 2005 13:04:47 -0000 1.1.2.1 +@@ -0,0 +1 @@ ++#include +--- glibc-20050303T1335/include/bits/unistd.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050303T1335-fedora/include/bits/unistd.h 5 Mar 2005 13:04:47 -0000 1.1.2.1 +@@ -0,0 +1 @@ ++#include --- glibc-20050303T1335/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 +++ glibc-20050303T1335-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 @@ -58,8 +58,6 @@ korean ko_KR.eucKR @@ -858,8 +893,16 @@ + __chk_fail (); \ + fgets_unlocked (__str, __n_val, __fp); })) --- glibc-20050303T1335/linuxthreads/ChangeLog 10 Feb 2005 07:16:22 -0000 1.837 -+++ glibc-20050303T1335-fedora/linuxthreads/ChangeLog 11 Feb 2005 09:01:50 -0000 1.817.2.17 -@@ -766,6 +766,12 @@ ++++ glibc-20050303T1335-fedora/linuxthreads/ChangeLog 5 Mar 2005 13:03:34 -0000 1.817.2.18 +@@ -1,3 +1,7 @@ ++2005-03-05 Jakub Jelinek ++ ++ * sysdeps/powerpc/tcb-offsets.sym (thread_offsetof): Rework for GCC 4. ++ + 2005-02-09 Daniel Jacobowitz + + * descr.h (__pthread_find_self, thread_self): Mark as pure +@@ -766,6 +770,12 @@ (pthread_barrierattr_setpshared): Return EINVAL if pshared is neither PTHREAD_PROCESS_PRIVATE nor PTHREAD_PROCESS_SHARED. @@ -872,7 +915,7 @@ 2003-09-02 Ulrich Drepper * sysdeps/unix/sysv/linux/i386/dl-sysdep.h -@@ -898,6 +904,34 @@ +@@ -898,6 +908,34 @@ 2003-07-22 Jakub Jelinek @@ -1102,6 +1145,17 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) +--- glibc-20050303T1335/linuxthreads/sysdeps/powerpc/tcb-offsets.sym 13 Jan 2004 21:30:17 -0000 1.7 ++++ glibc-20050303T1335-fedora/linuxthreads/sysdeps/powerpc/tcb-offsets.sym 5 Mar 2005 13:03:35 -0000 1.7.2.1 +@@ -8,7 +8,7 @@ + -- Abuse tls.h macros to derive offsets relative to the thread register. + # undef __thread_register + # define __thread_register ((void *) 0) +-# define thread_offsetof(mem) ((void *) &THREAD_SELF->p_##mem - (void *) 0) ++# define thread_offsetof(mem) ((ptrdiff_t) THREAD_SELF + offsetof (struct _pthread_descr_struct, p_##mem)) + + # else + --- glibc-20050303T1335/linuxthreads/sysdeps/powerpc/tls.h 9 Jan 2005 20:01:14 -0000 1.9 +++ glibc-20050303T1335-fedora/linuxthreads/sysdeps/powerpc/tls.h 8 Feb 2005 10:04:14 -0000 1.8.2.2 @@ -69,11 +69,19 @@ typedef struct @@ -2006,6 +2060,19 @@ + if (__bos0 (buf) != (size_t) -1 && __bos0 (buf) < __n_val) \ + __chk_fail (); \ + recvfrom (fd, buf, __n_val, flags, addr, addr_len); })) +--- glibc-20050303T1335/sysdeps/arm/dl-machine.h 1 Mar 2005 20:34:40 -0000 1.50 ++++ glibc-20050303T1335-fedora/sysdeps/arm/dl-machine.h 5 Mar 2005 13:03:35 -0000 1.48.2.3 +@@ -353,9 +353,7 @@ elf_machine_plt_value (struct link_map * + + /* ARM never uses Elf32_Rela relocations for the dynamic linker. + Prelinked libraries may use Elf32_Rela though. */ +-#ifdef RTLD_BOOTSTRAP +-# define ELF_MACHINE_NO_RELA 1 +-#endif ++#define ELF_MACHINE_NO_RELA (defined RTLD_BOOTSTRAP) + + #ifdef RESOLVE + --- glibc-20050303T1335/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 +++ glibc-20050303T1335-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 @@ -36,6 +36,14 @@ @@ -2023,6 +2090,19 @@ #define CACHEMAGIC "ld.so-1.7.0" /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another +--- glibc-20050303T1335/sysdeps/i386/dl-machine.h 17 Feb 2005 01:16:33 -0000 1.133 ++++ glibc-20050303T1335-fedora/sysdeps/i386/dl-machine.h 5 Mar 2005 13:03:35 -0000 1.127.2.4 +@@ -301,9 +301,7 @@ elf_machine_plt_value (struct link_map * + + /* The i386 never uses Elf32_Rela relocations for the dynamic linker. + Prelinked libraries may use Elf32_Rela though. */ +-#ifdef RTLD_BOOTSTRAP +-# define ELF_MACHINE_NO_RELA 1 +-#endif ++#define ELF_MACHINE_NO_RELA (defined RTLD_BOOTSTRAP) + + #ifdef RESOLVE_MAP + --- glibc-20050303T1335/sysdeps/i386/bits/atomic.h 1 Jan 1970 00:00:00 -0000 +++ glibc-20050303T1335-fedora/sysdeps/i386/bits/atomic.h 5 Oct 2004 12:09:44 -0000 1.1.2.3 @@ -0,0 +1,410 @@ @@ -2436,6 +2516,13 @@ + + +#define atomic_delay() asm ("rep; nop") +--- glibc-20050303T1335/sysdeps/i386/i486/Makefile 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050303T1335-fedora/sysdeps/i386/i486/Makefile 5 Mar 2005 13:03:35 -0000 1.1.2.1 +@@ -0,0 +1,4 @@ ++# Temporary workaround for GCC4 PR debug/19345 ++ifeq ($(subdir),string) ++CFLAGS-string-inlines.c += -g0 ++endif --- glibc-20050303T1335/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 +++ glibc-20050303T1335-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing @@ -3505,47 +3592,3 @@ #define IEXTEN 0x00008000 /* modem lines */ ---- libc/linuxthreads/sysdeps/powerpc/tcb-offsets.sym.jj 2005-03-04 14:21:29.000000000 -0500 -+++ libc/linuxthreads/sysdeps/powerpc/tcb-offsets.sym 2005-03-04 14:26:29.000000000 -0500 -@@ -8,7 +8,7 @@ - -- Abuse tls.h macros to derive offsets relative to the thread register. - # undef __thread_register - # define __thread_register ((void *) 0) --# define thread_offsetof(mem) ((void *) &THREAD_SELF->p_##mem - (void *) 0) -+# define thread_offsetof(mem) ((ptrdiff_t) THREAD_SELF + offsetof (struct _pthread_descr_struct, p_##mem)) - - # else - ---- libc/sysdeps/i386/dl-machine.h.jj 2005-02-16 20:16:33.000000000 -0500 -+++ libc/sysdeps/i386/dl-machine.h 2005-03-04 16:50:32.313591897 -0500 -@@ -301,9 +301,7 @@ elf_machine_plt_value (struct link_map * - - /* The i386 never uses Elf32_Rela relocations for the dynamic linker. - Prelinked libraries may use Elf32_Rela though. */ --#ifdef RTLD_BOOTSTRAP --# define ELF_MACHINE_NO_RELA 1 --#endif -+#define ELF_MACHINE_NO_RELA (defined RTLD_BOOTSTRAP) - - #ifdef RESOLVE_MAP - ---- libc/sysdeps/arm/dl-machine.h.jj 2005-03-01 15:34:40.000000000 -0500 -+++ libc/sysdeps/arm/dl-machine.h 2005-03-04 16:50:43.913473979 -0500 -@@ -353,9 +353,7 @@ elf_machine_plt_value (struct link_map * - - /* ARM never uses Elf32_Rela relocations for the dynamic linker. - Prelinked libraries may use Elf32_Rela though. */ --#ifdef RTLD_BOOTSTRAP --# define ELF_MACHINE_NO_RELA 1 --#endif -+#define ELF_MACHINE_NO_RELA (defined RTLD_BOOTSTRAP) - - #ifdef RESOLVE - ---- libc/sysdeps/i386/i486/Makefile.jj 2005-01-27 14:27:08.338732320 +0100 -+++ libc/sysdeps/i386/i486/Makefile 2005-03-05 01:17:12.459113304 +0100 -@@ -0,0 +1,4 @@ -+# Temporary workaround for GCC4 PR debug/19345 -+ifeq ($(subdir),string) -+CFLAGS-string-inlines.c += -g0 -+endif diff --git a/glibc.spec b/glibc.spec index b5c1a3b..fc5b920 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,7 +1,7 @@ %define glibcdate 20050303T1335 %define glibcname glibc %define glibcversion 2.3.4 -%define glibcrelease 11 +%define glibcrelease 12 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64 @@ -74,7 +74,8 @@ Conflicts: kernel < 2.4.19 %define tls_subdir tls %endif %endif -BuildRequires: binutils >= 2.13.90.0.16-5 +# Need AS_NEEDED directive +BuildRequires: binutils >= 2.15.94.0.2-1 BuildRequires: gcc >= 3.2.1-5 %if "%{_enable_debug_packages}" == "1" BuildPreReq: elfutils >= 0.72 @@ -96,7 +97,8 @@ Linux system will not function. Summary: Object files for development using standard C libraries. Group: Development/Libraries Conflicts: texinfo < 3.11 -Conflicts: binutils < 2.13.90.0.16-5 +# Need AS_NEEDED directive +Conflicts: binutils < 2.15.94.0.2-1 Prereq: /sbin/install-info Obsoletes: libc-debug, libc-headers, libc-devel, linuxthreads-devel Obsoletes: glibc-debug @@ -1275,6 +1277,12 @@ rm -f *.filelist* %endif %changelog +* Sat Mar 5 2005 Jakub Jelinek 2.3.4-12 +- fix tst-chk{2,3} +- fix up AS_NEEDED directive in /usr/%{_lib}/libc.so +- BuildReq binutils >= 2.15.94.0.2-1 for AS_NEEDED, in + glibc-devel Conflict with binutils < 2.15.94.0.2-1 + * Thu Mar 3 2005 Jakub Jelinek 2.3.4-11 - update from CVS - fix execvp (#149290) diff --git a/sources b/sources index 51dbc5a..a723d6f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 7a4382a993de6f65c4bfb86d78828c3d glibc-20050303T1335.tar.bz2 -78c6e594d2528fe22d6c0d63cb6a7e9d glibc-fedora-20050303T1335.tar.bz2 +ecef68cc19f97e8a6c1f6b4fffa4d9fe glibc-fedora-20050303T1335.tar.bz2