From 7c4a91b216aeea9e5cc5facfa13a12e2a023fe87 Mon Sep 17 00:00:00 2001
From: Imre Kaloz <kaloz@openwrt.org>
Date: Fri, 1 Jul 2011 08:10:12 +0000
Subject: [PATCH] upgrade the linaro gcc to 2011.06

SVN-Revision: 27326
---
 toolchain/gcc/common.mk                                   | 4 ++--
 .../patches/linaro/840-armv4_pass_fix-v4bx_to_ld.patch    | 2 +-
 toolchain/gcc/patches/linaro/850-use_shared_libgcc.patch  | 8 ++++----
 toolchain/gcc/patches/linaro/995-fa526.patch              | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk
index 1ef14a87ed..f0e22bf895 100644
--- a/toolchain/gcc/common.mk
+++ b/toolchain/gcc/common.mk
@@ -37,11 +37,11 @@ ifdef CONFIG_GCC_VERSION_LLVM
   HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(GCC_DIR)
 else
 ifeq ($(CONFIG_GCC_VERSION),"linaro")
-    PKG_REV:=4.5-2011.05-0
+    PKG_REV:=4.5-2011.06-0
     PKG_VERSION:=4.5.4
     PKG_SOURCE_URL:=http://launchpad.net/gcc-linaro/4.5/$(PKG_REV)/+download/
     PKG_SOURCE:=$(PKG_NAME)-linaro-$(PKG_REV).tar.bz2
-    PKG_MD5SUM:=7ec3e08bc39fe24f3c14006c003f5669
+    PKG_MD5SUM:=34562e19a3ea5baf05a2046c7da0a00b
     GCC_DIR:=gcc-linaro-$(PKG_REV)
     HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(GCC_DIR)
 else
diff --git a/toolchain/gcc/patches/linaro/840-armv4_pass_fix-v4bx_to_ld.patch b/toolchain/gcc/patches/linaro/840-armv4_pass_fix-v4bx_to_ld.patch
index 7966936840..41b790a22d 100644
--- a/toolchain/gcc/patches/linaro/840-armv4_pass_fix-v4bx_to_ld.patch
+++ b/toolchain/gcc/patches/linaro/840-armv4_pass_fix-v4bx_to_ld.patch
@@ -15,6 +15,6 @@
    LINUX_OR_ANDROID_LD (LINUX_TARGET_LINK_SPEC,				\
 -		       LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC)
 +		       LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC)	\
-
+ 
  #undef  CC1_SPEC
  #define CC1_SPEC						\
diff --git a/toolchain/gcc/patches/linaro/850-use_shared_libgcc.patch b/toolchain/gcc/patches/linaro/850-use_shared_libgcc.patch
index ce54731de2..902edf58b0 100644
--- a/toolchain/gcc/patches/linaro/850-use_shared_libgcc.patch
+++ b/toolchain/gcc/patches/linaro/850-use_shared_libgcc.patch
@@ -3,7 +3,7 @@
 @@ -95,10 +95,6 @@
  #define ENDFILE_SPEC \
    LINUX_OR_ANDROID_LD (LINUX_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
-
+ 
 -/* Use the default LIBGCC_SPEC, not the version in linux-elf.h, as we
 -   do not use -lfloat.  */
 -#undef LIBGCC_SPEC
@@ -24,7 +24,7 @@
  #define LINUX_TARGET_LINK_SPEC  "%{h*} %{version:-v} \
 --- a/gcc/config/linux.h
 +++ b/gcc/config/linux.h
-@@ -116,6 +116,10 @@
+@@ -116,6 +116,10 @@ see the files COPYING3 and COPYING.RUNTI
  #define USE_LD_AS_NEEDED 1
  #endif
  
@@ -37,7 +37,7 @@
     -muclibc or -mglibc or -mbionic has been passed to change the default.  */
 --- a/gcc/mkmap-symver.awk
 +++ b/gcc/mkmap-symver.awk
-@@ -132,5 +132,5 @@
+@@ -132,5 +132,5 @@ function output(lib) {
    else if (inherit[lib])
      printf("} %s;\n", inherit[lib]);
    else
@@ -46,7 +46,7 @@
  }
 --- a/libgcc/Makefile.in
 +++ b/libgcc/Makefile.in
-@@ -265,7 +265,7 @@
+@@ -265,7 +265,7 @@ ifeq ($(enable_shared),yes)
  # For -fvisibility=hidden.  We need both a -fvisibility=hidden on
  # the command line, and a #define to prevent libgcc2.h etc from
  # overriding that with #pragmas.
diff --git a/toolchain/gcc/patches/linaro/995-fa526.patch b/toolchain/gcc/patches/linaro/995-fa526.patch
index bffe4d3a0f..700bb4a903 100644
--- a/toolchain/gcc/patches/linaro/995-fa526.patch
+++ b/toolchain/gcc/patches/linaro/995-fa526.patch
@@ -214,7 +214,7 @@
 +
 --- a/gcc/config/arm/t-arm
 +++ b/gcc/config/arm/t-arm
-@@ -23,6 +23,7 @@ MD_INCLUDES= 	$(srcdir)/config/arm/arm-t
+@@ -23,6 +23,7 @@ MD_INCLUDES=	$(srcdir)/config/arm/arm-tu
  		$(srcdir)/config/arm/arm-generic.md       	\
  	 	$(srcdir)/config/arm/arm1020e.md          	\
  	 	$(srcdir)/config/arm/arm1026ejs.md        	\