From b0857d40f503a29f7cf1dd9bfab3f60e6b0152f6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 12 Aug 2013 16:27:02 +0200 Subject: update glibc to latest upstream --- toolchain/glibc/Makefile | 8 ++------ toolchain/glibc/Makefile.inc | 5 +++-- toolchain/glibc/patches/gcc_eh.patch | 18 ----------------- toolchain/glibc/patches/glibc-cross.patch | 32 ++++++++++--------------------- 4 files changed, 15 insertions(+), 48 deletions(-) delete mode 100644 toolchain/glibc/patches/gcc_eh.patch (limited to 'toolchain/glibc') diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index 98a01d9c8..f8f0080fc 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -34,8 +34,6 @@ ifeq ($(ADK_TARGET_WITH_MULTILIB),y) $(WRKBUILD)/.headers_configure: for abi in $(TABI); do \ mkdir -p $(GLIBC_BUILD_DIR_INITIAL)-$${abi/*:/}; \ - (cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION); \ - ln -sf ../../w-glibc-ports-$(PKG_VERSION)-1/glibc-ports-$(PKG_VERSION)/ ports); \ (cd $(GLIBC_BUILD_DIR_INITIAL)-$${abi/*:/}; \ ${GLIBC_ENV} \ CC="${REAL_GNU_TARGET_NAME}-gcc -m$${abi/*:/}" \ @@ -60,8 +58,6 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure else $(WRKBUILD)/.headers_configure: mkdir -p $(GLIBC_BUILD_DIR_INITIAL) - (cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION); \ - ln -sf ../../w-glibc-ports-$(PKG_VERSION)-1/glibc-ports-$(PKG_VERSION)/ ports); (cd $(GLIBC_BUILD_DIR_INITIAL); \ ${GLIBC_ENV} \ $(WRKBUILD)/configure \ @@ -77,7 +73,7 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure $(MAKE) ${GLIBC_MAKEOPTS} install-headers \ ); touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h - touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64}.h + touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64,soft,hard}.h touch $@ endif @@ -111,7 +107,7 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled # default libgcc searching for 64 bit libraries ${GLIBC_ENV} $(MAKE) -C $(GLIBC_BUILD_DIR_FINAL)-64 install_root=$(STAGING_TARGET_DIR) install touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h - touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64}.h + touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64,soft,hard}.h for abi in $(TABI); do \ mkdir -p $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2/$${abi/*:/} ; \ $(CP) $(STAGING_TARGET_DIR)-$${abi/*:/}/lib/* $(STAGING_TARGET_DIR)-$${abi/*:/}/usr/lib/* \ diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc index 0d37ef3e5..2232e9bb2 100644 --- a/toolchain/glibc/Makefile.inc +++ b/toolchain/glibc/Makefile.inc @@ -2,9 +2,9 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= glibc -PKG_VERSION:= 2.16.0 +PKG_VERSION:= 2.17 PKG_RELEASE:= 1 -PKG_MD5SUM:= b5f786fa7df4ff947bcd240c0e595f98 +PKG_MD5SUM:= 8a7f11b9ac5d0d5efa4c82175b5a9c1b PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ --host=$(REAL_GNU_TARGET_NAME) \ @@ -15,6 +15,7 @@ GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ --disable-profile \ --disable-debug \ --without-gd \ + --disable-nscd \ --with-__thread \ --with-tls \ --enable-kernel="2.6.0" \ diff --git a/toolchain/glibc/patches/gcc_eh.patch b/toolchain/glibc/patches/gcc_eh.patch deleted file mode 100644 index 8c5f2a0bd..000000000 --- a/toolchain/glibc/patches/gcc_eh.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Nur glibc-2.16.0.orig/Makeconfig glibc-2.16.0/Makeconfig ---- glibc-2.16.0.orig/Makeconfig 2012-06-30 21:12:34.000000000 +0200 -+++ glibc-2.16.0/Makeconfig 2012-09-28 20:11:14.000000000 +0200 -@@ -519,11 +519,11 @@ - ifneq ($(have-cc-with-libunwind),yes) - libunwind = - else -- libunwind = -lunwind -+ libunwind = - endif --libgcc_eh := -Wl,--as-needed -lgcc_s $(libunwind) -Wl,--no-as-needed -+libgcc_eh := -Wl,--as-needed $(libunwind) -Wl,--no-as-needed - gnulib := -lgcc $(libgcc_eh) --static-gnulib := -lgcc -lgcc_eh $(libunwind) -+static-gnulib := -lgcc $(libunwind) - libc.so-gnulib := -lgcc - endif - +preinit = $(addprefix $(csu-objpfx),crti.o) diff --git a/toolchain/glibc/patches/glibc-cross.patch b/toolchain/glibc/patches/glibc-cross.patch index f8e0c2416..dadd8641b 100644 --- a/toolchain/glibc/patches/glibc-cross.patch +++ b/toolchain/glibc/patches/glibc-cross.patch @@ -1,6 +1,6 @@ -diff -Nur glibc-2.16.0.orig/sunrpc/rpc/types.h glibc-2.16.0/sunrpc/rpc/types.h ---- glibc-2.16.0.orig/sunrpc/rpc/types.h 2012-06-30 21:12:34.000000000 +0200 -+++ glibc-2.16.0/sunrpc/rpc/types.h 2012-08-01 18:05:49.000000000 +0200 +diff -Nur glibc-2.17.orig/sunrpc/rpc/types.h glibc-2.17/sunrpc/rpc/types.h +--- glibc-2.17.orig/sunrpc/rpc/types.h 2012-12-25 04:02:13.000000000 +0100 ++++ glibc-2.17/sunrpc/rpc/types.h 2013-08-12 14:59:35.000000000 +0200 @@ -69,19 +69,25 @@ #include #endif @@ -39,21 +39,9 @@ diff -Nur glibc-2.16.0.orig/sunrpc/rpc/types.h glibc-2.16.0/sunrpc/rpc/types.h # define __daddr_t_defined #endif -diff -Nur glibc-2.16.0.orig/sunrpc/rpc_clntout.c glibc-2.16.0/sunrpc/rpc_clntout.c ---- glibc-2.16.0.orig/sunrpc/rpc_clntout.c 2012-06-30 21:12:34.000000000 +0200 -+++ glibc-2.16.0/sunrpc/rpc_clntout.c 2012-08-01 18:05:49.000000000 +0200 -@@ -31,7 +31,7 @@ - */ - #include - #include --#include -+#include "rpc/types.h" - #include "rpc_parse.h" - #include "rpc_util.h" - #include "proto.h" -diff -Nur glibc-2.16.0.orig/sunrpc/rpc_main.c glibc-2.16.0/sunrpc/rpc_main.c ---- glibc-2.16.0.orig/sunrpc/rpc_main.c 2012-06-30 21:12:34.000000000 +0200 -+++ glibc-2.16.0/sunrpc/rpc_main.c 2012-08-01 18:05:49.000000000 +0200 +diff -Nur glibc-2.17.orig/sunrpc/rpc_main.c glibc-2.17/sunrpc/rpc_main.c +--- glibc-2.17.orig/sunrpc/rpc_main.c 2012-12-25 04:02:13.000000000 +0100 ++++ glibc-2.17/sunrpc/rpc_main.c 2013-08-12 14:59:37.000000000 +0200 @@ -38,7 +38,11 @@ #include #include @@ -66,7 +54,7 @@ diff -Nur glibc-2.16.0.orig/sunrpc/rpc_main.c glibc-2.16.0/sunrpc/rpc_main.c #include #include #include -@@ -958,10 +962,12 @@ +@@ -954,10 +958,12 @@ abort (); temp = rindex (cmd->infile, '.'); cp = stpcpy (mkfilename, "Makefile."); @@ -82,9 +70,9 @@ diff -Nur glibc-2.16.0.orig/sunrpc/rpc_main.c glibc-2.16.0/sunrpc/rpc_main.c } else -diff -Nur glibc-2.16.0.orig/sunrpc/rpc_scan.c glibc-2.16.0/sunrpc/rpc_scan.c ---- glibc-2.16.0.orig/sunrpc/rpc_scan.c 2012-06-30 21:12:34.000000000 +0200 -+++ glibc-2.16.0/sunrpc/rpc_scan.c 2012-08-01 18:05:49.000000000 +0200 +diff -Nur glibc-2.17.orig/sunrpc/rpc_scan.c glibc-2.17/sunrpc/rpc_scan.c +--- glibc-2.17.orig/sunrpc/rpc_scan.c 2012-12-25 04:02:13.000000000 +0100 ++++ glibc-2.17/sunrpc/rpc_scan.c 2013-08-12 14:59:37.000000000 +0200 @@ -37,7 +37,11 @@ #include #include -- cgit v1.2.3