diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-07-05 22:20:38 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-07-05 22:20:38 +0000 |
| commit | a2201fc6fc543c6a25563c84ce9e9b17cc127b2f (patch) | |
| tree | 3facb51235d58fe03358ccd64330621a912a0243 /src/patchsets/glibc/2.3.6 | |
| parent | Updating outdated list (diff) | |
| download | gentoo-a2201fc6fc543c6a25563c84ce9e9b17cc127b2f.tar.gz gentoo-a2201fc6fc543c6a25563c84ce9e9b17cc127b2f.tar.bz2 gentoo-a2201fc6fc543c6a25563c84ce9e9b17cc127b2f.zip | |
backport fixes from mainline
Diffstat (limited to 'src/patchsets/glibc/2.3.6')
| -rw-r--r-- | src/patchsets/glibc/2.3.6/6530_all_sparc-glibc-2.3.6-socket-no-weak-alias.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/src/patchsets/glibc/2.3.6/6530_all_sparc-glibc-2.3.6-socket-no-weak-alias.patch b/src/patchsets/glibc/2.3.6/6530_all_sparc-glibc-2.3.6-socket-no-weak-alias.patch new file mode 100644 index 0000000000..ad65036e3a --- /dev/null +++ b/src/patchsets/glibc/2.3.6/6530_all_sparc-glibc-2.3.6-socket-no-weak-alias.patch @@ -0,0 +1,60 @@ +2005-12-19 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/unix/sysv/linux/sparc/sparc32/socket.S: Handle NO_WEAK_ALIAS. + * sysdeps/unix/sysv/linux/sparc/sparc64/socket.S: Likewise. + Patch by Clint Adams. + +=================================================================== +RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/sparc/sparc32/socket.S,v +retrieving revision 1.10 +retrieving revision 1.11 +diff -u -r1.10 -r1.11 +--- libc/sysdeps/unix/sysv/linux/sparc/sparc32/socket.S 2003/08/31 17:23:11 1.10 ++++ libc/sysdeps/unix/sysv/linux/sparc/sparc32/socket.S 2005/12/20 06:25:23 1.11 +@@ -40,7 +40,11 @@ + The .S files for the other calls just #define socket and #include this. */ + + #ifndef __socket +-#define __socket P(__,socket) ++# ifndef NO_WEAK_ALIAS ++# define __socket P(__,socket) ++# else ++# define __socket socket ++# endif + #endif + + .globl __socket +@@ -105,4 +109,6 @@ + + END (__socket) + ++#ifndef NO_WEAK_ALIAS + weak_alias (__socket, socket) ++#endif +=================================================================== +RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/sparc/sparc64/socket.S,v +retrieving revision 1.4 +retrieving revision 1.5 +diff -u -r1.4 -r1.5 +--- libc/sysdeps/unix/sysv/linux/sparc/sparc64/socket.S 2004/12/16 16:47:49 1.4 ++++ libc/sysdeps/unix/sysv/linux/sparc/sparc64/socket.S 2005/12/20 06:25:24 1.5 +@@ -40,7 +40,11 @@ + The .S files for the other calls just #define socket and #include this. */ + + #ifndef __socket +-#define __socket P(__,socket) ++# ifndef NO_WEAK_ALIAS ++# define __socket P(__,socket) ++# else ++# define __socket socket ++# endif + #endif + + .globl __socket +@@ -107,4 +111,6 @@ + + END (__socket) + ++#ifndef NO_WEAK_ALIAS + weak_alias (__socket, socket) ++#endif |