diff --git a/package/base/glibc/glibc23/dl-runtime-fix.patch b/package/base/glibc/glibc23/dl-runtime-fix.patch deleted file mode 100644 index fce21748e..000000000 --- a/package/base/glibc/glibc23/dl-runtime-fix.patch +++ /dev/null @@ -1,59 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/glibc/glibc23/dl-runtime-fix.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./elf/dl-runtime.c.orig 2004-09-02 12:06:09.000000000 +0200 -+++ ./elf/dl-runtime.c 2004-09-02 12:08:02.000000000 +0200 -@@ -46,6 +46,9 @@ - - #ifndef ELF_MACHINE_NO_PLT - static ElfW(Addr) __attribute_used__ -+#ifdef ELF_MACHINE_RUNTIME_FIXUP_ATTR -+ ELF_MACHINE_RUNTIME_FIXUP_ATTR -+#endif - fixup ( - # ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS - ELF_MACHINE_RUNTIME_FIXUP_ARGS, -@@ -133,6 +136,9 @@ - #if !defined PROF && !defined ELF_MACHINE_NO_PLT && !__BOUNDED_POINTERS__ - - static ElfW(Addr) __attribute_used__ -+#ifdef ELF_MACHINE_RUNTIME_PROFILE_FIXUP_ATTR -+ ELF_MACHINE_RUNTIME_PROFILE_FIXUP_ATTR -+#endif - profile_fixup ( - #ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS - ELF_MACHINE_RUNTIME_FIXUP_ARGS, ---- ./sysdeps/i386/dl-machine.h.orig 2004-09-02 12:05:52.000000000 +0200 -+++ ./sysdeps/i386/dl-machine.h 2004-09-02 12:08:20.000000000 +0200 -@@ -154,11 +154,13 @@ - destroys the passed register information. */ - /* GKM FIXME: Fix trampoline to pass bounds so we can do - without the `__unbounded' qualifier. */ -+#define ELF_MACHINE_RUNTIME_FIXUP_ATTR __attribute__ ((regparm (2))) -+#define ELF_MACHINE_RUNTIME_PROFILE_FIXUP_ATTR __attribute__ ((regparm (3))) - static ElfW(Addr) fixup (struct link_map *__unbounded l, ElfW(Word) reloc_offset) -- __attribute__ ((regparm (2), unused)); -+ __attribute_used__ ELF_MACHINE_RUNTIME_FIXUP_ATTR; - static ElfW(Addr) profile_fixup (struct link_map *l, ElfW(Word) reloc_offset, - ElfW(Addr) retaddr) -- __attribute__ ((regparm (3), unused)); -+ __attribute_used__ ELF_MACHINE_RUNTIME_PROFILE_FIXUP_ATTR; - # endif - - /* This code is used in dl-runtime.c to call the `fixup' function diff --git a/package/base/glibc/glibc23/dl-runtime-fix.patch-x b/package/base/glibc/glibc23/dl-runtime-fix.patch-x deleted file mode 100644 index fce21748e..000000000 --- a/package/base/glibc/glibc23/dl-runtime-fix.patch-x +++ /dev/null @@ -1,59 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/glibc/glibc23/dl-runtime-fix.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./elf/dl-runtime.c.orig 2004-09-02 12:06:09.000000000 +0200 -+++ ./elf/dl-runtime.c 2004-09-02 12:08:02.000000000 +0200 -@@ -46,6 +46,9 @@ - - #ifndef ELF_MACHINE_NO_PLT - static ElfW(Addr) __attribute_used__ -+#ifdef ELF_MACHINE_RUNTIME_FIXUP_ATTR -+ ELF_MACHINE_RUNTIME_FIXUP_ATTR -+#endif - fixup ( - # ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS - ELF_MACHINE_RUNTIME_FIXUP_ARGS, -@@ -133,6 +136,9 @@ - #if !defined PROF && !defined ELF_MACHINE_NO_PLT && !__BOUNDED_POINTERS__ - - static ElfW(Addr) __attribute_used__ -+#ifdef ELF_MACHINE_RUNTIME_PROFILE_FIXUP_ATTR -+ ELF_MACHINE_RUNTIME_PROFILE_FIXUP_ATTR -+#endif - profile_fixup ( - #ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS - ELF_MACHINE_RUNTIME_FIXUP_ARGS, ---- ./sysdeps/i386/dl-machine.h.orig 2004-09-02 12:05:52.000000000 +0200 -+++ ./sysdeps/i386/dl-machine.h 2004-09-02 12:08:20.000000000 +0200 -@@ -154,11 +154,13 @@ - destroys the passed register information. */ - /* GKM FIXME: Fix trampoline to pass bounds so we can do - without the `__unbounded' qualifier. */ -+#define ELF_MACHINE_RUNTIME_FIXUP_ATTR __attribute__ ((regparm (2))) -+#define ELF_MACHINE_RUNTIME_PROFILE_FIXUP_ATTR __attribute__ ((regparm (3))) - static ElfW(Addr) fixup (struct link_map *__unbounded l, ElfW(Word) reloc_offset) -- __attribute__ ((regparm (2), unused)); -+ __attribute_used__ ELF_MACHINE_RUNTIME_FIXUP_ATTR; - static ElfW(Addr) profile_fixup (struct link_map *l, ElfW(Word) reloc_offset, - ElfW(Addr) retaddr) -- __attribute__ ((regparm (3), unused)); -+ __attribute_used__ ELF_MACHINE_RUNTIME_PROFILE_FIXUP_ATTR; - # endif - - /* This code is used in dl-runtime.c to call the `fixup' function diff --git a/package/base/glibc/glibc23/mips-updates-july04.patch.mips b/package/base/glibc/glibc23/mips-updates-july04.patch.mips deleted file mode 100644 index 107c3af87..000000000 --- a/package/base/glibc/glibc23/mips-updates-july04.patch.mips +++ /dev/null @@ -1,655 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/glibc/glibc23/mips-updates-july04.patch.mips -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./sysdeps/unix/sysv/linux/mips/Makefile 2003-09-03 05:16:54.000000000 +0200 -+++ ./sysdeps/unix/sysv/linux/mips/Makefile 2004-07-20 18:37:41.000000000 +0200 -@@ -21,20 +21,25 @@ - echo '# error "Never use directly; include instead."'; \ - echo '#endif'; \ - echo ''; \ -+ echo '#include '; \ - rm -f $(@:.d=.h).newt; \ - $(CC) -E -MD -MP -MF $(@:.h=.d)-t -MT '$(@:.d=.h) $(@:.h=.d)' \ -- -x c -I $(common-objdir) $(sysincludes) $< -D_LIBC -dM | \ -+ -x c $(+includes) $(sysincludes) $< -D_LIBC -dM | \ - sed -n 's@^#define __NR_\([^ ]*\) .*$$@#define SYS_\1 __NR_\1@p' \ - > $(@:.d=.h).newt; \ - if grep SYS_O32_ $(@:.d=.h).newt > /dev/null; then \ -- echo '#if defined _ABI64 && _MIPS_SIM == _ABI64'; \ -- sed -n 's/^\(#define SYS_\)N64_/\1/p' < $(@:.d=.h).newt; \ -- echo '#elif defined _ABIN32 && _MIPS_SIM == _ABIN32'; \ -- sed -n 's/^\(#define SYS_\)N32_/\1/p' < $(@:.d=.h).newt; \ -+ echo '#if _MIPS_SIM == _MIPS_SIM_NABI32'; \ -+ sed -n 's/^\(#define SYS_\)N32_/\1/p' < $(@:.d=.h).newt | \ -+ LC_ALL=C sort; \ -+ echo '#elif _MIPS_SIM == _MIPS_SIM_ABI64'; \ -+ sed -n 's/^\(#define SYS_\)N64_/\1/p' < $(@:.d=.h).newt | \ -+ LC_ALL=C sort; \ - echo '#else'; \ -- sed -n 's/^\(#define SYS_\)O32_/\1/p' < $(@:.d=.h).newt; \ -+ sed -n 's/^\(#define SYS_\)O32_/\1/p' < $(@:.d=.h).newt | \ -+ LC_ALL=C sort; \ - echo '#endif'; \ -- sed -n '/^#define SYS_\([ON]32\|N64\)_/p' < $(@:.d=.h).newt; \ -+ sed -n '/^#define SYS_\([ON]32\|N64\)_/p' < $(@:.d=.h).newt | \ -+ LC_ALL=C sort +1.8; \ - else \ - cat $(@:.d=.h).newt; \ - fi; \ ---- ./sysdeps/unix/sysv/linux/mips/bits/fcntl.h 2003-04-04 07:12:00.000000000 +0200 -+++ ./sysdeps/unix/sysv/linux/mips/bits/fcntl.h 2004-07-20 18:35:29.000000000 +0200 -@@ -1,5 +1,5 @@ - /* O_*, F_*, FD_* bit values for Linux. -- Copyright (C) 1995, 1996, 1997, 1998, 2000, 2002, 2003 -+ Copyright (C) 1995, 1996, 1997, 1998, 2000, 2002, 2003, 2004 - Free Software Foundation, Inc. - This file is part of the GNU C Library. - -@@ -23,7 +23,7 @@ - #endif - - #include -- -+#include - - /* open/fcntl - O_SYNC is only implemented on blocks devices and on files - located on an ext2 file system */ -@@ -81,7 +81,7 @@ - #define F_SETLK64 34 /* Set record locking info (non-blocking). */ - #define F_SETLKW64 35 /* Set record locking info (blocking). */ - --#if defined __USE_BSD || defined __USE_XOPEN2K -+#if defined __USE_BSD || defined __USE_UNIX98 - # define F_SETOWN 24 /* Get owner of socket (receiver of SIGIO). */ - # define F_GETOWN 23 /* Set owner of socket (receiver of SIGIO). */ - #endif -@@ -143,7 +143,7 @@ - #ifndef __USE_FILE_OFFSET64 - __off_t l_start; /* Offset where the lock begins. */ - __off_t l_len; /* Size of the locked area; zero means until EOF. */ --#if ! (defined _ABI64 && _MIPS_SIM == _ABI64) -+#if _MIPS_SIM != _MIPS_SIM_ABI64 - /* The 64-bit flock structure, used by the n64 ABI, and for 64-bit - fcntls in o32 and n32, never has this field. */ - long int l_sysid; -@@ -153,7 +153,7 @@ - __off64_t l_len; /* Size of the locked area; zero means until EOF. */ - #endif - __pid_t l_pid; /* Process holding the lock. */ --#if ! defined __USE_FILE_OFFSET64 && ! (defined _ABI64 && _MIPS_SIM == _ABI64) -+#if ! defined __USE_FILE_OFFSET64 && _MIPS_SIM != _MIPS_SIM_ABI64 - /* The 64-bit flock structure, used by the n64 ABI, and for 64-bit - flock in o32 and n32, never has this field. */ - long int pad[4]; ---- ./sysdeps/unix/sysv/linux/mips/bits/sigcontext.h 2003-04-13 13:36:32.000000000 +0200 -+++ ./sysdeps/unix/sysv/linux/mips/bits/sigcontext.h 2004-07-20 18:35:29.000000000 +0200 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1996, 1997, 1998, 2003 Free Software Foundation, Inc. -+/* Copyright (C) 1996, 1997, 1998, 2003, 2004 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -20,6 +20,8 @@ - # error "Never use directly; include instead." - #endif - -+#include -+ - #ifndef sigcontext_struct - /* Kernel headers before 2.1.1 define a struct sigcontext_struct, but - we need sigcontext. */ ---- ./sysdeps/unix/sysv/linux/mips/bits/stat.h 2003-04-05 21:57:35.000000000 +0200 -+++ ./sysdeps/unix/sysv/linux/mips/bits/stat.h 2004-07-20 18:35:28.000000000 +0200 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1992, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003 -+/* Copyright (C) 1992, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 - Free Software Foundation, Inc. - This file is part of the GNU C Library. - -@@ -21,6 +21,8 @@ - # error "Never include directly; use instead." - #endif - -+#include -+ - /* Versions of the `struct stat' data structure. */ - #define _STAT_VER_LINUX_OLD 1 - #define _STAT_VER_KERNEL 1 ---- ./sysdeps/unix/sysv/linux/mips/configure 2003-03-28 07:11:03.000000000 +0100 -+++ ./sysdeps/unix/sysv/linux/mips/configure 2004-07-20 18:35:29.000000000 +0200 -@@ -30,6 +30,7 @@ - -e 's,__NR_N64_N32_,__NR_N32_,g' \ - -e 's,__NR_N64_N64_,__NR_N64_,g' \ - | awk > asm-unistd.h ' -+BEGIN { print "#include "; } - /^#define __NR.*unused/ { print; next; } - /^#define __NR_N64__exit __NR_N64_exit/ { - print "#define __NR__exit __NR_exit"; -@@ -50,7 +51,7 @@ - name = $2; - sub (/_N32_/, "_", name); - print; -- print "#if defined _ABIN32 && _MIPS_SIM == _ABIN32"; -+ print "#if _MIPS_SIM == _MIPS_SIM_NABI32"; - print "# define " name " " $2; - print "#endif"; - next; -@@ -59,7 +60,7 @@ - name = $2; - sub (/_N64_/, "_", name); - print; -- print "#if defined _ABI64 && _MIPS_SIM == _ABI64"; -+ print "#if _MIPS_SIM == _MIPS_SIM_ABI64"; - print "# define " name " " $2; - print "#endif"; - next; ---- ./sysdeps/unix/sysv/linux/mips/configure.in 2003-03-17 16:50:05.000000000 +0100 -+++ ./sysdeps/unix/sysv/linux/mips/configure.in 2004-07-20 18:35:29.000000000 +0200 -@@ -30,6 +30,7 @@ - -e 's,__NR_N64_N32_,__NR_N32_,g' \ - -e 's,__NR_N64_N64_,__NR_N64_,g' \ - | awk > asm-unistd.h ' -+BEGIN { print "#include "; } - /^#define __NR.*unused/ { print; next; } - /^#define __NR_N64__exit __NR_N64_exit/ { - print "#define __NR__exit __NR_exit"; -@@ -50,7 +51,7 @@ - name = $2; - sub (/_N32_/, "_", name); - print; -- print "#if defined _ABIN32 && _MIPS_SIM == _ABIN32"; -+ print "#if _MIPS_SIM == _MIPS_SIM_NABI32"; - print "# define " name " " $2; - print "#endif"; - next; -@@ -59,7 +60,7 @@ - name = $2; - sub (/_N64_/, "_", name); - print; -- print "#if defined _ABI64 && _MIPS_SIM == _ABI64"; -+ print "#if _MIPS_SIM == _MIPS_SIM_ABI64"; - print "# define " name " " $2; - print "#endif"; - next; ---- ./sysdeps/unix/sysv/linux/mips/kernel_stat.h 2003-04-05 21:57:35.000000000 +0200 -+++ ./sysdeps/unix/sysv/linux/mips/kernel_stat.h 2004-07-20 18:35:29.000000000 +0200 -@@ -1,3 +1,4 @@ -+#include - /* As tempting as it is to define XSTAT_IS_XSTAT64 for n64, the - userland data structures are not identical, because of different - padding. */ ---- ./sysdeps/unix/sysv/linux/mips/mips64/syscalls.list 2003-09-03 05:16:25.000000000 +0200 -+++ ./sysdeps/unix/sysv/linux/mips/mips64/syscalls.list 2004-07-21 08:13:15.000000000 +0200 -@@ -16,5 +16,6 @@ - shmdt - shmdt i:s __shmdt shmdt - shmget - shmget i:iii __shmget shmget - semop - semop i:ipi __semop semop -+semtimedop - semtimedop i:ipip semtimedop - semget - semget i:iii __semget semget - semctl - semctl i:iiii __semctl semctl ---- ./sysdeps/unix/sysv/linux/mips/pread.c 2003-09-11 01:38:52.000000000 +0200 -+++ ./sysdeps/unix/sysv/linux/mips/pread.c 2004-07-20 18:35:29.000000000 +0200 -@@ -1,4 +1,5 @@ --/* Copyright (C) 1997, 1998, 2000, 2002, 2003 Free Software Foundation, Inc. -+/* Copyright (C) 1997, 1998, 2000, 2002, 2003, 2004 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1997. - -@@ -27,6 +28,7 @@ - #include - - #include -+#include - - #ifdef __NR_pread64 /* Newer kernels renamed but it's the same. */ - # ifdef __NR_pread -@@ -51,14 +53,14 @@ - { - ssize_t result; - --#if (defined _ABI64 && _MIPS_SIM != _ABI64) -+#if _MIPS_SIM != _MIPS_SIM_ABI64 - assert (sizeof (offset) == 4); - #endif - - if (SINGLE_THREAD_P) - { - /* First try the syscall. */ --#if (defined _ABIN32 && _MIPS_SIM == _ABIN32) || (defined _ABI64 && _MIPS_SIM == _ABI64) -+#if _MIPS_SIM == _MIPS_SIM_NABI32 || _MIPS_SIM == _MIPS_SIM_ABI64 - result = INLINE_SYSCALL (pread, 4, fd, CHECK_N (buf, count), count, - offset); - #else -@@ -76,7 +78,7 @@ - int oldtype = LIBC_CANCEL_ASYNC (); - - /* First try the syscall. */ --#if (defined _ABIN32 && _MIPS_SIM == _ABIN32) || (defined _ABI64 && _MIPS_SIM == _ABI64) -+#if _MIPS_SIM == _MIPS_SIM_NABI32 || _MIPS_SIM_ABI64 - result = INLINE_SYSCALL (pread, 4, fd, CHECK_N (buf, count), count, offset); - #else - result = INLINE_SYSCALL (pread, 6, fd, CHECK_N (buf, count), count, 0, ---- ./sysdeps/unix/sysv/linux/mips/pread64.c 2003-09-11 01:38:52.000000000 +0200 -+++ ./sysdeps/unix/sysv/linux/mips/pread64.c 2004-07-20 18:35:29.000000000 +0200 -@@ -1,4 +1,5 @@ --/* Copyright (C) 1997, 1998, 2000, 2002, 2003 Free Software Foundation, Inc. -+/* Copyright (C) 1997, 1998, 2000, 2002, 2003, 2004 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1997. - -@@ -26,6 +27,7 @@ - #include - - #include -+#include - - #ifdef __NR_pread64 /* Newer kernels renamed but it's the same. */ - # ifdef __NR_pread -@@ -54,7 +56,7 @@ - if (SINGLE_THREAD_P) - { - /* First try the syscall. */ --#if (defined _ABIN32 && _MIPS_SIM == _ABIN32) || (defined _ABI64 && _MIPS_SIM == _ABI64) -+#if _MIPS_SIM == _MIPS_SIM_NABI32 || _MIPS_SIM == _MIPS_SIM_ABI64 - result = INLINE_SYSCALL (pread, 4, fd, CHECK_N (buf, count), count, - offset); - #else -@@ -73,7 +75,7 @@ - int oldtype = LIBC_CANCEL_ASYNC (); - - /* First try the syscall. */ --#if (defined _ABIN32 && _MIPS_SIM == _ABIN32) || (defined _ABI64 && _MIPS_SIM == _ABI64) -+#if _MIPS_SIM == _MIPS_SIM_NABI32 || _MIPS_SIM == _MIPS_SIM_ABI64 - result = INLINE_SYSCALL (pread, 4, fd, CHECK_N (buf, count), count, offset); - #else - result = INLINE_SYSCALL (pread, 6, fd, CHECK_N (buf, count), count, 0, ---- ./sysdeps/unix/sysv/linux/mips/ptrace.c 2003-09-03 05:21:27.000000000 +0200 -+++ ./sysdeps/unix/sysv/linux/mips/ptrace.c 2004-07-20 18:35:29.000000000 +0200 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1995, 1996, 1997, 1998, 2000, 2002, 2003 -+/* Copyright (C) 1995, 1996, 1997, 1998, 2000, 2002, 2003, 2004 - Free Software Foundation, Inc. - This file is part of the GNU C Library. - -@@ -26,8 +26,9 @@ - #include - #include - #include -+#include - --#if defined _ABIN32 && _MIPS_SIM == _ABIN32 -+#if _MIPS_SIM == _MIPS_SIM_NABI32 - __extension__ typedef long long int reg_type; - #else - typedef long int reg_type; ---- ./sysdeps/unix/sysv/linux/mips/pwrite.c 2003-09-11 01:38:52.000000000 +0200 -+++ ./sysdeps/unix/sysv/linux/mips/pwrite.c 2004-07-20 18:35:29.000000000 +0200 -@@ -1,4 +1,5 @@ --/* Copyright (C) 1997, 1998, 2000, 2002, 2003 Free Software Foundation, Inc. -+/* Copyright (C) 1997, 1998, 2000, 2002, 2003, 2004 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1997. - -@@ -27,6 +28,7 @@ - #include - - #include -+#include - - #ifdef __NR_pwrite64 /* Newer kernels renamed but it's the same. */ - # ifdef __NR_pwrite -@@ -51,14 +53,14 @@ - { - ssize_t result; - --#if (defined _ABI64 && _MIPS_SIM != _ABI64) -+#if _MIPS_SIM == _MIPS_SIM_ABI64 - assert (sizeof (offset) == 4); - #endif - - if (SINGLE_THREAD_P) - { - /* First try the syscall. */ --#if (defined _ABIN32 && _MIPS_SIM == _ABIN32) || (defined _ABI64 && _MIPS_SIM == _ABI64) -+#if _MIPS_SIM == _MIPS_SIM_NABI32 || _MIPS_SIM == _MIPS_SIM_ABI64 - result = INLINE_SYSCALL (pwrite, 4, fd, CHECK_N (buf, count), count, - offset); - #else -@@ -76,7 +78,7 @@ - int oldtype = LIBC_CANCEL_ASYNC (); - - /* First try the syscall. */ --#if (defined _ABIN32 && _MIPS_SIM == _ABIN32) || (defined _ABI64 && _MIPS_SIM == _ABI64) -+#if _MIPS_SIM == _MIPS_SIM_NABI32 || _MIPS_SIM == _MIPS_SIM_ABI64 - result = INLINE_SYSCALL (pwrite, 4, fd, CHECK_N (buf, count), count, offset); - #else - result = INLINE_SYSCALL (pwrite, 6, fd, CHECK_N (buf, count), count, 0, ---- ./sysdeps/unix/sysv/linux/mips/pwrite64.c 2003-09-11 01:38:52.000000000 +0200 -+++ ./sysdeps/unix/sysv/linux/mips/pwrite64.c 2004-07-20 18:35:29.000000000 +0200 -@@ -1,4 +1,5 @@ --/* Copyright (C) 1997, 1998, 2000, 2002, 2003 Free Software Foundation, Inc. -+/* Copyright (C) 1997, 1998, 2000, 2002, 2003, 2004 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ralf Baechle , 1998. - -@@ -53,7 +54,7 @@ - if (SINGLE_THREAD_P) - { - /* First try the syscall. */ --#if (defined _ABIN32 && _MIPS_SIM == _ABIN32) || (defined _ABI64 && _MIPS_SIM == _ABI64) -+#if _MIPS_SIM == _MIPS_SIM_NABI32 || _MIPS_SIM == _MIPS_SIM_ABI64 - result = INLINE_SYSCALL (pwrite, 4, fd, CHECK_N (buf, count), count, - offset); - #else -@@ -73,7 +74,7 @@ - int oldtype = LIBC_CANCEL_ASYNC (); - - /* First try the syscall. */ --#if (defined _ABIN32 && _MIPS_SIM == _ABIN32) || (defined _ABI64 && _MIPS_SIM == _ABI64) -+#if _MIPS_SIM == _MIPS_SIM_NABI32 || _MIPS_SIM == _MIPS_SIM_ABI64 - result = INLINE_SYSCALL (pwrite, 4, fd, CHECK_N (buf, count), count, offset); - #else - result = INLINE_SYSCALL (pwrite, 6, fd, CHECK_N (buf, count), count, 0, ---- ./sysdeps/unix/sysv/linux/mips/sigaction.c 2003-09-03 05:21:27.000000000 +0200 -+++ ./sysdeps/unix/sysv/linux/mips/sigaction.c 2004-07-20 18:35:29.000000000 +0200 -@@ -1,4 +1,5 @@ --/* Copyright (C) 1997,1998,1999,2000,2002,2003 Free Software Foundation, Inc. -+/* Copyright (C) 1997,1998,1999,2000,2002,2003, 2004 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -23,6 +24,8 @@ - #include - #include - -+#include -+ - #include "kernel-features.h" - - /* The difference here is that the sigaction structure used in the ---- ./sysdeps/unix/sysv/linux/mips/sigcontextinfo.h 2003-04-13 13:36:32.000000000 +0200 -+++ ./sysdeps/unix/sysv/linux/mips/sigcontextinfo.h 2004-07-20 18:35:29.000000000 +0200 -@@ -1,4 +1,4 @@ --/* Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc. -+/* Copyright (C) 2000, 2001, 2003, 2004 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Andreas Jaeger , 2000. - -@@ -18,6 +18,8 @@ - 02111-1307 USA. */ - - -+#include -+ - #if _MIPS_SIM == _MIPS_SIM_ABI32 - - #define SIGCONTEXT unsigned long _code, struct sigcontext * ---- ./sysdeps/unix/sysv/linux/mips/sys/procfs.h 2003-03-17 16:47:13.000000000 +0100 -+++ ./sysdeps/unix/sysv/linux/mips/sys/procfs.h 2004-07-20 18:35:28.000000000 +0200 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 -+/* Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004 - Free Software Foundation, Inc. - This file is part of the GNU C Library. - -@@ -28,12 +28,13 @@ - #include - #include - #include -+#include - - /* ELF register definitions */ - #define ELF_NGREG 45 - #define ELF_NFPREG 33 - --#if defined _ABIN32 && _MIPS_SIM == _ABIN32 -+#if _MIPS_SIM == _MIPS_SIM_NABI32 - __extension__ typedef unsigned long long elf_greg_t; - #else - typedef unsigned long elf_greg_t; -@@ -64,7 +65,7 @@ - { - struct elf_siginfo pr_info; /* Info associated with signal. */ - short int pr_cursig; /* Current signal. */ --#if defined _ABIN32 && _MIPS_SIM == _ABIN32 -+#if _MIPS_SIM == _MIPS_SIM_NABI32 - __extension__ unsigned long long int pr_sigpend; - __extension__ unsigned long long int pr_sighold; - #else -@@ -92,7 +93,7 @@ - char pr_sname; /* Char for pr_state. */ - char pr_zomb; /* Zombie. */ - char pr_nice; /* Nice val. */ --#if defined _ABIN32 && _MIPS_SIM == _ABIN32 -+#if _MIPS_SIM == _MIPS_SIM_NABI32 - __extension__ unsigned long long int pr_flag; - #else - unsigned long int pr_flag; /* Flags. */ ---- ./sysdeps/unix/sysv/linux/mips/sys/ptrace.h 2003-03-17 16:48:52.000000000 +0100 -+++ ./sysdeps/unix/sysv/linux/mips/sys/ptrace.h 2004-07-20 18:35:28.000000000 +0200 -@@ -1,5 +1,5 @@ - /* `ptrace' debugger support interface. Linux version. -- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003 -+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004 - Free Software Foundation, Inc. - This file is part of the GNU C Library. - -@@ -22,6 +22,7 @@ - #define _SYS_PTRACE_H 1 - - #include -+#include - - __BEGIN_DECLS - -@@ -123,7 +124,7 @@ - appear (those that are used for the particular request) as: - pid_t PID, void *ADDR, int DATA, void *ADDR2 - after REQUEST. */ --#if defined _ABIN32 && _MIPS_SIM == _ABIN32 -+#if _MIPS_SIM == _MIPS_SIM_NABI32 - __extension__ extern long long int ptrace - (enum __ptrace_request __request, ...) __THROW; - #else ---- ./sysdeps/unix/sysv/linux/mips/sys/tas.h 2003-03-14 08:03:36.000000000 +0100 -+++ ./sysdeps/unix/sysv/linux/mips/sys/tas.h 2004-07-20 18:35:28.000000000 +0200 -@@ -1,4 +1,4 @@ --/* Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. -+/* Copyright (C) 2000, 2002, 2003, 2004 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Maciej W. Rozycki , 2000. - -@@ -22,6 +22,8 @@ - - #include - -+#include -+ - __BEGIN_DECLS - - extern int _test_and_set (int *p, int v) __THROW; ---- ./sysdeps/unix/sysv/linux/mips/sys/ucontext.h 2003-05-01 01:22:09.000000000 +0200 -+++ ./sysdeps/unix/sysv/linux/mips/sys/ucontext.h 2004-07-20 18:35:28.000000000 +0200 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1997, 1998, 2000, 2003 Free Software Foundation, Inc. -+/* Copyright (C) 1997, 1998, 2000, 2003, 2004 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -28,6 +28,7 @@ - included in . */ - #include - -+#include - - /* Type for general register. Even in o32 we assume 64-bit registers, - like the kernel. */ ---- ./sysdeps/unix/sysv/linux/mips/sys/user.h 2003-04-13 13:36:32.000000000 +0200 -+++ ./sysdeps/unix/sysv/linux/mips/sys/user.h 2004-07-20 18:35:28.000000000 +0200 -@@ -1,4 +1,4 @@ --/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. -+/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -19,6 +19,8 @@ - #ifndef _SYS_USER_H - #define _SYS_USER_H 1 - -+#include -+ - /* The whole purpose of this file is for GDB and GDB only. Don't read - too much into it. Don't use it for anything other than GDB unless - you know what you are doing. */ ---- libc/sysdeps/mips/machine-gmon.h 2003/03/17 15:53:37 1.7 -+++ libc/sysdeps/mips/machine-gmon.h 2004/07/20 16:35:31 1.8 -@@ -18,6 +18,8 @@ - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -+#include -+ - #define _MCOUNT_DECL(frompc,selfpc) \ - static void __attribute_used__ __mcount (u_long frompc, u_long selfpc) - -@@ -81,10 +83,10 @@ - # define CPRETURN - #endif - --#if defined _ABIN32 && _MIPS_SIM == _ABIN32 -+#if _MIPS_SIM == _MIPS_SIM_NABI32 - # define PTR_ADDU_STRING "add" /* no u */ - # define PTR_SUBU_STRING "sub" /* no u */ --#elif defined _ABI64 && _MIPS_SIM == _ABI64 -+#elif _MIPS_SIM == _MIPS_SIM_ABI64 - # define PTR_ADDU_STRING "daddu" - # define PTR_SUBU_STRING "dsubu" - #else - ---- ./sysdeps/mips/atomicity.h.orig 2004-07-30 19:08:54.638252096 +0200 -+++ ./sysdeps/mips/atomicity.h 2004-07-30 19:10:20.967128112 +0200 -@@ -21,6 +21,7 @@ - #define _MIPS_ATOMICITY_H 1 - - #include -+#include - - static inline int - __attribute__ ((unused)) -@@ -85,7 +86,7 @@ - #if _MIPS_SIM == _MIPS_SIM_ABI32 - ".set mips2\n\t" - #endif --#if defined _ABI64 && _MIPS_SIM == _ABI64 -+#if _MIPS_SIM == _MIPS_SIM_ABI64 - "lld %1,%5\n\t" - #else - "ll %1,%5\n\t" -@@ -93,7 +94,7 @@ - "move %0,$0\n\t" - "bne %1,%3,2f\n\t" - "move %0,%4\n\t" --#if defined _ABI64 && _MIPS_SIM == _ABI64 -+#if _MIPS_SIM == _MIPS_SIM_ABI64 - "scd %0,%2\n\t" - #else - "sc %0,%2\n\t" ---- ./sysdeps/mips/dl-machine.h 2004/04/15 14:08:16 1.71 -+++ ./sysdeps/mips/dl-machine.h 2004/07/20 16:35:32 1.74 -@@ -130,7 +130,7 @@ - } - - /* The MSB of got[1] of a gnu object is set to identify gnu objects. */ --#if defined _ABI64 && _MIPS_SIM == _ABI64 -+#if _MIPS_SIM == _MIPS_SIM_ABI64 - # define ELF_MIPS_GNU_GOT1_MASK 0x8000000000000000L - #else - # define ELF_MIPS_GNU_GOT1_MASK 0x80000000L -@@ -254,7 +254,7 @@ - } - } - -- INTUSE (_dl_signal_error) (0, NULL, NULL, "cannot find runtime link map"); -+ _dl_signal_error (0, NULL, NULL, "cannot find runtime link map"); - return NULL; - } - -@@ -281,26 +281,30 @@ - - #else /* _MIPS_SIM == _MIPS_SIM_NABI32 || _MIPS_SIM == _MIPS_SIM_ABI64 */ - --#define ELF_DL_FRAME_SIZE 64 -+#define ELF_DL_FRAME_SIZE 80 - - #define ELF_DL_SAVE_ARG_REGS "\ -- sd $15, 56($29)\n \ -+ sd $15, 72($29)\n \ - sd $4, 8($29)\n \ - sd $5, 16($29)\n \ - sd $6, 24($29)\n \ - sd $7, 32($29)\n \ - sd $8, 40($29)\n \ - sd $9, 48($29)\n \ -+ sd $10, 56($29)\n \ -+ sd $11, 64($29)\n \ - " - - #define ELF_DL_RESTORE_ARG_REGS "\ -- ld $31, 56($29)\n \ -+ ld $31, 72($29)\n \ - ld $4, 8($29)\n \ - ld $5, 16($29)\n \ - ld $6, 24($29)\n \ - ld $7, 32($29)\n \ - ld $8, 40($29)\n \ - ld $9, 48($29)\n \ -+ ld $10, 56($29)\n \ -+ ld $11, 64($29)\n \ - " - - #define IFABIO32(X) -@@ -362,17 +366,17 @@ - \ - if (version->hash != 0) \ - { \ -- value = _dl_lookup_versioned_symbol(strtab + sym->st_name, l, \ -- &sym, l->l_scope, version,\ -- ELF_RTYPE_CLASS_PLT, 0); \ -+ value = _dl_lookup_symbol_x (strtab + sym->st_name, l, \ -+ &sym, l->l_scope, version, \ -+ ELF_RTYPE_CLASS_PLT, 0, 0); \ - break; \ - } \ - /* Fall through. */ \ - } \ - case 0: \ -- value = _dl_lookup_symbol (strtab + sym->st_name, l, &sym, \ -- l->l_scope, ELF_RTYPE_CLASS_PLT, \ -- DL_LOOKUP_ADD_DEPENDENCY); \ -+ value = _dl_lookup_symbol_x (strtab + sym->st_name, l, &sym, \ -+ l->l_scope, 0, ELF_RTYPE_CLASS_PLT, \ -+ DL_LOOKUP_ADD_DEPENDENCY, 0); \ - } \ - \ - /* Currently value contains the base load address of the object \ diff --git a/package/base/glibc/glibc23/regcomp-fixes-post233.patch b/package/base/glibc/glibc23/regcomp-fixes-post233.patch deleted file mode 100644 index 73e48def8..000000000 --- a/package/base/glibc/glibc23/regcomp-fixes-post233.patch +++ /dev/null @@ -1,148 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/glibc/glibc23/regcomp-fixes-post233.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./posix/regcomp.c 2003/12/16 06:10:51 1.68 -+++ ./posix/regcomp.c 2003/12/22 06:45:04 1.69 -@@ -1157,7 +1157,7 @@ - case OP_CLOSE_EQUIV_CLASS: - case OP_OPEN_CHAR_CLASS: - case OP_CLOSE_CHAR_CLASS: -- /* These must not be appeared here. */ -+ /* These must not appear here. */ - assert (0); - #endif - case END_OF_RE: -@@ -1336,8 +1336,6 @@ - if (BE (err != REG_NOERROR, 0)) - return err; - dfa->nexts[clone_node] = dfa->nexts[org_node]; -- if (clone_dest == -1) -- break; - ret = re_node_set_insert (dfa->edests + clone_node, clone_dest); - if (BE (ret < 0, 0)) - return REG_ESPACE; -@@ -1375,8 +1373,6 @@ - err = duplicate_node (&clone_dest, dfa, org_dest, constraint); - if (BE (err != REG_NOERROR, 0)) - return err; -- if (clone_dest == -1) -- break; - ret = re_node_set_insert (dfa->edests + clone_node, clone_dest); - if (BE (ret < 0, 0)) - return REG_ESPACE; -@@ -1395,16 +1391,13 @@ - err = duplicate_node (&clone_dest, dfa, org_dest, constraint); - if (BE (err != REG_NOERROR, 0)) - return err; -- if (clone_dest != -1) -- { -- ret = re_node_set_insert (dfa->edests + clone_node, clone_dest); -- if (BE (ret < 0, 0)) -- return REG_ESPACE; -- err = duplicate_node_closure (dfa, org_dest, clone_dest, -- root_node, constraint); -- if (BE (err != REG_NOERROR, 0)) -- return err; -- } -+ ret = re_node_set_insert (dfa->edests + clone_node, clone_dest); -+ if (BE (ret < 0, 0)) -+ return REG_ESPACE; -+ err = duplicate_node_closure (dfa, org_dest, clone_dest, -+ root_node, constraint); -+ if (BE (err != REG_NOERROR, 0)) -+ return err; - } - else - { -@@ -1419,8 +1412,6 @@ - err = duplicate_node (&clone_dest, dfa, org_dest, constraint); - if (BE (err != REG_NOERROR, 0)) - return err; -- if (clone_dest == -1) -- break; - ret = re_node_set_insert (dfa->edests + clone_node, clone_dest); - if (BE (ret < 0, 0)) - return REG_ESPACE; -@@ -1460,21 +1451,7 @@ - int *new_idx, org_idx; - unsigned int constraint; - { -- int dup_idx; -- -- if (dfa->nodes[org_idx].type == CHARACTER -- && (((constraint & NEXT_WORD_CONSTRAINT) -- && !dfa->nodes[org_idx].word_char) -- || ((constraint & NEXT_NOTWORD_CONSTRAINT) -- && dfa->nodes[org_idx].word_char))) -- { -- /* \W etc. can never match. Don't duplicate them, instead -- tell the caller they shouldn't be added to edests. */ -- *new_idx = -1; -- return REG_NOERROR; -- } -- -- dup_idx = re_dfa_add_node (dfa, dfa->nodes[org_idx], 1); -+ int dup_idx = re_dfa_add_node (dfa, dfa->nodes[org_idx], 1); - if (BE (dup_idx == -1, 0)) - return REG_ESPACE; - dfa->nodes[dup_idx].constraint = constraint; -@@ -2443,23 +2420,23 @@ - else - goto parse_dup_op_ebrace; - } -- if (BE (start == 0 && end == 0, 0)) -+ if (BE ((start == 0 && end == 0) || tree == NULL, 0)) - { -- /* We treat "{0}" and "{0,0}" as null string. */ -+ /* We treat "{0}" and "{0,0}" as null string. -+ Similarly "{0}{m,n}". */ - fetch_token (token, regexp, syntax); - return NULL; - } - - /* Extract "{n,m}" to "...{0,}". */ - elem = tree; -- for (i = 0; i < start; ++i) -- if (i != 0) -- { -- work_tree = duplicate_tree (elem, dfa); -- tree = create_tree (dfa, tree, work_tree, CONCAT, 0); -- if (BE (work_tree == NULL || tree == NULL, 0)) -- goto parse_dup_op_espace; -- } -+ for (i = 1; i < start; ++i) -+ { -+ work_tree = duplicate_tree (elem, dfa); -+ tree = create_tree (dfa, tree, work_tree, CONCAT, 0); -+ if (BE (work_tree == NULL || tree == NULL, 0)) -+ goto parse_dup_op_espace; -+ } - - if (end == -1) - { -@@ -2516,6 +2493,9 @@ - } - } - } -+ /* Treat "{0}*" etc. as "{0}". */ -+ else if (tree == NULL) -+ ; - else - { - tree = re_dfa_add_tree_node (dfa, tree, NULL, token); diff --git a/package/base/glibc/glibc23/sparc32-sysdeps-2004-05-15.patch b/package/base/glibc/glibc23/sparc32-sysdeps-2004-05-15.patch deleted file mode 100644 index dc203323f..000000000 --- a/package/base/glibc/glibc23/sparc32-sysdeps-2004-05-15.patch +++ /dev/null @@ -1,78 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/glibc/glibc23/sparc32-sysdeps-2004-05-15.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- libc/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h 2003/08/31 17:23:00 1.13 -+++ libc/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h 2004/05/17 18:42:44 1.14 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1997, 2002, 2003 Free Software Foundation, Inc. -+/* Copyright (C) 1997, 2002, 2003, 2004 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Miguel de Icaza , January 1997. - -@@ -70,18 +70,18 @@ - - #if RTLD_PRIVATE_ERRNO - # define SYSCALL_ERROR_HANDLER \ -- .section .gnu.linkonce.t.__sparc.get_pic.l7,"ax",@progbits; \ -- .globl __sparc.get_pic.l7; \ -- .hidden __sparc.get_pic.l7; \ -- .type __sparc.get_pic.l7,@function; \ --__sparc.get_pic.l7: \ -+ .section .gnu.linkonce.t.__sparc_get_pic_l7,"ax",@progbits; \ -+ .globl __sparc_get_pic_l7; \ -+ .hidden __sparc_get_pic_l7; \ -+ .type __sparc_get_pic_l7,@function; \ -+__sparc_get_pic_l7: \ - retl; \ - add %o7, %l7, %l7; \ - .previous; \ - SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler) \ - save %sp,-96,%sp; \ - sethi %hi(_GLOBAL_OFFSET_TABLE_-4), %l7; \ -- call __sparc.get_pic.l7; \ -+ call __sparc_get_pic_l7; \ - add %l7, %lo(_GLOBAL_OFFSET_TABLE_+4), %l7; \ - ld [%l7 + errno], %l0; \ - st %i0, [%l0]; \ -@@ -96,11 +96,11 @@ - # endif - # ifdef SHARED - # define SYSCALL_ERROR_HANDLER \ -- .section .gnu.linkonce.t.__sparc.get_pic.l7,"ax",@progbits; \ -- .globl __sparc.get_pic.l7; \ -- .hidden __sparc.get_pic.l7; \ -- .type __sparc.get_pic.l7,@function; \ --__sparc.get_pic.l7: \ -+ .section .gnu.linkonce.t.__sparc_get_pic_l7,"ax",@progbits; \ -+ .globl __sparc_get_pic_l7; \ -+ .hidden __sparc_get_pic_l7; \ -+ .type __sparc_get_pic_l7,@function; \ -+__sparc_get_pic_l7: \ - retl; \ - add %o7, %l7, %l7; \ - .previous; \ -@@ -108,7 +108,7 @@ - save %sp,-96,%sp; \ - sethi %tie_hi22(SYSCALL_ERROR_ERRNO), %l1; \ - sethi %hi(_GLOBAL_OFFSET_TABLE_-4), %l7; \ -- call __sparc.get_pic.l7; \ -+ call __sparc_get_pic_l7; \ - add %l7, %lo(_GLOBAL_OFFSET_TABLE_+4), %l7; \ - add %l1, %tie_lo10(SYSCALL_ERROR_ERRNO), %l1; \ - ld [%l7 + %l1], %l1, %tie_ld(SYSCALL_ERROR_ERRNO); \