From e0d69c64ffbc444f8222a2e2041956bb8a013432 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Fri, 28 Sep 2012 20:22:08 +0200
Subject: update gcc to latest upstream version

---
 package/gcc/Makefile               |   1 +
 package/gcc/patches/no-lib64.patch | 102 +++++++++++++++++--------------------
 package/gcc/patches/sdt.patch      |  14 +++++
 3 files changed, 62 insertions(+), 55 deletions(-)
 create mode 100644 package/gcc/patches/sdt.patch

(limited to 'package')

diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index e0dd34e84..e73a890bc 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -26,6 +26,7 @@ ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
 CONFIGURE_ARGS+=       --with-abi=$(ADK_TARGET_ABI)
 endif
 
+CONFIGURE_ENV+=		have_sys_sdt_h=no
 CONFIGURE_ARGS+=	--enable-languages=c,c++ \
 			--host=$(REAL_GNU_TARGET_NAME) \
 			--target=$(REAL_GNU_TARGET_NAME) \
diff --git a/package/gcc/patches/no-lib64.patch b/package/gcc/patches/no-lib64.patch
index 8722018ea..c567a4bec 100644
--- a/package/gcc/patches/no-lib64.patch
+++ b/package/gcc/patches/no-lib64.patch
@@ -1,32 +1,32 @@
-diff -Nur gcc-4.6.3.orig/gcc/config/i386/linux64.h gcc-4.6.3/gcc/config/i386/linux64.h
---- gcc-4.6.3.orig/gcc/config/i386/linux64.h	2011-09-08 11:12:35.000000000 +0200
-+++ gcc-4.6.3/gcc/config/i386/linux64.h	2012-03-21 13:30:49.125903065 +0100
-@@ -63,7 +63,7 @@
-    done.  */
+diff -Nur gcc-4.7.2.orig/gcc/config/i386/linux64.h gcc-4.7.2/gcc/config/i386/linux64.h
+--- gcc-4.7.2.orig/gcc/config/i386/linux64.h	2011-07-07 17:38:34.000000000 +0200
++++ gcc-4.7.2/gcc/config/i386/linux64.h	2012-09-22 12:48:17.000000000 +0200
+@@ -29,5 +29,5 @@
+ #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
  
  #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
 -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
+-#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
 +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- 
- #if TARGET_64BIT_DEFAULT
- #define SPEC_32 "m32"
-diff -Nur gcc-4.6.3.orig/gcc/config/i386/t-linux64 gcc-4.6.3/gcc/config/i386/t-linux64
---- gcc-4.6.3.orig/gcc/config/i386/t-linux64	2009-04-21 21:03:23.000000000 +0200
-+++ gcc-4.6.3/gcc/config/i386/t-linux64	2012-03-21 13:30:49.125903065 +0100
-@@ -25,7 +25,7 @@
- 
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32 
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
-diff -Nur gcc-4.6.3.orig/gcc/config/mips/linux64.h gcc-4.6.3/gcc/config/mips/linux64.h
---- gcc-4.6.3.orig/gcc/config/mips/linux64.h	2011-01-19 21:39:09.000000000 +0100
-+++ gcc-4.6.3/gcc/config/mips/linux64.h	2012-03-21 13:31:26.549903066 +0100
-@@ -36,9 +36,9 @@
-   %{profile:-lc_p} %{!profile:-lc}}"
++#define GLIBC_DYNAMIC_LINKERX32 "/lib/ld-linux-so.2"
+diff -Nur gcc-4.7.2.orig/gcc/config/i386/t-linux64 gcc-4.7.2/gcc/config/i386/t-linux64
+--- gcc-4.7.2.orig/gcc/config/i386/t-linux64	2011-11-02 16:23:48.000000000 +0100
++++ gcc-4.7.2/gcc/config/i386/t-linux64	2012-09-22 12:46:07.000000000 +0200
+@@ -34,6 +34,6 @@
+ comma=,
+ MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
+ MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
+-MULTILIB_OSDIRNAMES = m64=../lib64
+-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
+-MULTILIB_OSDIRNAMES+= mx32=../libx32
++MULTILIB_OSDIRNAMES = m64=../lib
++MULTILIB_OSDIRNAMES+= m32=../lib
++MULTILIB_OSDIRNAMES+= mx32=../lib
+diff -Nur gcc-4.7.2.orig/gcc/config/mips/linux64.h gcc-4.7.2/gcc/config/mips/linux64.h
+--- gcc-4.7.2.orig/gcc/config/mips/linux64.h	2011-07-19 20:00:27.000000000 +0200
++++ gcc-4.7.2/gcc/config/mips/linux64.h	2012-09-22 12:44:16.000000000 +0200
+@@ -24,9 +24,9 @@
+ #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32"
  
  #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
 -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
@@ -36,24 +36,21 @@ diff -Nur gcc-4.6.3.orig/gcc/config/mips/linux64.h gcc-4.6.3/gcc/config/mips/lin
 +#define GLIBC_DYNAMIC_LINKERN32 "/lib/ld.so.1"
 +#define UCLIBC_DYNAMIC_LINKERN32 "/lib/ld-uClibc.so.0"
  #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
- #define LINUX_DYNAMIC_LINKERN32 \
+ #define GNU_USER_DYNAMIC_LINKERN32 \
    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
-diff -Nur gcc-4.6.3.orig/gcc/config/mips/t-linux64 gcc-4.6.3/gcc/config/mips/t-linux64
---- gcc-4.6.3.orig/gcc/config/mips/t-linux64	2009-04-21 21:03:23.000000000 +0200
-+++ gcc-4.6.3/gcc/config/mips/t-linux64	2012-03-21 13:30:51.685903041 +0100
-@@ -18,7 +18,7 @@
+diff -Nur gcc-4.7.2.orig/gcc/config/mips/t-linux64 gcc-4.7.2/gcc/config/mips/t-linux64
+--- gcc-4.7.2.orig/gcc/config/mips/t-linux64	2011-11-02 15:33:56.000000000 +0100
++++ gcc-4.7.2/gcc/config/mips/t-linux64	2012-09-22 12:48:39.000000000 +0200
+@@ -18,4 +18,4 @@
  
  MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
  MULTILIB_DIRNAMES = n32 32 64
 -MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
 +MULTILIB_OSDIRNAMES = ../lib ../lib ../lib
- 
- EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
- 
-diff -Nur gcc-4.6.3.orig/gcc/config/rs6000/linux64.h gcc-4.6.3/gcc/config/rs6000/linux64.h
---- gcc-4.6.3.orig/gcc/config/rs6000/linux64.h	2011-03-07 08:50:23.000000000 +0100
-+++ gcc-4.6.3/gcc/config/rs6000/linux64.h	2012-03-21 13:30:51.685903041 +0100
-@@ -373,7 +373,7 @@
+diff -Nur gcc-4.7.2.orig/gcc/config/rs6000/linux64.h gcc-4.7.2/gcc/config/rs6000/linux64.h
+--- gcc-4.7.2.orig/gcc/config/rs6000/linux64.h	2012-03-12 17:16:51.000000000 +0100
++++ gcc-4.7.2/gcc/config/rs6000/linux64.h	2012-09-22 12:44:16.000000000 +0200
+@@ -359,7 +359,7 @@
  #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
  
  #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
@@ -62,22 +59,20 @@ diff -Nur gcc-4.6.3.orig/gcc/config/rs6000/linux64.h gcc-4.6.3/gcc/config/rs6000
  #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
  #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
  #if DEFAULT_LIBC == LIBC_UCLIBC
-diff -Nur gcc-4.6.3.orig/gcc/config/rs6000/t-linux64 gcc-4.6.3/gcc/config/rs6000/t-linux64
---- gcc-4.6.3.orig/gcc/config/rs6000/t-linux64	2009-04-21 21:03:23.000000000 +0200
-+++ gcc-4.6.3/gcc/config/rs6000/t-linux64	2012-03-21 13:30:51.685903041 +0100
-@@ -36,7 +36,7 @@
+diff -Nur gcc-4.7.2.orig/gcc/config/rs6000/t-linux64 gcc-4.7.2/gcc/config/rs6000/t-linux64
+--- gcc-4.7.2.orig/gcc/config/rs6000/t-linux64	2011-11-02 16:23:48.000000000 +0100
++++ gcc-4.7.2/gcc/config/rs6000/t-linux64	2012-09-22 12:44:16.000000000 +0200
+@@ -31,5 +31,5 @@
  MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
  MULTILIB_EXCEPTIONS     = m64/msoft-float
  MULTILIB_EXCLUSIONS     = m64/!m32/msoft-float
 -MULTILIB_OSDIRNAMES	= ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
 +MULTILIB_OSDIRNAMES	= ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
  MULTILIB_MATCHES        = $(MULTILIB_MATCHES_FLOAT)
- 
- softfp_wrap_start := '\#ifndef __powerpc64__'
-diff -Nur gcc-4.6.3.orig/gcc/config/sparc/linux64.h gcc-4.6.3/gcc/config/sparc/linux64.h
---- gcc-4.6.3.orig/gcc/config/sparc/linux64.h	2011-09-08 11:12:35.000000000 +0200
-+++ gcc-4.6.3/gcc/config/sparc/linux64.h	2012-03-21 13:30:51.685903041 +0100
-@@ -102,7 +102,7 @@
+diff -Nur gcc-4.7.2.orig/gcc/config/sparc/linux64.h gcc-4.7.2/gcc/config/sparc/linux64.h
+--- gcc-4.7.2.orig/gcc/config/sparc/linux64.h	2011-11-12 02:05:07.000000000 +0100
++++ gcc-4.7.2/gcc/config/sparc/linux64.h	2012-09-22 12:44:16.000000000 +0200
+@@ -94,7 +94,7 @@
     done.  */
  
  #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
@@ -86,15 +81,12 @@ diff -Nur gcc-4.6.3.orig/gcc/config/sparc/linux64.h gcc-4.6.3/gcc/config/sparc/l
  
  #ifdef SPARC_BI_ARCH
  
-diff -Nur gcc-4.6.3.orig/gcc/config/sparc/t-linux64 gcc-4.6.3/gcc/config/sparc/t-linux64
---- gcc-4.6.3.orig/gcc/config/sparc/t-linux64	2011-05-22 22:03:43.000000000 +0200
-+++ gcc-4.6.3/gcc/config/sparc/t-linux64	2012-03-21 13:30:51.685903041 +0100
-@@ -26,7 +26,7 @@
+diff -Nur gcc-4.7.2.orig/gcc/config/sparc/t-linux64 gcc-4.7.2/gcc/config/sparc/t-linux64
+--- gcc-4.7.2.orig/gcc/config/sparc/t-linux64	2011-11-02 16:23:48.000000000 +0100
++++ gcc-4.7.2/gcc/config/sparc/t-linux64	2012-09-22 12:49:43.000000000 +0200
+@@ -26,4 +26,4 @@
  
  MULTILIB_OPTIONS = m64/m32
  MULTILIB_DIRNAMES = 64 32
 -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
++MULTILIB_OSDIRNAMES = ../lib ../lib
diff --git a/package/gcc/patches/sdt.patch b/package/gcc/patches/sdt.patch
new file mode 100644
index 000000000..7ee2cf1b7
--- /dev/null
+++ b/package/gcc/patches/sdt.patch
@@ -0,0 +1,14 @@
+diff -Nur gcc-4.7.2.orig/libgcc/unwind-dw2.c gcc-4.7.2/libgcc/unwind-dw2.c
+--- gcc-4.7.2.orig/libgcc/unwind-dw2.c	2011-11-02 16:26:35.000000000 +0100
++++ gcc-4.7.2/libgcc/unwind-dw2.c	2012-09-22 21:56:06.000000000 +0200
+@@ -38,10 +38,6 @@
+ #include "gthr.h"
+ #include "unwind-dw2.h"
+ 
+-#ifdef HAVE_SYS_SDT_H
+-#include <sys/sdt.h>
+-#endif
+-
+ #ifndef __USING_SJLJ_EXCEPTIONS__
+ 
+ #ifndef STACK_GROWS_DOWNWARD
-- 
cgit v1.2.3