diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-01-19 22:58:51 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-19 22:58:51 +0000 |
| commit | f6e4badfe4146c732fd3a1529cf6b1b270ea6ea3 (patch) | |
| tree | ed6edd9eb60964e1ab0eb874e7f71bc95c2a04b6 /toolchain/glibc/patches/2.22 | |
| parent | 7c2356e2a011efbc146bd20b8136a06ea0000620 (diff) | |
| download | upstream-f6e4badfe4146c732fd3a1529cf6b1b270ea6ea3.tar.gz upstream-f6e4badfe4146c732fd3a1529cf6b1b270ea6ea3.tar.bz2 upstream-f6e4badfe4146c732fd3a1529cf6b1b270ea6ea3.zip | |
toolchain: Add glibc 2.22
Signed-off-by: Michael Marley <michael@michaelmarley.com>
SVN-Revision: 48383
Diffstat (limited to 'toolchain/glibc/patches/2.22')
| -rw-r--r-- | toolchain/glibc/patches/2.22/100-fix_cross_rpcgen.patch | 52 | ||||
| -rw-r--r-- | toolchain/glibc/patches/2.22/200-add-dl-search-paths.patch | 14 |
2 files changed, 66 insertions, 0 deletions
diff --git a/toolchain/glibc/patches/2.22/100-fix_cross_rpcgen.patch b/toolchain/glibc/patches/2.22/100-fix_cross_rpcgen.patch new file mode 100644 index 0000000000..6a5e537b77 --- /dev/null +++ b/toolchain/glibc/patches/2.22/100-fix_cross_rpcgen.patch @@ -0,0 +1,52 @@ +--- a/sunrpc/rpc/types.h ++++ b/sunrpc/rpc/types.h +@@ -75,18 +75,23 @@ typedef unsigned long rpcport_t; + #endif + + #ifndef __u_char_defined +-typedef __u_char u_char; +-typedef __u_short u_short; +-typedef __u_int u_int; +-typedef __u_long u_long; +-typedef __quad_t quad_t; +-typedef __u_quad_t u_quad_t; +-typedef __fsid_t fsid_t; ++typedef unsigned char u_char; ++typedef unsigned short u_short; ++typedef unsigned int u_int; ++typedef unsigned long u_long; ++#if __WORDSIZE == 64 ++typedef long int quad_t; ++typedef unsigned long int u_quad_t; ++#elif defined __GLIBC_HAVE_LONG_LONG ++typedef long long int quad_t; ++typedef unsigned long long int u_quad_t; ++#endif ++typedef u_quad_t fsid_t; + # define __u_char_defined + #endif +-#ifndef __daddr_t_defined +-typedef __daddr_t daddr_t; +-typedef __caddr_t caddr_t; ++#if !defined(__daddr_t_defined) && defined(linux) ++typedef long int daddr_t; ++typedef char *caddr_t; + # define __daddr_t_defined + #endif + +--- a/sunrpc/rpc_main.c ++++ b/sunrpc/rpc_main.c +@@ -958,9 +958,10 @@ mkfile_output (struct commandline *cmd) + abort (); + temp = rindex (cmd->infile, '.'); + cp = stpcpy (mkfilename, "Makefile."); +- if (temp != NULL) +- *((char *) stpncpy (cp, cmd->infile, temp - cmd->infile)) = '\0'; +- else ++ if (temp != NULL) { ++ strncpy(cp, cmd->infile, temp - cmd->infile); ++ cp[temp - cmd->infile - 1] = 0; ++ } else + stpcpy (cp, cmd->infile); + + } diff --git a/toolchain/glibc/patches/2.22/200-add-dl-search-paths.patch b/toolchain/glibc/patches/2.22/200-add-dl-search-paths.patch new file mode 100644 index 0000000000..a6200f783b --- /dev/null +++ b/toolchain/glibc/patches/2.22/200-add-dl-search-paths.patch @@ -0,0 +1,14 @@ +add /usr/lib to default search path for the dynamic linker + +--- a/Makeconfig ++++ b/Makeconfig +@@ -501,6 +501,9 @@ else + default-rpath = $(libdir) + endif + ++# Add /usr/lib to default search path for the dynamic linker ++user-defined-trusted-dirs := /usr/lib ++ + ifndef link-extra-libs + link-extra-libs = $(LDLIBS-$(@F)) + link-extra-libs-static = $(link-extra-libs) |