From eb9aa42c10eccc39c3cb939c9f9dd70ed89991e4 Mon Sep 17 00:00:00 2001 From: Erik Hovland Date: Thu, 31 Aug 2006 21:10:49 +0000 Subject: Update of my earlier change to make it possible to compile glibc 2.3.5 with newer gcc compilers (4.0.2 and up). This commit changes the name of the files to weak instead of week. And updates the bb file respectfully. --- .../glibc/files/glibc-2.3.5-fix-weak-alias-arm-2.patch | 11 +++++++++++ packages/glibc/files/glibc-2.3.5-fix-weak-alias-arm.patch | 15 +++++++++++++++ .../glibc/files/glibc-2.3.5-fix-week-alias-arm-2.patch | 11 ----------- packages/glibc/files/glibc-2.3.5-fix-week-alias-arm.patch | 15 --------------- packages/glibc/glibc_2.3.5+cvs20050627.bb | 4 ++-- 5 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 packages/glibc/files/glibc-2.3.5-fix-weak-alias-arm-2.patch create mode 100644 packages/glibc/files/glibc-2.3.5-fix-weak-alias-arm.patch delete mode 100644 packages/glibc/files/glibc-2.3.5-fix-week-alias-arm-2.patch delete mode 100644 packages/glibc/files/glibc-2.3.5-fix-week-alias-arm.patch (limited to 'packages') diff --git a/packages/glibc/files/glibc-2.3.5-fix-weak-alias-arm-2.patch b/packages/glibc/files/glibc-2.3.5-fix-weak-alias-arm-2.patch new file mode 100644 index 0000000000..bf2f31e479 --- /dev/null +++ b/packages/glibc/files/glibc-2.3.5-fix-weak-alias-arm-2.patch @@ -0,0 +1,11 @@ +--- glibc-2.3.3/ports/sysdeps/unix/sysv/linux/arm/socket.S.orig 2006-07-12 14:38:22.208228359 -0700 ++++ glibc-2.3.3/ports/sysdeps/unix/sysv/linux/arm/socket.S 2006-07-12 14:39:56.911675066 -0700 +@@ -123,5 +123,7 @@ + #endif + + PSEUDO_END (__socket) +- ++ ++#ifndef NO_WEAK_ALIAS + weak_alias (__socket, socket) ++#endif diff --git a/packages/glibc/files/glibc-2.3.5-fix-weak-alias-arm.patch b/packages/glibc/files/glibc-2.3.5-fix-weak-alias-arm.patch new file mode 100644 index 0000000000..0097ff94d3 --- /dev/null +++ b/packages/glibc/files/glibc-2.3.5-fix-weak-alias-arm.patch @@ -0,0 +1,15 @@ +--- glibc-2.3.3/ports/sysdeps/unix/sysv/linux/arm/socket.S.orig 2006-07-12 13:57:05.990485563 -0700 ++++ glibc-2.3.3/ports/sysdeps/unix/sysv/linux/arm/socket.S 2006-07-12 13:58:41.197865230 -0700 +@@ -32,7 +32,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 + + #define PUSHARGS_1 str a1, [sp, $-4]! diff --git a/packages/glibc/files/glibc-2.3.5-fix-week-alias-arm-2.patch b/packages/glibc/files/glibc-2.3.5-fix-week-alias-arm-2.patch deleted file mode 100644 index bf2f31e479..0000000000 --- a/packages/glibc/files/glibc-2.3.5-fix-week-alias-arm-2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- glibc-2.3.3/ports/sysdeps/unix/sysv/linux/arm/socket.S.orig 2006-07-12 14:38:22.208228359 -0700 -+++ glibc-2.3.3/ports/sysdeps/unix/sysv/linux/arm/socket.S 2006-07-12 14:39:56.911675066 -0700 -@@ -123,5 +123,7 @@ - #endif - - PSEUDO_END (__socket) -- -+ -+#ifndef NO_WEAK_ALIAS - weak_alias (__socket, socket) -+#endif diff --git a/packages/glibc/files/glibc-2.3.5-fix-week-alias-arm.patch b/packages/glibc/files/glibc-2.3.5-fix-week-alias-arm.patch deleted file mode 100644 index 0097ff94d3..0000000000 --- a/packages/glibc/files/glibc-2.3.5-fix-week-alias-arm.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- glibc-2.3.3/ports/sysdeps/unix/sysv/linux/arm/socket.S.orig 2006-07-12 13:57:05.990485563 -0700 -+++ glibc-2.3.3/ports/sysdeps/unix/sysv/linux/arm/socket.S 2006-07-12 13:58:41.197865230 -0700 -@@ -32,7 +32,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 - - #define PUSHARGS_1 str a1, [sp, $-4]! diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index 31105c8adb..8943e1c565 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -56,8 +56,8 @@ SRC_URI = "http://familiar.handhelds.org/source/v0.8.3/stash_libc_sources.redhat file://5090_all_stubs-rule-fix.patch;patch=1 \ file://raise.patch;patch=1 \ file://zecke-sane-readelf.patch;patch=1 \ - file://glibc-2.3.3-fix-week-alias-arm.patch;patch=1 \ - file://glibc-2.3.3-fix-week-alias-arm-2.patch;patch=1 \ + file://glibc-2.3.5-fix-weak-alias-arm.patch;patch=1 \ + file://glibc-2.3.5-fix-weak-alias-arm-2.patch;patch=1 \ file://etc/ld.so.conf \ file://generate-supported.mk" -- cgit v1.2.3