diff options
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/glibc/Config.in | 4 | ||||
| -rw-r--r-- | toolchain/glibc/Config.version | 5 | ||||
| -rw-r--r-- | toolchain/glibc/common.mk | 2 | ||||
| -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 |
5 files changed, 76 insertions, 1 deletions
diff --git a/toolchain/glibc/Config.in b/toolchain/glibc/Config.in index 66ff2f4ff5..50e44c831d 100644 --- a/toolchain/glibc/Config.in +++ b/toolchain/glibc/Config.in @@ -13,6 +13,10 @@ choice bool "glibc 2.21" select GLIBC_VERSION_2_21 + config GLIBC_USE_VERSION_2_22 + bool "glibc 2.22" + select GLIBC_VERSION_2_22 + endchoice menu "eglibc configuration" diff --git a/toolchain/glibc/Config.version b/toolchain/glibc/Config.version index 2ac01d7d73..39066d0c30 100644 --- a/toolchain/glibc/Config.version +++ b/toolchain/glibc/Config.version @@ -4,6 +4,7 @@ config GLIBC_VERSION string default "2.19" if EGLIBC_VERSION_2_19 default "2.21" if GLIBC_VERSION_2_21 + default "2.22" if GLIBC_VERSION_2_22 config EGLIBC_VERSION_2_19 default y if !TOOLCHAINOPTS @@ -12,10 +13,14 @@ config EGLIBC_VERSION_2_19 config GLIBC_VERSION_2_21 bool +config GLIBC_VERSION_2_22 + bool + config GLIBC_REVISION string default "25243" if EGLIBC_VERSION_2_19 default "4e42b5b8f8" if GLIBC_VERSION_2_21 + default "78bd7499af" if GLIBC_VERSION_2_22 default "" endif diff --git a/toolchain/glibc/common.mk b/toolchain/glibc/common.mk index 7487ca2782..052050576a 100644 --- a/toolchain/glibc/common.mk +++ b/toolchain/glibc/common.mk @@ -97,7 +97,7 @@ endef define Host/Prepare $(call Host/Prepare/Default) ln -snf $(PKG_SOURCE_SUBDIR) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME) -ifeq ($(CONFIG_GLIBC_VERSION_2_21),) +ifeq ($(CONFIG_GLIBC_VERSION_2_21)$(CONFIG_GLIBC_VERSION_2_22),) $(SED) 's,y,n,' $(HOST_BUILD_DIR)/libc/option-groups.defaults endif endef 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) |