From dc3b8be5df2f3bcc595fc46f88c26461a42d14b6 Mon Sep 17 00:00:00 2001 From: kaloz Date: Wed, 11 Sep 2013 13:19:43 +0000 Subject: [PATCH] [toolchain/gcc]: upgrade Linaro gcc 4.8 to 4.8-2013.08 Signed-off-by: Imre Kaloz git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37945 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- toolchain/gcc/common.mk | 8 ++++---- toolchain/gcc/patches/4.8-linaro/200-musl.patch | 18 +++++++++--------- .../gcc/patches/4.8-linaro/850-use_shared_libgcc.patch | 2 +- .../gcc/patches/4.8-linaro/870-ppc_no_crtsavres.patch | 2 +- toolchain/gcc/patches/4.8-linaro/910-mbsd_multi.patch | 4 ++-- .../patches/4.8-linaro/920-specs_nonfatal_getenv.patch | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk index 9544133bde..b0470786eb 100644 --- a/toolchain/gcc/common.mk +++ b/toolchain/gcc/common.mk @@ -33,13 +33,13 @@ ifeq ($(findstring linaro, $(CONFIG_GCC_VERSION)),linaro) PKG_MD5SUM:=6b6c6a4faa026edd1193cf6426309039 endif ifeq ($(CONFIG_GCC_VERSION),"4.8-linaro") - PKG_REV:=4.8-2013.04 - PKG_VERSION:=4.8.1 + PKG_REV:=4.8-2013.08 + PKG_VERSION:=4.8.2 PKG_VERSION_MAJOR:=4.8 - PKG_MD5SUM:=b6b8195019c7cb93629727ad14eaf7ca + PKG_MD5SUM:=668e0f4250e35aff554b66accc9a3105 endif PKG_SOURCE_URL:=http://launchpad.net/gcc-linaro/$(PKG_VERSION_MAJOR)/$(PKG_REV)/+download/ - PKG_SOURCE:=$(PKG_NAME)-linaro-$(PKG_REV).tar.bz2 + PKG_SOURCE:=$(PKG_NAME)-linaro-$(PKG_REV).tar.xz GCC_DIR:=gcc-linaro-$(PKG_REV) HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(GCC_DIR) else diff --git a/toolchain/gcc/patches/4.8-linaro/200-musl.patch b/toolchain/gcc/patches/4.8-linaro/200-musl.patch index 951464d2de..3fe5a7eba2 100644 --- a/toolchain/gcc/patches/4.8-linaro/200-musl.patch +++ b/toolchain/gcc/patches/4.8-linaro/200-musl.patch @@ -1,6 +1,6 @@ --- a/gcc/config.gcc +++ b/gcc/config.gcc -@@ -549,7 +549,7 @@ case ${target} in +@@ -550,7 +550,7 @@ case ${target} in esac # Common C libraries. @@ -9,7 +9,7 @@ # Common parts for widely ported systems. case ${target} in -@@ -652,6 +652,9 @@ case ${target} in +@@ -653,6 +653,9 @@ case ${target} in *-*-*uclibc*) tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC" ;; @@ -34,7 +34,7 @@ #undef LINK_SPEC --- a/gcc/config/i386/linux.h +++ b/gcc/config/i386/linux.h -@@ -21,3 +21,4 @@ along with GCC; see the file COPYING3. +@@ -21,3 +21,4 @@ along with GCC; see the file COPYING3. #define GNU_USER_LINK_EMULATION "elf_i386" #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" @@ -127,7 +127,7 @@ +Use musl C library --- a/gcc/config/mips/linux.h +++ b/gcc/config/mips/linux.h -@@ -18,3 +18,5 @@ along with GCC; see the file COPYING3. +@@ -18,3 +18,5 @@ along with GCC; see the file COPYING3. . */ #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" @@ -135,7 +135,7 @@ +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips.so.1" --- a/gcc/config/rs6000/linux64.h +++ b/gcc/config/rs6000/linux64.h -@@ -364,17 +364,21 @@ extern int dot_symbols; +@@ -354,17 +354,21 @@ extern int dot_symbols; #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1" #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" @@ -159,11 +159,11 @@ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) - - #define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ + #undef DEFAULT_ASM_ENDIAN + #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN) --- a/gcc/config/rs6000/sysv4.h +++ b/gcc/config/rs6000/sysv4.h -@@ -789,15 +789,18 @@ extern int fixuplabelno; +@@ -778,15 +778,18 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" @@ -295,7 +295,7 @@ ;; --- a/gcc/config/mips/linux64.h +++ b/gcc/config/mips/linux64.h -@@ -27,6 +27,9 @@ along with GCC; see the file COPYING3. +@@ -27,6 +27,9 @@ along with GCC; see the file COPYING3. #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" diff --git a/toolchain/gcc/patches/4.8-linaro/850-use_shared_libgcc.patch b/toolchain/gcc/patches/4.8-linaro/850-use_shared_libgcc.patch index 4a77b86c17..ee3f602731 100644 --- a/toolchain/gcc/patches/4.8-linaro/850-use_shared_libgcc.patch +++ b/toolchain/gcc/patches/4.8-linaro/850-use_shared_libgcc.patch @@ -1,6 +1,6 @@ --- a/gcc/config/arm/linux-eabi.h +++ b/gcc/config/arm/linux-eabi.h -@@ -114,10 +114,6 @@ +@@ -118,10 +118,6 @@ #define ENDFILE_SPEC \ LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC) diff --git a/toolchain/gcc/patches/4.8-linaro/870-ppc_no_crtsavres.patch b/toolchain/gcc/patches/4.8-linaro/870-ppc_no_crtsavres.patch index d8c460a92d..14e4fbdce9 100644 --- a/toolchain/gcc/patches/4.8-linaro/870-ppc_no_crtsavres.patch +++ b/toolchain/gcc/patches/4.8-linaro/870-ppc_no_crtsavres.patch @@ -1,6 +1,6 @@ --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c -@@ -17653,7 +17653,7 @@ rs6000_savres_strategy (rs6000_stack_t * +@@ -17664,7 +17664,7 @@ rs6000_savres_strategy (rs6000_stack_t * /* Define cutoff for using out-of-line functions to save registers. */ if (DEFAULT_ABI == ABI_V4 || TARGET_ELF) { diff --git a/toolchain/gcc/patches/4.8-linaro/910-mbsd_multi.patch b/toolchain/gcc/patches/4.8-linaro/910-mbsd_multi.patch index 3b37a3f8fe..eb9a7c6c75 100644 --- a/toolchain/gcc/patches/4.8-linaro/910-mbsd_multi.patch +++ b/toolchain/gcc/patches/4.8-linaro/910-mbsd_multi.patch @@ -209,7 +209,7 @@ -Wfatal-errors -Wfloat-equal -Wformat -Wformat=2 @gol -Wno-format-contains-nul -Wno-format-extra-args -Wformat-nonliteral @gol -Wformat-security -Wformat-y2k @gol -@@ -4808,6 +4808,22 @@ This option is only supported for C and +@@ -4809,6 +4809,22 @@ This option is only supported for C and @option{-Wall} and by @option{-Wpedantic}, which can be disabled with @option{-Wno-pointer-sign}. @@ -232,7 +232,7 @@ @item -Wstack-protector @opindex Wstack-protector @opindex Wno-stack-protector -@@ -6919,7 +6935,7 @@ so, the first branch is redirected to ei +@@ -6920,7 +6936,7 @@ so, the first branch is redirected to ei second branch or a point immediately following it, depending on whether the condition is known to be true or false. diff --git a/toolchain/gcc/patches/4.8-linaro/920-specs_nonfatal_getenv.patch b/toolchain/gcc/patches/4.8-linaro/920-specs_nonfatal_getenv.patch index 4baa966930..8698eda5f2 100644 --- a/toolchain/gcc/patches/4.8-linaro/920-specs_nonfatal_getenv.patch +++ b/toolchain/gcc/patches/4.8-linaro/920-specs_nonfatal_getenv.patch @@ -1,6 +1,6 @@ --- a/gcc/gcc.c +++ b/gcc/gcc.c -@@ -8003,7 +8003,10 @@ getenv_spec_function (int argc, const ch +@@ -8004,7 +8004,10 @@ getenv_spec_function (int argc, const ch value = getenv (argv[0]); if (!value) -- 2.11.0