gcc: Updated (4.7.4 -> 5.3.1)

9 years ago · 06bc2069e1
17 changed files with 167 additions and 789 deletions
--- a/base/gcc/gcc-4.6-libffi-no-install-manpages.patch
+++ b/base/gcc/gcc-4.6-libffi-no-install-manpages.patch
@ -1,31 +0,0 @@
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../gcc/gcc-4.6-libffi-no-install-manpages.patch
 # Copyright (C) 2012 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # --- SDE-COPYRIGHT-NOTE-END ---

 Description: Do not install libffi manpages

 Otherwise we get shared files with the standalone libffi package.

 --- gcc-4.6.2/libffi/Makefile.in.orig	2012-02-12 16:54:35.588084662 +0100
 +++ gcc-4.6.2/libffi/Makefile.in	2012-02-12 16:54:56.596095393 +0100
@@ -388,7 +388,7 @@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign subdir-objects
 ACLOCAL_AMFLAGS = -I .. -I ../config
 -SUBDIRS = include testsuite man
 +SUBDIRS = include testsuite
 EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \
 	src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \
 	src/arm/ffi.c src/arm/sysv.S src/arm/ffitarget.h \
--- a/base/gcc/gcc-4.7-HAVE_SYS_SDT_H-cross-compile.patch
+++ b/base/gcc/gcc-4.7-HAVE_SYS_SDT_H-cross-compile.patch
@ -1,109 +0,0 @@
 Check sys/sdt.h with AC_CHECK_HEADERS

 The original patch was backported to gcc 4.7.2!

 see: http://patchwork.ozlabs.org/patch/207141/ for the original patch
 ------------------------------------------------------------------------------
 2012-12-18  Christian Bruel  <christian.bruel@st.com>

 	* configure.ac: Check sys/sdt.h with AC_CHECK_HEADERS.
 	* configure: Regenerate.
 	* config.in: Regenerat.e
 ------------------------------------------------------------------------------

 --- a/gcc/configure
 +++ b/gcc/configure
@@ -8286,7 +8286,7 @@ fi
 
 for ac_header in limits.h stddef.h string.h strings.h stdlib.h time.h iconv.h \
 		 fcntl.h unistd.h sys/file.h sys/time.h sys/mman.h \
 -		 sys/resource.h sys/param.h sys/times.h sys/stat.h \
 +		 sys/resource.h sys/param.h sys/times.h sys/sdt.h sys/stat.h \
 		 direct.h malloc.h langinfo.h ldfcn.h locale.h wchar.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -26716,20 +26716,6 @@ $as_echo "#define TARGET_LIBC_PROVIDES_SSP 1" >>co
 
 fi
 
 -# Test for <sys/sdt.h> on the target.
 -
 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5
 -$as_echo_n "checking sys/sdt.h in the target C library... " >&6; }
 -have_sys_sdt_h=no
 -if test -f $target_header_dir/sys/sdt.h; then
 -  have_sys_sdt_h=yes
 -
 -$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
 -
 -fi
 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_sys_sdt_h" >&5
 -$as_echo "$have_sys_sdt_h" >&6; }
 -
 # Check if TFmode long double should be used by default or not.
 # Some glibc targets used DFmode long double, but with glibc 2.4
 # and later they can use TFmode.
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
@@ -940,7 +940,7 @@ ACX_HEADER_STRING
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(limits.h stddef.h string.h strings.h stdlib.h time.h iconv.h \
 		 fcntl.h unistd.h sys/file.h sys/time.h sys/mman.h \
 -		 sys/resource.h sys/param.h sys/times.h sys/stat.h \
 +		 sys/resource.h sys/param.h sys/times.h sys/sdt.h sys/stat.h \
 		 direct.h malloc.h langinfo.h ldfcn.h locale.h wchar.h)
 
 # Check for thread headers.
@@ -4718,17 +4718,6 @@ if test x$gcc_cv_libc_provides_ssp = xyes; then
 	    [Define if your target C library provides stack protector support])
 fi
 
 -# Test for <sys/sdt.h> on the target.
 -GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H])
 -AC_MSG_CHECKING(sys/sdt.h in the target C library)
 -have_sys_sdt_h=no
 -if test -f $target_header_dir/sys/sdt.h; then
 -  have_sys_sdt_h=yes
 -  AC_DEFINE(HAVE_SYS_SDT_H, 1,
 -            [Define if your target C library provides sys/sdt.h])
 -fi
 -AC_MSG_RESULT($have_sys_sdt_h)
 -
 # Check if TFmode long double should be used by default or not.
 # Some glibc targets used DFmode long double, but with glibc 2.4
 # and later they can use TFmode.
 --- a/gcc/config.in
 +++ b/gcc/config.in
@@ -465,6 +465,12 @@
 #endif
 
 
 +/* Define if your assembler supports SPARC4 instructions. */
 +#ifndef USED_FOR_TARGET
 +#undef HAVE_AS_SPARC4
 +#endif
 +
 +
 /* Define if your assembler and linker support GOTDATA_OP relocs. */
 #ifndef USED_FOR_TARGET
 #undef HAVE_AS_SPARC_GOTDATA_OP
@@ -1210,7 +1216,7 @@
 #endif
 
 
 -/* Define if your PowerPC64 linker supports a large TOC. */
 +/* Define if your AIX linker supports a large TOC. */
 #ifndef USED_FOR_TARGET
 #undef HAVE_LD_LARGE_TOC
 #endif
@@ -1447,7 +1453,10 @@
 
 
 /* Define if your target C library provides sys/sdt.h */
 +#ifndef USED_FOR_TARGET
 #undef HAVE_SYS_SDT_H
 +#endif
 +
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #ifndef USED_FOR_TARGET
--- a/base/gcc/gcc-4.7-multilib-1.patch
+++ b/base/gcc/gcc-4.7-multilib-1.patch
@ -1,151 +0,0 @@
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../gcc/gcc-4.7-multilib-1.patch
 # Copyright (C) 2009 - 2013 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # --- SDE-COPYRIGHT-NOTE-END ---

 From 5062892f2adef4afdf0a251decd76fd446777b8a Mon Sep 17 00:00:00 2001
 From: Christian Wiese <chris@opensde.org>
 Date: Mon, 6 Aug 2012 14:24:08 +0200
 Subject: [PATCH] adjust multilib dirnames to suite OpenSDE's lib as symlink strategy

 ---
 gcc/config/i386/linux64.h   |    2 +-
 gcc/config/i386/t-linux64   |    2 +-
 gcc/config/mips/linux64.h   |    6 +++---
 gcc/config/mips/t-linux64   |    2 +-
 gcc/config/rs6000/linux64.h |    6 +++---
 gcc/config/rs6000/t-linux64 |    2 +-
 gcc/config/sparc/linux64.h  |    4 ++--
 gcc/config/sparc/t-linux64  |    2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

 diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h
 index 5b0a212..984c147 100644
 --- a/gcc/config/i386/linux64.h
 +++ b/gcc/config/i386/linux64.h
@@ -28,6 +28,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #define GNU_USER_LINK_EMULATION64 "elf_x86_64"
 #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
 
 -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
 +#define GLIBC_DYNAMIC_LINKER32 "/lib32/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"
 diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
 index b5d3985..d530d97 100644
 --- a/gcc/config/i386/t-linux64
 +++ b/gcc/config/i386/t-linux64
@@ -35,5 +35,5 @@
 MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
 MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
 MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
 -MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
 +MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:i386-linux-gnu)
 MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
 diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h
 index 6e92719..4436d75 100644
 --- a/gcc/config/mips/linux64.h
 +++ b/gcc/config/mips/linux64.h
@@ -23,10 +23,10 @@ along with GCC; see the file COPYING3.  If not see
 #define GNU_USER_LINK_EMULATION64 "elf64%{EB:b}%{EL:l}tsmip"
 #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32"
 
 -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
 +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
 #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
 -#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
 -#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
 +#define GLIBC_DYNAMIC_LINKERN32 "/libn32/ld.so.1"
 +#define UCLIBC_DYNAMIC_LINKERN32 "/libn32/ld-uClibc.so.0"
 #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
 #define GNU_USER_DYNAMIC_LINKERN32 \
   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
 diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64
 index 5197e5e..b847f7d 100644
 --- a/gcc/config/mips/t-linux64
 +++ b/gcc/config/mips/t-linux64
@@ -21,6 +21,6 @@
 MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el)
 MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft)
 MULTILIB_OSDIRNAMES = \
 -	../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
 -	../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
 +	../libn32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
 +	../lib32$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
 	../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
 diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
 index 7c516eb..9fd4b58 100644
 --- a/gcc/config/rs6000/linux64.h
 +++ b/gcc/config/rs6000/linux64.h
@@ -358,10 +358,10 @@ extern int dot_symbols;
 #undef	LINK_OS_DEFAULT_SPEC
 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
 
 -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
 +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
 #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"
 +#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
 +#define UCLIBC_DYNAMIC_LINKER64 "/lib64/ld64-uClibc.so.0"
 #if DEFAULT_LIBC == LIBC_UCLIBC
 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
 #elif DEFAULT_LIBC == LIBC_GLIBC
 diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64
 index 6420431..de44202 100644
 --- a/gcc/config/rs6000/t-linux64
 +++ b/gcc/config/rs6000/t-linux64
@@ -32,6 +32,6 @@
 MULTILIB_EXCEPTIONS     = m64/msoft-float
 MULTILIB_EXCLUSIONS     = m64/!m32/msoft-float
 MULTILIB_OSDIRNAMES	= ../lib64$(call if_multiarch,:powerpc64-linux-gnu)
 -MULTILIB_OSDIRNAMES    += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
 +MULTILIB_OSDIRNAMES    += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:powerpc-linux-gnu)
 MULTILIB_OSDIRNAMES    += nof
 MULTILIB_MATCHES        = $(MULTILIB_MATCHES_FLOAT)
 diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h
 index 14966b9..0134911 100644
 --- a/gcc/config/sparc/linux64.h
 +++ b/gcc/config/sparc/linux64.h
@@ -93,7 +93,7 @@ along with GCC; see the file COPYING3.  If not see
    When the -shared link option is used a final link is not being
    done.  */
 
 -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
 +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
 #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
 
 #ifdef SPARC_BI_ARCH
@@ -105,7 +105,7 @@ along with GCC; see the file COPYING3.  If not see
   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
   { "link_arch",	 LINK_ARCH_SPEC },
 
 -#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
 +#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib32 %{shared:-shared} \
   %{!shared: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
 diff --git a/gcc/config/sparc/t-linux64 b/gcc/config/sparc/t-linux64
 index d9dfad6..05230e8 100644
 --- a/gcc/config/sparc/t-linux64
 +++ b/gcc/config/sparc/t-linux64
@@ -27,4 +27,4 @@
 MULTILIB_OPTIONS = m64/m32
 MULTILIB_DIRNAMES = 64 32
 MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:sparc64-linux-gnu)
 -MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:sparc-linux-gnu)
 +MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:sparc-linux-gnu)
 -- 
 1.7.2.3

--- a/base/gcc/gcc-4.7-use-gdb-auto-load-dir.patch
+++ b/base/gcc/gcc-4.7-use-gdb-auto-load-dir.patch
@ -1,60 +0,0 @@
 Do not put gdb python plugin directly into $libdir

 Placing files like 'libstdc++.so.6.0.17-gdb.py' into '$libdir' results in
 warnings when running 'ldconfig' because it is not an ELF file.
 A common place where to put gdb plugins is '$datadir/gdb/auto-load$libdir'
 like '/usr/share/gdb/auto-load/usr/lib'.

 Note:

 This patch assumes that gdb and gcc are using the same prefix!

 --- a/libstdc++-v3/python/Makefile.am	2013-02-11 11:21:56.256542983 +0100
 +++ b/libstdc++-v3/python/Makefile.am	2013-02-11 14:00:22.742531876 +0100
@@ -38,10 +38,10 @@
 
 gdb.py: hook.in Makefile
 	sed -e 's,@pythondir@,$(pythondir),' \
 -	    -e 's,@toolexeclibdir@,$(toolexeclibdir),' < $(srcdir)/hook.in > $@
 +	    -e 's,@toolexeclibdir@,$(datadir)/gdb/auto-load$(toolexeclibdir),' < $(srcdir)/hook.in > $@
 
 install-data-local: gdb.py
 -	@$(mkdir_p) $(DESTDIR)$(toolexeclibdir)
 +	@$(mkdir_p) $(DESTDIR)$(datadir)/gdb/auto-load$(toolexeclibdir)
 ## We want to install gdb.py as SOMETHING-gdb.py.  SOMETHING is the
 ## full name of the final library.  We want to ignore symlinks, the
 ## .la file, and any previous -gdb.py file.  This is inherently
@@ -59,5 +59,5 @@
 	    esac; \
 	  done; \
 	cd $$here; \
 -	echo " $(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py"; \
 -	$(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py
 +	echo " $(INSTALL_DATA) gdb.py $(DESTDIR)$(datadir)/gdb/auto-load$(toolexeclibdir)/$$libname-gdb.py"; \
 +	$(INSTALL_DATA) gdb.py $(DESTDIR)$(datadir)/gdb/auto-load$(toolexeclibdir)/$$libname-gdb.py
 --- a/libstdc++-v3/python/Makefile.in	2013-02-11 11:21:59.428241462 +0100
 +++ b/libstdc++-v3/python/Makefile.in	2013-02-11 14:00:05.000008051 +0100
@@ -493,10 +493,10 @@
 
 gdb.py: hook.in Makefile
 	sed -e 's,@pythondir@,$(pythondir),' \
 -	    -e 's,@toolexeclibdir@,$(toolexeclibdir),' < $(srcdir)/hook.in > $@
 +	    -e 's,@toolexeclibdir@,$(datadir)/gdb/auto-load$(toolexeclibdir),' < $(srcdir)/hook.in > $@
 
 install-data-local: gdb.py
 -	@$(mkdir_p) $(DESTDIR)$(toolexeclibdir)
 +	@$(mkdir_p) $(DESTDIR)$(datadir)/gdb/auto-load$(toolexeclibdir)
 	@here=`pwd`; cd $(DESTDIR)$(toolexeclibdir); \
 	  for file in libstdc++*; do \
 	    case $$file in \
@@ -509,8 +509,8 @@
 	    esac; \
 	  done; \
 	cd $$here; \
 -	echo " $(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py"; \
 -	$(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py
 +	echo " $(INSTALL_DATA) gdb.py $(DESTDIR)$(datadir)/gdb/auto-load$(toolexeclibdir)/$$libname-gdb.py"; \
 +	$(INSTALL_DATA) gdb.py $(DESTDIR)$(datadir)/gdb/auto-load$(toolexeclibdir)/$$libname-gdb.py
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/base/gcc/gcc.conf
+++ b/base/gcc/gcc.conf
@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../gcc/gcc.conf
 # Copyright (C) 2006 - 2015 The OpenSDE Project
 # Copyright (C) 2006 - 2016 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@ -71,22 +71,11 @@ EOF
 	popd
 }

 # We must use an 'objdir' directory for building gcc.

 hook_add preconf 8 "sed -ie 's/#if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 11/#if PPL_VERSION_MAJOR != 1/' configure"
 hook_add preconf 9 "mkdir -p objdir; cd objdir"
 hook_add preconf 5 "mkdir -p objdir; cd objdir"
 #hook_add preconf 8 "musl_prep"
 configscript="../configure"

 # See http://gcc.gnu.org/gcc-3.2/c++-abi.html
 # and http://www.codesourcery.com/cxx-abi/.
 if [ "$SDECFG_CROSSBUILD" = 1 ]; then
 	# FIXME: stage 1 c++ packages fail if this is enabled
 	var_append confopt ' ' "--disable-__cxa_atexit"
 elif [ "$arch_machine" != "i386" ]; then
 	var_append confopt ' ' "--enable-__cxa_atexit"
 else
 	var_append confopt ' ' "--disable-__cxa_atexit"
 fi
 var_append confopt ' ' "--enable-__cxa_atexit"

 # we might build a SVN or prereleases, disable checking
 var_append confopt ' ' '--disable-checking'
@ -94,9 +83,6 @@ var_append confopt ' ' '--disable-checking'
 # we build a cross compiler in stage0 and later use known good GCCs, no bstrap
 var_append confopt ' ' '--disable-bootstrap'

 # enable plugin support
 var_append extraconfopt ' ' '--enable-plugin'

 # build version specific runtime libraries (default 0)
 # needed if multiple versions of gcc are installed
 [ "$SDECFG_PKG_GCC_VERSION_LIBS" = 1 ] && \
@ -116,7 +102,7 @@ else
 	var_append confopt ' ' "--disable-multilib"
 fi

 if [ "${ver:0:3}" = "3.4" -o "${ver:0:1}" = "4" ]; then
 if [ "${ver:0:3}" = "3.4" -o "${ver:0:1}" = "4" -o "${ver:0:1}" = "5" ]; then
 	gcc_lib_dir="gcc/${arch_target}/${ver%%-*}"
 else
 	gcc_lib_dir="gcc-lib/${arch_target}/${ver%%-*}"
@ -129,10 +115,6 @@ fi
 # only C and C++ by default, and on every stage
 languages="c,c++"

 # explicitely enable C99 and 'long long' support
 var_append confopt ' ' "--enable-c99"
 var_append confopt ' ' "--enable-long-long"

 # pass --build-id option to the linker for all final links
 var_append confopt ' ' "--enable-linker-build-id"

@ -146,6 +128,22 @@ if [ "$SDECFG_LIBC" = 'glibc' ]; then
 	var_append confopt ' ' "--with-linker-hash-style=gnu"
 fi

 #musl_prep() {
 #if [ "$SDECFG_LIBC" = 'musl' ]; then
 #	# some hackery for musl
 #	sed -i 's,-lgcc_s,--start-group -lgcc_eh -lgcc -lc --end-group,' ../gcc/gcc.c
 #	sed -i 's,gcc_no_link=yes,gcc_no_link=no,' ../libstdc++-v3/configure
 #	mv ../libstdc\+\+-v3/config/os/gnu-linux ../libstdc\+\+-v3/config/os/gnu-linux.org
 #	cp -r ../libstdc\+\+-v3/config/os/generic ../libstdc\+\+-v3/config/os/gnu-linux
 #	cp ../libstdc++-v3/config/os/gnu-linux.org/arm-eabi-extra.ver ../libstdc++-v3/config/os/gnu-linux/
 #	mv ../libitm/config/linux/x86 ../libitm/config/linux/x86_glibc
 #	cp -r ../libitm/config/generic ../libitm/config/linux/x86
 #	sed -i 's@\./fixinc\.sh@-c true@' ../gcc/Makefile.in
 #	sed -i 's@/lib/ld-linux.so.2@/lib/ld-musl-i386.so.1@' ../gcc/config/i386/linux.h
 #	sed -i 's@/lib/ld-linux.so.2@/lib/ld-musl-i386.so.1@' ../gcc/config/i386/linux64.h
 #	sed -i 's@/lib64/ld-linux-x86-64.so.2@/lib/ld-musl-x86_64.so.1@' ../gcc/config/i386/linux64.h
 #fi
 #}

 if atstage toolchain; then
 	bindir="/$prefix/crosscc"
@ -159,6 +157,12 @@ if atstage toolchain; then
 	var_append confopt " " "--disable-libgomp"
 	var_append confopt " " "--disable-libquadmath"
 	var_append confopt " " "--disable-libitm"
 	var_append confopt " " "--disable-libatomic"
 	var_append confopt " " "--disable-libcilkrts"
 	var_append confopt " " "--disable-libstdcxx"
 	var_append confopt " " "--disable-libvtv"
 	var_append confopt " " "--disable-libsanitizer"


 	# use the native libraries we build in the toolchain directory
 	var_append extraconfopt ' ' "--with-gmp=$( pkgprefix -r gmp )"
@ -175,24 +179,24 @@ if atstage toolchain; then

 fi

 # Graphite loop optimization
 if pkginstalled -f cloog && pkginstalled -f ppl; then
 	# use the cloog-isl backend
 	var_append extraconfopt ' ' "--enable-cloog-backend=isl"
 	var_append extraconfopt ' ' "--with-cloog=$( pkgprefix -r cloog )"
 	var_append extraconfopt ' ' "--with-cloog-lib=$( pkgprefix -r libdir cloog )"
 	var_append extraconfopt ' ' "--with-cloog-include=$( pkgprefix -r includedir cloog )"

 	# even when using the cloog-isl backend ppl is still needed to build gcc
 	var_append extraconfopt ' ' "--with-ppl=$( pkgprefix -r ppl )"
 	var_append extraconfopt ' ' "--with-ppl-lib=$( pkgprefix -r libdir ppl )"
 	var_append extraconfopt ' ' "--with-ppl-include=$( pkgprefix -r includedir ppl )"
 fi
 libstdcpp_build() {
 	mkdir libstdc++; cd libstdc++
 	configscript="../../libstdc++-v3/configure"
 	eval_config_command $confopt
 	eval $MAKE $makeopt
 	eval $MAKE $makeinstopt
 	cd ..
 	configscript=../configure
 }

 if atstage cross; then
 	# for gcc versions 4.3 and upwards we have to explicitely specifiy the
 	# target architecture at cross-compiling stage
 	var_append confopt ' ' '--target=$arch_target'
 	# since v4.8 "GCC uses C++ as its implementation language.
 	# This means that to build GCC from sources, you will need a C++
 	# compiler that understands C++ 2003." hence we _must_ build libstdc++-v3
 	hook_add preconf 7 "libstdcpp_build"
 fi

 if ! atstage native; then
@ -201,6 +205,17 @@ else
 	var_append confopt " " "--with-gnu-as"
 	var_append confopt " " "--with-gnu-ld"
 	var_append confopt " " "--enable-threads=posix"
 	var_append confopt " " "--enable-libmpx"
 	var_append confopt " " "--with-system-zlib"
 	var_append confopt " " "--with-isl"
 	var_append confopt " " "--disable-libunwind-exceptions"
 	var_append confopt " " "--enable-clocale=gnu"
 	var_append confopt " " "--disable-libstdcxx-pch"
 	var_append confopt " " "--disable-libssp"
 	var_append confopt " " "--enable-install-libiberty"
 	var_append confopt " " "--with-linker-hash-style=gnu"
 	var_append confopt " " "--enable-gnu-indirect-function"
 	var_append confopt " " "--disable-werror"

 	if [ "$SDECFG_PKG_GCC_JAVA" != 1 ] ; then
 		var_append confopt " " "--disable-libgcj"
--- a/base/gcc/gcc.desc
+++ b/base/gcc/gcc.desc
@ -2,7 +2,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../gcc/gcc.desc
 [COPY] Copyright (C) 2006 - 2014 The OpenSDE Project
 [COPY] Copyright (C) 2006 - 2016 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY] Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY]
@ -35,8 +35,9 @@

 [L] GPL
 [S] Stable
 [V] 4.7.4
 [V] 5.3.1
 [P] X 012--5---9 102.300

 [D] 1679952725 gcc-4.7.4.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.7.4/
 [D] 1408594922 gcc-5-20160209.tar.bz2 ftp://gcc.gnu.org/pub/gcc/snapshots/5-20160209/
 [D] 2750021927 isl-0.14.tar.bz2 ftp://gcc.gnu.org/pub/gcc/infrastructure/ 
 [D] 271646925 ecj-4.5.jar ftp://sourceware.org/pub/java/
--- a/base/gcc/gcc47-libitm-fno-exceptions.patch
+++ b/base/gcc/gcc47-libitm-fno-exceptions.patch
@ -1,44 +0,0 @@
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../gcc/gcc47-libitm-fno-exceptions.patch
 # Copyright (C) 2012 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # --- SDE-COPYRIGHT-NOTE-END ---

 2011-12-22  Jakub Jelinek  <jakub@redhat.com>

 	* Makefile.am (beginend.lo): Append -fno-exceptions to
 	CXXFLAGS.
 	* Makefile.in: Regenerated.

 --- a/libitm/Makefile.am	2011-12-20 13:47:57.000000000 +0100
 +++ b/libitm/Makefile.am	2011-12-22 09:14:06.663469165 +0100
@@ -72,6 +72,8 @@ endif
 if ARCH_X86_AVX
 x86_avx.lo : XCFLAGS += -mavx
 endif
 +beginend.lo : CXXCOMPILE += -fno-exceptions
 +beginend.lo : LTCXXCOMPILE += -fno-exceptions
 
 if ARCH_FUTEX
 libitm_la_SOURCES += futex.cc
 --- a/libitm/Makefile.in	2011-12-20 13:47:57.000000000 +0100
 +++ b/libitm/Makefile.in	2011-12-22 09:14:29.466329944 +0100
@@ -1278,6 +1278,8 @@ vpath % $(strip $(search_path))
 @LIBITM_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBITM_BUILD_VERSIONED_SHLIB_TRUE@	 > $@ || (rm -f $@ ; exit 1)
 @ARCH_X86_TRUE@x86_sse.lo : XCFLAGS += -msse
 @ARCH_X86_AVX_TRUE@x86_avx.lo : XCFLAGS += -mavx
 +beginend.lo : CXXCOMPILE += -fno-exceptions
 +beginend.lo : LTCXXCOMPILE += -fno-exceptions
 
 all-local: $(STAMP_GENINSRC)
 
--- a/base/gcc/gcc47-libitm-pr52695-workaround.patch
+++ b/base/gcc/gcc47-libitm-pr52695-workaround.patch
@ -1,39 +0,0 @@
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../gcc/gcc47-libitm-pr52695-workaround.patch
 # Copyright (C) 2012 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # --- SDE-COPYRIGHT-NOTE-END ---

 Description: Workaround to fix building on x86 systems

 http://gcc.gnu.org/PR52695

 --- a/libitm/config/x86/target.h
 +++ b/libitm/config/x86/target.h
@@ -69,16 +69,4 @@
 } // namespace GTM
 
 // We'll be using some of the cpu builtins, and their associated types.
 -#ifndef __cplusplus
 -/* ??? It's broken for C++. */
 #include <x86intrin.h>
 -#else
 -# ifdef __SSE2__
 -#  include <emmintrin.h>
 -# elif defined(__SSE__)
 -#  include <xmmintrin.h>
 -# endif
 -# ifdef __AVX__
 -#  include <immintrin.h>
 -# endif
 -#endif
--- a/base/gcc/gcc47-pr38757.patch
+++ b/base/gcc/gcc47-pr38757.patch
@ -1,121 +0,0 @@
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../gcc/gcc47-pr38757.patch
 # Copyright (C) 2012 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # --- SDE-COPYRIGHT-NOTE-END ---

 2009-03-18  Jakub Jelinek  <jakub@redhat.com>

 	PR debug/38757
 	* langhooks.h (struct lang_hooks): Add source_language langhook.
 	* langhooks-def.h (LANG_HOOKS_SOURCE_LANGUAGE): Define to NULL.
 	(LANG_HOOKS_INITIALIZER): Add LANG_HOOKS_SOURCE_LANGUAGE.
 	* c-lang.c (c_source_language): New function.
 	(LANG_HOOKS_SOURCE_LANGUAGE): Define.
 	* dwarf2out.c (add_prototyped_attribute): Add DW_AT_prototype
 	also for DW_LANG_{C,C99,ObjC}.
 	(gen_compile_unit_die): Use lang_hooks.source_language () to
 	determine if DW_LANG_C99 or DW_LANG_C89 should be returned.

 --- a/gcc/langhooks.h	2011-01-03 12:53:05.125745450 +0100
 +++ b/gcc/langhooks.h	2011-01-04 17:59:43.166744926 +0100
@@ -467,6 +467,10 @@ struct lang_hooks
      gimplification.  */
   bool deep_unsharing;
 
 +  /* Return year of the source language standard version if the FE supports
 +     multiple versions of the standard.  */
 +  int (*source_language) (void);
 +
   /* Whenever you add entries here, make sure you adjust langhooks-def.h
      and langhooks.c accordingly.  */
 };
 --- a/gcc/langhooks-def.h	2011-01-03 12:53:05.000000000 +0100
 +++ b/gcc/langhooks-def.h	2011-01-04 18:00:44.858851030 +0100
@@ -118,6 +118,7 @@ extern void lhd_omp_firstprivatize_type_
 #define LANG_HOOKS_EH_PROTECT_CLEANUP_ACTIONS	NULL
 #define LANG_HOOKS_EH_USE_CXA_END_CLEANUP	false
 #define LANG_HOOKS_DEEP_UNSHARING	false
 +#define LANG_HOOKS_SOURCE_LANGUAGE	NULL
 
 /* Attribute hooks.  */
 #define LANG_HOOKS_ATTRIBUTE_TABLE		NULL
@@ -307,7 +308,8 @@ extern void lhd_end_section (void);
   LANG_HOOKS_EH_RUNTIME_TYPE, \
   LANG_HOOKS_EH_PROTECT_CLEANUP_ACTIONS, \
   LANG_HOOKS_EH_USE_CXA_END_CLEANUP, \
 -  LANG_HOOKS_DEEP_UNSHARING \
 +  LANG_HOOKS_DEEP_UNSHARING, \
 +  LANG_HOOKS_SOURCE_LANGUAGE \
 }
 
 #endif /* GCC_LANG_HOOKS_DEF_H */
 --- a/gcc/c-lang.c	2011-01-03 12:53:05.376056936 +0100
 +++ b/gcc/c-lang.c	2011-01-04 17:59:43.167743798 +0100
@@ -36,6 +36,12 @@ along with GCC; see the file COPYING3.
 
 enum c_language_kind c_language = clk_c;
 
 +static int
 +c_source_language (void)
 +{
 +  return flag_isoc99 ? 1999 : 1989;
 +}
 +
 /* Lang hooks common to C and ObjC are declared in c-objc-common.h;
    consequently, there should be very few hooks below.  */
 
@@ -45,6 +51,8 @@ enum c_language_kind c_language = clk_c;
 #define LANG_HOOKS_INIT c_objc_common_init
 #undef LANG_HOOKS_INIT_TS
 #define LANG_HOOKS_INIT_TS c_common_init_ts
 +#undef LANG_HOOKS_SOURCE_LANGUAGE
 +#define LANG_HOOKS_SOURCE_LANGUAGE c_source_language
 
 /* Each front end provides its own lang hook initializer.  */
 struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER;
 --- a/gcc/dwarf2out.c	2011-01-03 12:53:05.102056475 +0100
 +++ b/gcc/dwarf2out.c	2011-01-04 18:03:14.534151763 +0100
@@ -15793,9 +15793,18 @@ add_bit_size_attribute (dw_die_ref die, 
 static inline void
 add_prototyped_attribute (dw_die_ref die, tree func_type)
 {
 -  if (get_AT_unsigned (comp_unit_die (), DW_AT_language) == DW_LANG_C89
 -      && prototype_p (func_type))
 -    add_AT_flag (die, DW_AT_prototyped, 1);
 +  switch (get_AT_unsigned (comp_unit_die (), DW_AT_language))
 +    {
 +    case DW_LANG_C:
 +    case DW_LANG_C89:
 +    case DW_LANG_C99:
 +    case DW_LANG_ObjC:
 +      if (prototype_p (func_type))
 +	add_AT_flag (die, DW_AT_prototyped, 1);
 +      break;
 +    default:
 +      break;
 +    }
 }
 
 /* Add an 'abstract_origin' attribute below a given DIE.  The DIE is found
@@ -18438,6 +18447,10 @@ gen_compile_unit_die (const char *filena
 	  if (strcmp (language_string, "GNU Go") == 0)
 	    language = DW_LANG_Go;
 	}
 +      else if (strcmp (language_string, "GNU C") == 0
 +	       && lang_hooks.source_language
 +	       && lang_hooks.source_language () >= 1999)
 +	language = DW_LANG_C99;
     }
 
   add_AT_unsigned (die, DW_AT_language, language);
--- a/base/gcc/gcc-4.4-gxx_include_dir.patch.toolchain
+++ b/base/gcc/gcc-4.4-gxx_include_dir.patch.toolchain
@ -1,8 +1,9 @@
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../gcc/gcc-4.4-gxx_include_dir.patch.toolchain
 # Copyright (C) 2008 - 2010 The OpenSDE Project
 # Filename: package/.../gcc/gxx_include.patch.toolchain
 # Copyright (C) 2016 The OpenSDE Project
 # Copyright (C) 2007 - 2008 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
 #
@ -14,9 +15,9 @@
 # version.
 # --- SDE-COPYRIGHT-NOTE-END ---

 --- gcc-4.4.2/gcc/configure.orig	2009-03-24 18:46:03.000000000 +0100
 +++ gcc-4.4.2/gcc/configure	2009-11-28 12:12:49.000000000 +0100
@@ -1879,13 +1879,10 @@
 --- gcc-4.3.1/gcc/configure.vanilla	2008-07-18 17:07:44.000000000 +0200
 +++ gcc-4.3.1/gcc/configure	2008-07-18 17:30:02.000000000 +0200
@@ -1686,13 +1686,10 @@
 # This logic must match libstdc++-v3/acinclude.m4:GLIBCXX_EXPORT_INSTALL_INFO.
 if test x${gcc_gxx_include_dir} = x; then
   if test x${enable_version_specific_runtime_libs} = xyes; then
--- a/base/gcc/libgcc-quirk.patch.toolchain
+++ b/base/gcc/libgcc-quirk.patch.toolchain
@ -0,0 +1,28 @@
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../gcc/libgcc-quirk.patch.toolchain
 # Copyright (C) 2016 The OpenSDE Project
 # Copyright (C) 2015 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
 #
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # --- SDE-COPYRIGHT-NOTE-END ---

 --- gcc-5.2.0/libgcc/configure.vanilla	2015-09-26 12:39:03.654970955 +0000
 +++ gcc-5.2.0/libgcc/configure	2015-09-26 12:40:16.406970990 +0000
@@ -4573,6 +4573,7 @@
 CFLAGS_hold=$CFLAGS
 CFLAGS="--save-temps -fexceptions"
 -libgcc_cv_lib_sjlj_exceptions=unknown
 +libgcc_cv_lib_sjlj_exceptions=no
 if ac_fn_c_try_compile; then :
 +  cat conftest.s
   if grep _Unwind_SjLj_Resume conftest.s >/dev/null 2>&1; then
     libgcc_cv_lib_sjlj_exceptions=yes
--- a/base/gcc/no-fixincludes.patch
+++ b/base/gcc/no-fixincludes.patch
@ -1,34 +0,0 @@
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../gcc/no-fixincludes.patch
 # Copyright (C) 2010 - 2011 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # --- SDE-COPYRIGHT-NOTE-END ---

 # Do not run the 'fixinc.sh' script.
 # The fixincludes script attempts to "fix" the system headers installed so far.
 # Since GCC is cross-compiled expecting the system headers to be in
 # /usr/include, the script will be looking at the host system's headers.

 diff --git a/gcc/Makefile.in b/gcc/Makefile.in
 index 60dcee5..e5cff9c 100644
 --- a/gcc/Makefile.in
 +++ b/gcc/Makefile.in
@@ -4168,7 +4168,7 @@ stmp-fixinc: gsyslimits.h macro_list fixinc_list \
 	      gcc_dir=`${PWD_COMMAND}` ; \
 	      export TARGET_MACHINE srcdir SHELL MACRO_LIST && \
 	      cd $(build_objdir)/fixincludes && \
 -	      $(SHELL) ./fixinc.sh "$${gcc_dir}/$${fix_dir}" \
 +	      $(SHELL) -c true "$${gcc_dir}/$${fix_dir}" \
 	        $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS) ); \
 	    rm -f $${fix_dir}/syslimits.h; \
 	    if [ -f $${fix_dir}/limits.h ]; then \
--- a/base/gcc/no-include-fixed-dir.patch
+++ b/base/gcc/no-include-fixed-dir.patch
@ -1,86 +0,0 @@
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../gcc/no-include-fixed-dir.patch
 # Copyright (C) 2010 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # --- SDE-COPYRIGHT-NOTE-END ---

 # Do not create a 'include-fixed' directory containing certain header files,
 # but install the header file into the default include directory.
 #
 # Without this patch a 'include-fixed' directory is created on install, where
 # the 'limits.h' and 'syslimits.h' header files get installed as following
 # flist output is demonstrating:
 # --------------------------------------------------------------------------
 # gcc: usr/lib/gcc/i686-unknown-linux-gnu/4.4.3/include-fixed
 # gcc: usr/lib/gcc/i686-unknown-linux-gnu/4.4.3/include-fixed/README
 # gcc: usr/lib/gcc/i686-unknown-linux-gnu/4.4.3/include-fixed/limits.h
 # gcc: usr/lib/gcc/i686-unknown-linux-gnu/4.4.3/include-fixed/syslimits.h
 # --------------------------------------------------------------------------

 --- gcc-4.4.3/gcc/Makefile.in.orig	2010-03-22 12:15:16.545004067 +0100
 +++ gcc-4.4.3/gcc/Makefile.in	2010-03-22 12:21:27.841867139 +0100
@@ -4277,10 +4277,10 @@
 	if [ $$? -eq 0 ]; then \
 	  dir=`cd include-fixed; ${PWD_COMMAND}`; \
 	  for i in $$files; do \
 -	    dest=`ls -ld $(DESTDIR)$(libsubdir)/include-fixed/$$i | sed -n 's/.*-> //p'`; \
 +	    dest=`ls -ld $(DESTDIR)$(libsubdir)/include/$$i | sed -n 's/.*-> //p'`; \
 	    if expr "$$dest" : "$$dir.*" > /dev/null; then \
 	      rm -f $(DESTDIR)$(libsubdir)/include-fixed/$$i; \
 -	      ln -s `echo $$i | sed "s|/[^/]*|/..|g" | sed 's|/..$$||'``echo "$$dest" | sed "s|$$dir||"` $(DESTDIR)$(libsubdir)/include-fixed/$$i; \
 +	      ln -s `echo $$i | sed "s|/[^/]*|/..|g" | sed 's|/..$$||'``echo "$$dest" | sed "s|$$dir||"` $(DESTDIR)$(libsubdir)/include/$$i; \
 	    fi; \
 	  done; \
 	fi
@@ -4288,9 +4288,6 @@
 # Create or recreate the gcc private include file directory.
 install-include-dir: installdirs
 	$(mkinstalldirs) $(DESTDIR)$(libsubdir)/include
 -	-rm -rf $(DESTDIR)$(libsubdir)/include-fixed
 -	mkdir $(DESTDIR)$(libsubdir)/include-fixed
 -	-chmod a+rx $(DESTDIR)$(libsubdir)/include-fixed
 
 # Create or recreate the install-tools include file directory.
 itoolsdir = $(libexecsubdir)/install-tools
@@ -4308,7 +4305,7 @@
 	(cd `${PWD_COMMAND}`/include ; \
 	 tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include; tar xpf - )
 	(cd `${PWD_COMMAND}`/include-fixed ; \
 -	 tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include-fixed; tar xpf - )
 +	 tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include; tar xpf - )
 # /bin/sh on some systems returns the status of the first tar,
 # and that can lose with GNU tar which always writes a full block.
 # So use `exit 0' to ignore its exit status.
@@ -4319,7 +4316,7 @@
 	cd `${PWD_COMMAND}`/include ; \
 	find . -print | cpio -pdum $(DESTDIR)$(libsubdir)/include
 	cd `${PWD_COMMAND}`/include-fixed ; \
 -	find . -print | cpio -pdum $(DESTDIR)$(libsubdir)/include-fixed
 +	find . -print | cpio -pdum $(DESTDIR)$(libsubdir)/include
 
 # Install the include directory using cp.
 install-headers-cp: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir
@@ -4329,11 +4326,11 @@
 # Targets without dependencies, for use in prev-gcc during bootstrap.
 real-install-headers-tar:
 	(cd `${PWD_COMMAND}`/include-fixed ; \
 -	 tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include-fixed; tar xpf - )
 +	 tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include; tar xpf - )
 
 real-install-headers-cpio:
 	cd `${PWD_COMMAND}`/include-fixed ; \
 -	find . -print | cpio -pdum $(DESTDIR)$(libsubdir)/include-fixed
 +	find . -print | cpio -pdum $(DESTDIR)$(libsubdir)/include
 
 real-install-headers-cp:
 	cp -p -r include-fixed $(DESTDIR)$(libsubdir)
--- a/base/gcc/no-install-libiberty.patch
+++ b/base/gcc/no-install-libiberty.patch
@ -1,36 +0,0 @@
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../gcc/no-install-libiberty.patch
 # Copyright (C) 2007 - 2009 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 #
 # More information can be found in the files COPYING and README.
 #
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # --- SDE-COPYRIGHT-NOTE-END ---

 libiberty is installed by binutils too, we have traditionally prefered that one.

 --- gcc-4.2.4/libiberty/Makefile.in.vanilla	2007-05-10 10:22:04.869363200 +0200
 +++ gcc-4.2.4/libiberty/Makefile.in	2007-05-10 10:22:39.339327532 +0200
@@ -344,8 +342,8 @@
 install_to_libdir: all
 -	${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR)
 -	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n
 -	( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n )
 -	mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)
 +	#${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR)
 +	#$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n
 +	#( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n )
 +	#mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)
 	if test -n "${target_header_dir}"; then \
 	  case "${target_header_dir}" in \
 	    /*)    thd=${target_header_dir};; \

--- a/base/gcc/no-libstdc++.patch.toolchain
+++ b/base/gcc/no-libstdc++.patch.toolchain
@ -1,34 +0,0 @@
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../gcc/no-libstdc++.patch.toolchain
 # Copyright (C) 2007 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
 #
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # --- SDE-COPYRIGHT-NOTE-END ---

 We first only build the c++ compiler for the toolchain cross-compiler. Later,
 in the next stage, when we have cross built the C library, we also build the
 libstdc++ STL.

  - Rene Rebe <rene@exactcode.de>

 --- ./configure.orig	2005-11-24 11:58:19.000000000 +0100
 +++ ./configure	2005-11-24 11:58:10.000000000 +0100
@@ -1001,7 +1001,7 @@
    
 
 # Skipdirs are removed silently.
 -skipdirs=
 +skipdirs=target-libstdc++-v3
 # Noconfigdirs are removed loudly.
 noconfigdirs=""
 
--- a/base/gcc/no-libvtv.patch.toolchain
+++ b/base/gcc/no-libvtv.patch.toolchain
@ -0,0 +1,24 @@
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../gcc/no-libvtv.patch.toolchain
 # Copyright (C) 2016 The OpenSDE Project
 # Copyright (C) 2015 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
 #
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # --- SDE-COPYRIGHT-NOTE-END ---

 --- gcc-5.1.0/libvtv/configure.tgt.vanilla	2015-01-29 08:03:56.000000000 +0000
 +++ gcc-5.1.0/libvtv/configure.tgt	2015-04-24 10:25:07.980000000 +0000
@@ -43,3 +43,4 @@
   *)
 	;;
 esac
 +VTV_SUPPORTED=no
--- a/base/gcc/stdc++-include_next.patch
+++ b/base/gcc/stdc++-include_next.patch
@ -0,0 +1,54 @@
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../gcc/stdc++-include_next.patch
 # Copyright (C) 2016 The OpenSDE Project
 # Copyright (C) 2008 - 2009 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
 #
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # --- SDE-COPYRIGHT-NOTE-END ---

 During cross builds g++ does not find the toolchain stddef.h header, as the
 include dir was scanned before including the cstddef header. Also my
 understanding of include_next is to include the next, simillar named file -
 not some completely different file.

  - Rene Rebe <rene@exactcode.de>

 --- gcc-4.3.1/libstdc++-v3/include/c/cstddef.vanilla	2008-08-13 13:48:12.000000000 +0200
 +++ gcc-4.3.1/libstdc++-v3/include/c/cstddef	2008-08-13 13:49:11.000000000 +0200
@@ -40,6 +40,6 @@
 #define __need_ptrdiff_t
 #define __need_NULL
 #define __need_offsetof
 -#include_next <stddef.h>
 +#include <stddef.h>
 
 #endif
 --- gcc-4.3.1/libstdc++-v3/include/c/cstdarg.vanilla	2008-08-18 15:10:20.000000000 +0200
 +++ gcc-4.3.1/libstdc++-v3/include/c/cstdarg	2008-08-18 15:10:23.000000000 +0200
@@ -37,6 +37,6 @@
 #pragma GCC system_header
 
 #undef __need___va_list
 -#include_next <stdarg.h>
 +#include <stdarg.h>
 
 #endif
 --- ./libstdc++-v3/include/c/climits.orig	2006-12-07 10:35:57.000000000 +0100
 +++ ./libstdc++-v3/include/c/climits	2009-08-14 15:28:14.000000000 +0200
@@ -36,6 +36,6 @@
 
 #pragma GCC system_header
 
 -#include_next <limits.h>
 +#include <limits.h>
 
 #endif