diff options
| author | Erik Hovland <erik@hovland.org> | 2006-08-22 20:16:18 +0000 |
|---|---|---|
| committer | Erik Hovland <erik@hovland.org> | 2006-08-22 20:16:18 +0000 |
| commit | ff49b42aedb3c09f71cb35456140b9afcf6b40b8 (patch) | |
| tree | 8d9b9b1cf97af4ccb5d06964477056e4d51fb938 /packages/glibc | |
| parent | 92415076b9a7601cec26eea72f9a6b6ac2ee848f (diff) | |
| parent | 469410c81b3d651f54cbf399de4e8e8f139922f7 (diff) | |
merge of '7bf39cf992a3dbe062066db3100333fa62967447'
and 'd31705a022a5624d8e85880ced6f1e90daa6d840'
Diffstat (limited to 'packages/glibc')
| -rw-r--r-- | packages/glibc/files/glibc-2.3.5-fix-week-alias-arm-2.patch | 11 | ||||
| -rw-r--r-- | packages/glibc/files/glibc-2.3.5-fix-week-alias-arm.patch | 15 | ||||
| -rw-r--r-- | packages/glibc/glibc_2.3.5+cvs20050627.bb | 4 |
3 files changed, 29 insertions, 1 deletions
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 new file mode 100644 index 0000000000..bf2f31e479 --- /dev/null +++ b/packages/glibc/files/glibc-2.3.5-fix-week-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-week-alias-arm.patch b/packages/glibc/files/glibc-2.3.5-fix-week-alias-arm.patch new file mode 100644 index 0000000000..0097ff94d3 --- /dev/null +++ b/packages/glibc/files/glibc-2.3.5-fix-week-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/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index 87e8ee40e2..31105c8adb 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -55,7 +55,9 @@ SRC_URI = "http://familiar.handhelds.org/source/v0.8.3/stash_libc_sources.redhat file://ldsocache-varrun.patch;patch=1 \ file://5090_all_stubs-rule-fix.patch;patch=1 \ file://raise.patch;patch=1 \ - file://zecke-sane-readelf.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://etc/ld.so.conf \ file://generate-supported.mk" |