diff --git a/glibc-2.3.3-amd64-string.diff b/glibc-2.3.3-amd64-string.diff index 03b513b..7bcd51a 100644 --- a/glibc-2.3.3-amd64-string.diff +++ b/glibc-2.3.3-amd64-string.diff @@ -1,8 +1,8 @@ ============================================================ Index: sysdeps/x86_64/strlen.S =================================================================== ---- sysdeps/x86_64/strlen.S.orig -+++ sysdeps/x86_64/strlen.S +--- sysdeps/x86_64/strlen.S.orig 2003-04-30 00:47:18.000000000 +0200 ++++ sysdeps/x86_64/strlen.S 2009-03-23 16:32:42.000000000 +0100 @@ -1,139 +1,405 @@ -/* strlen(str) -- determine the length of the string STR. - Copyright (C) 2002, 2003 Free Software Foundation, Inc. @@ -548,9 +548,9 @@ Index: sysdeps/x86_64/strlen.S libc_hidden_builtin_def (strlen) Index: sysdeps/x86_64/dl-machine.h =================================================================== ---- sysdeps/x86_64/dl-machine.h.orig -+++ sysdeps/x86_64/dl-machine.h -@@ -219,6 +219,40 @@ dl_platform_init (void) +--- sysdeps/x86_64/dl-machine.h.orig 2008-11-14 16:42:29.000000000 +0100 ++++ sysdeps/x86_64/dl-machine.h 2009-03-23 16:32:42.000000000 +0100 +@@ -226,6 +226,40 @@ dl_platform_init (void) if (GLRO(dl_platform) != NULL && *GLRO(dl_platform) == '\0') /* Avoid an empty string which would disturb us. */ GLRO(dl_platform) = NULL; @@ -593,8 +593,8 @@ Index: sysdeps/x86_64/dl-machine.h static inline Elf64_Addr Index: sysdeps/x86_64/Makefile =================================================================== ---- sysdeps/x86_64/Makefile.orig -+++ sysdeps/x86_64/Makefile +--- sysdeps/x86_64/Makefile.orig 2008-11-14 16:42:29.000000000 +0100 ++++ sysdeps/x86_64/Makefile 2009-03-23 16:32:42.000000000 +0100 @@ -4,6 +4,9 @@ long-double-fcts = yes ifeq ($(subdir),csu) sysdep_routines += hp-timing @@ -607,8 +607,8 @@ Index: sysdeps/x86_64/Makefile ifeq ($(subdir),gmon) Index: sysdeps/x86_64/strcpy.S =================================================================== ---- sysdeps/x86_64/strcpy.S.orig -+++ sysdeps/x86_64/strcpy.S +--- sysdeps/x86_64/strcpy.S.orig 2003-04-30 00:47:18.000000000 +0200 ++++ sysdeps/x86_64/strcpy.S 2009-03-23 16:32:42.000000000 +0100 @@ -1,159 +1,833 @@ -/* strcpy/stpcpy implementation for x86-64. - Copyright (C) 2002 Free Software Foundation, Inc. @@ -1591,8 +1591,8 @@ Index: sysdeps/x86_64/strcpy.S #endif Index: sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c =================================================================== ---- sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c.orig -+++ sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c +--- sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c.orig 2005-12-14 09:09:28.000000000 +0100 ++++ sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c 2009-03-23 16:32:42.000000000 +0100 @@ -1,5 +1,5 @@ #ifdef IS_IN_ldconfig # include @@ -1602,8 +1602,8 @@ Index: sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c #endif Index: sysdeps/x86_64/dl-procinfo.c =================================================================== ---- /dev/null -+++ sysdeps/x86_64/dl-procinfo.c +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ sysdeps/x86_64/dl-procinfo.c 2009-03-23 16:32:42.000000000 +0100 @@ -0,0 +1,108 @@ +/* Data for x86-64 version of processor capability information. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -1715,8 +1715,8 @@ Index: sysdeps/x86_64/dl-procinfo.c +#undef PROCINFO_CLASS Index: sysdeps/x86_64/elf/rtld-global-offsets.sym =================================================================== ---- /dev/null -+++ sysdeps/x86_64/elf/rtld-global-offsets.sym +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ sysdeps/x86_64/elf/rtld-global-offsets.sym 2009-03-23 16:32:42.000000000 +0100 @@ -0,0 +1,10 @@ +#define SHARED 1 + @@ -1730,9 +1730,9 @@ Index: sysdeps/x86_64/elf/rtld-global-offsets.sym +RTLD_GLOBAL_DL_CACHE2SIZEHALF rtdl_global_offsetof (_dl_cache2sizehalf) Index: sysdeps/x86_64/memcmp.S =================================================================== ---- /dev/null -+++ sysdeps/x86_64/memcmp.S -@@ -0,0 +1,442 @@ +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ sysdeps/x86_64/memcmp.S 2009-03-23 16:32:42.000000000 +0100 +@@ -0,0 +1,443 @@ +# $Header: /K8_Projects/Glibc/amd64memcmp.S 4 10/06/03 10:57 Emenezes $ + +# (c) 2002 Advanced Micro Devices, Inc. @@ -2175,10 +2175,11 @@ Index: sysdeps/x86_64/memcmp.S + +#undef bcmp +weak_alias (memcmp, bcmp) ++libc_hidden_builtin_def (memcmp) Index: sysdeps/x86_64/strncmp.S =================================================================== ---- /dev/null -+++ sysdeps/x86_64/strncmp.S +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ sysdeps/x86_64/strncmp.S 2009-03-23 16:32:42.000000000 +0100 @@ -0,0 +1,15 @@ +# $Header: /K8_Projects/Glibc/amd64strncpy.S 1 8/29/03 16:37 Emenezes $ + @@ -2197,8 +2198,8 @@ Index: sysdeps/x86_64/strncmp.S +libc_hidden_builtin_def (strncmp) Index: sysdeps/x86_64/strcmp.S =================================================================== ---- sysdeps/x86_64/strcmp.S.orig -+++ sysdeps/x86_64/strcmp.S +--- sysdeps/x86_64/strcmp.S.orig 2005-03-31 12:00:13.000000000 +0200 ++++ sysdeps/x86_64/strcmp.S 2009-03-23 16:32:42.000000000 +0100 @@ -1,45 +1,487 @@ -/* Highly optimized version for x86-64. - Copyright (C) 1999, 2000, 2002, 2003, 2005 Free Software Foundation, Inc. @@ -2731,8 +2732,8 @@ Index: sysdeps/x86_64/strcmp.S libc_hidden_builtin_def (strcmp) Index: sysdeps/x86_64/memcpy.S =================================================================== ---- sysdeps/x86_64/memcpy.S.orig -+++ sysdeps/x86_64/memcpy.S +--- sysdeps/x86_64/memcpy.S.orig 2007-11-06 03:49:38.000000000 +0100 ++++ sysdeps/x86_64/memcpy.S 2009-03-23 16:32:42.000000000 +0100 @@ -39,7 +39,7 @@ .text diff --git a/glibc.changes b/glibc.changes index 39b09c2..8eff749 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 23 15:32:01 CET 2009 - rguenther@suse.de + +- Add missing libc_hidden_builtin_def (memcmp) to + glibc-2.3.3-amd64-string.diff. Fixes build with GCC 4.4. + ------------------------------------------------------------------- Fri Feb 27 16:21:17 CET 2009 - rguenther@suse.de diff --git a/glibc.spec b/glibc.spec index 96cf84e..a032f5f 100644 --- a/glibc.spec +++ b/glibc.spec @@ -69,7 +69,7 @@ Obsoletes: glibc-32bit Provides: rtld(GNU_HASH) AutoReqProv: on Version: 2.9 -Release: 14 +Release: 15 %define snapshot_date 2008111711 Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem @@ -1058,6 +1058,9 @@ exit 0 %{_libdir}/libdl_p.a %changelog +* Mon Mar 23 2009 rguenther@suse.de +- Add missing libc_hidden_builtin_def (memcmp) to + glibc-2.3.3-amd64-string.diff. Fixes build with GCC 4.4. * Fri Feb 27 2009 rguenther@suse.de - Make sure to mark fortified inline routines with __attribute__((__artificial__)).