merge of '22a005b824014688c2c41c2dba34c42bf145a946'

     and '8e90244a719ea0f6cc33218bf925484a5a4e1855'

55 files changed, 341 insertions, 101 deletions

diff --git a/packages/gcc/gcc-3.3.3/zecke-xgcc-cpp.patch b/packages/gcc/gcc-3.3.3/zecke-xgcc-cpp.patch
new file mode 100644
index 0000000000..d12562761f
--- /dev/null
+++ b/packages/gcc/gcc-3.3.3/zecke-xgcc-cpp.patch
@@ -0,0 +1,13 @@
+Index: gcc-3.3.3/Makefile.in
+===================================================================
+--- gcc-3.3.3.orig/Makefile.in	2003-07-05 04:37:08.000000000 +0200
++++ gcc-3.3.3/Makefile.in	2006-08-06 12:57:53.000000000 +0200
+@@ -1355,6 +1355,8 @@
+ 	    AS="$(AS_FOR_TARGET)"; export AS; \
+ 	    CC="$(CC_FOR_TARGET)"; export CC; \
+ 	    CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
++	    CPP="$(CC_FOR_TARGET) -E"; export CPP; \
++	    CPPFLAGS=""; export CPPFLAGS; \
+ 	    CXX="$(CXX_FOR_TARGET)"; export CXX; \
+ 	    CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+ 	    GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
diff --git a/packages/gcc/gcc-3.3.4/zecke-xgcc-cpp.patch b/packages/gcc/gcc-3.3.4/zecke-xgcc-cpp.patch
new file mode 100644
index 0000000000..d42ab6d57d
--- /dev/null
+++ b/packages/gcc/gcc-3.3.4/zecke-xgcc-cpp.patch
@@ -0,0 +1,13 @@
+Index: gcc-3.3.4/Makefile.in
+===================================================================
+--- gcc-3.3.4.orig/Makefile.in	2003-07-05 04:37:08.000000000 +0200
++++ gcc-3.3.4/Makefile.in	2006-08-06 13:00:16.000000000 +0200
+@@ -1355,6 +1355,8 @@
+ 	    AS="$(AS_FOR_TARGET)"; export AS; \
+ 	    CC="$(CC_FOR_TARGET)"; export CC; \
+ 	    CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
++	    CPP="$(CC_FOR_TARGET) -E"; export CPP; \
++	    CPPFLAGS=""; export CPPFLAGS; \
+ 	    CXX="$(CXX_FOR_TARGET)"; export CXX; \
+ 	    CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+ 	    GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
diff --git a/packages/gcc/gcc-3.4.3/zecke-xgcc-cpp.patch b/packages/gcc/gcc-3.4.3/zecke-xgcc-cpp.patch
new file mode 100644
index 0000000000..08e7a3124d
--- /dev/null
+++ b/packages/gcc/gcc-3.4.3/zecke-xgcc-cpp.patch
@@ -0,0 +1,16 @@
+In contrast to the other versions this only patches libstdc++
+
+
+Index: gcc-3.4.3/Makefile.in
+===================================================================
+--- gcc-3.4.3.orig/Makefile.in	2004-11-05 05:14:05.000000000 +0100
++++ gcc-3.4.3/Makefile.in	2006-08-06 13:03:37.000000000 +0200
+@@ -21964,6 +21964,8 @@
+ 	AS="$(AS_FOR_TARGET)"; export AS; \
+ 	CC="$(CC_FOR_TARGET)"; export CC; \
+ 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
++	CPP="$(CC_FOR_TARGET) -E"; export CCP; \
++	CPPFLAGS=""; export CPPFLAGS; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ 	CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+ 	CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
diff --git a/packages/gcc/gcc-3.4.4/zecke-xgcc-cpp.patch b/packages/gcc/gcc-3.4.4/zecke-xgcc-cpp.patch
new file mode 100644
index 0000000000..ab6a3fd771
--- /dev/null
+++ b/packages/gcc/gcc-3.4.4/zecke-xgcc-cpp.patch
@@ -0,0 +1,13 @@
+Index: gcc-3.4.4/Makefile.in
+===================================================================
+--- gcc-3.4.4.orig/Makefile.in	2005-05-19 11:58:00.000000000 +0200
++++ gcc-3.4.4/Makefile.in	2006-08-06 13:08:14.000000000 +0200
+@@ -21964,6 +21964,8 @@
+ 	AS="$(AS_FOR_TARGET)"; export AS; \
+ 	CC="$(CC_FOR_TARGET)"; export CC; \
+ 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
++	CPP="$(CC_FOR_TARGET) -E"; export CCP; \
++	CPPFLAGS=""; export CPPFLAGS; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ 	CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+ 	CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
diff --git a/packages/gcc/gcc-4.0.0/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.0.0/zecke-xgcc-cpp.patch
new file mode 100644
index 0000000000..436eff02ae
--- /dev/null
+++ b/packages/gcc/gcc-4.0.0/zecke-xgcc-cpp.patch
@@ -0,0 +1,12 @@
+Index: gcc-4.0.0/Makefile.in
+===================================================================
+--- gcc-4.0.0.orig/Makefile.in	2005-04-21 09:04:10.000000000 +0200
++++ gcc-4.0.0/Makefile.in	2006-08-06 13:14:07.000000000 +0200
+@@ -197,6 +197,7 @@
+ 	AS="$(AS_FOR_TARGET)"; export AS; \
+ 	CC="$(CC_FOR_TARGET)"; export CC; \
+ 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
++	CPP="$(CC_FOR_TARGET) -E"; export CCP; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+ 	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
diff --git a/packages/gcc/gcc-4.0.2/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.0.2/zecke-xgcc-cpp.patch
new file mode 100644
index 0000000000..ba7d7257d9
--- /dev/null
+++ b/packages/gcc/gcc-4.0.2/zecke-xgcc-cpp.patch
@@ -0,0 +1,12 @@
+Index: gcc-4.0.2/Makefile.in
+===================================================================
+--- gcc-4.0.2.orig/Makefile.in	2006-08-06 13:17:09.000000000 +0200
++++ gcc-4.0.2/Makefile.in	2006-08-06 13:18:35.000000000 +0200
+@@ -197,6 +197,7 @@
+ 	AS="$(AS_FOR_TARGET)"; export AS; \
+ 	CC="$(CC_FOR_TARGET)"; export CC; \
+ 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
++	CPP="$(CC_FOR_TARGET) -E"; export CCP; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+ 	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
diff --git a/packages/gcc/gcc-4.1-20060217/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.1-20060217/zecke-xgcc-cpp.patch
new file mode 100644
index 0000000000..8b53f653c6
--- /dev/null
+++ b/packages/gcc/gcc-4.1-20060217/zecke-xgcc-cpp.patch
@@ -0,0 +1,12 @@
+Index: gcc-4.1-20060217/Makefile.in
+===================================================================
+--- gcc-4.1-20060217.orig/Makefile.in	2005-12-15 15:02:02.000000000 +0100
++++ gcc-4.1-20060217/Makefile.in	2006-08-06 13:23:23.000000000 +0200
+@@ -194,6 +194,7 @@
+ 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
+ 	CC="$(CC_FOR_TARGET)"; export CC; \
+ 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
++	CPP="$(CC_FOR_TARGET) -E"; export CCP; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+ 	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
diff --git a/packages/gcc/gcc-4.1.0/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.1.0/zecke-xgcc-cpp.patch
new file mode 100644
index 0000000000..120cf55a0f
--- /dev/null
+++ b/packages/gcc/gcc-4.1.0/zecke-xgcc-cpp.patch
@@ -0,0 +1,12 @@
+Index: gcc-4.1.0/Makefile.in
+===================================================================
+--- gcc-4.1.0.orig/Makefile.in	2005-12-15 15:02:02.000000000 +0100
++++ gcc-4.1.0/Makefile.in	2006-08-06 13:29:36.000000000 +0200
+@@ -194,6 +194,7 @@
+ 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
+ 	CC="$(CC_FOR_TARGET)"; export CC; \
+ 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
++	CPP="$(CC_FOR_TARGET) -E"; export CCP; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+ 	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
diff --git a/packages/gcc/gcc-4.1.1/cse.patch b/packages/gcc/gcc-4.1.1/cse.patch
new file mode 100644
index 0000000000..88b22c714f
--- /dev/null
+++ b/packages/gcc/gcc-4.1.1/cse.patch
@@ -0,0 +1,75 @@
+-- gcc-4_1-branch/gcc/cse.c	2006/07/20 14:20:26	115619
++++ gcc-4_1-branch/gcc/cse.c	2006/07/20 15:07:25	115620
+@@ -4697,6 +4697,8 @@
+   unsigned src_const_hash;
+   /* Table entry for constant equivalent for SET_SRC, if any.  */
+   struct table_elt *src_const_elt;
++  /* Table entry for the destination address.  */
++  struct table_elt *dest_addr_elt;
+ };
+ 
+ static void
+@@ -5936,6 +5938,40 @@
+ 	 so that the destination goes into that class.  */
+       sets[i].src_elt = src_eqv_elt;
+ 
++  /* Record destination addresses in the hash table.  This allows us to
++     check if they are invalidated by other sets.  */
++  for (i = 0; i < n_sets; i++)
++    {
++      if (sets[i].rtl)
++	{
++	  rtx x = sets[i].inner_dest;
++	  struct table_elt *elt;
++	  enum machine_mode mode;
++	  unsigned hash;
++
++	  if (MEM_P (x))
++	    {
++	      x = XEXP (x, 0);
++	      mode = GET_MODE (x);
++	      hash = HASH (x, mode);
++	      elt = lookup (x, hash, mode);
++	      if (!elt)
++		{
++		  if (insert_regs (x, NULL, 0))
++		    {
++		      rehash_using_reg (x);
++		      hash = HASH (x, mode);
++		    }
++		  elt = insert (x, NULL, hash, mode);
++		}
++
++	      sets[i].dest_addr_elt = elt;
++	    }
++	  else
++	    sets[i].dest_addr_elt = NULL;
++	}
++    }
++
+   invalidate_from_clobbers (x);
+ 
+   /* Some registers are invalidated by subroutine calls.  Memory is
+@@ -6028,12 +6064,20 @@
+     }
+ 
+   /* We may have just removed some of the src_elt's from the hash table.
+-     So replace each one with the current head of the same class.  */
++     So replace each one with the current head of the same class.
++     Also check if destination addresses have been removed.  */
+ 
+   for (i = 0; i < n_sets; i++)
+     if (sets[i].rtl)
+       {
+-	if (sets[i].src_elt && sets[i].src_elt->first_same_value == 0)
++	if (sets[i].dest_addr_elt
++	    && sets[i].dest_addr_elt->first_same_value == 0)
++	  {
++	    /* The elt was removed, which means this destination s not
++	       valid after this instruction.  */
++	    sets[i].rtl = NULL_RTX;
++	  }
++	else if (sets[i].src_elt && sets[i].src_elt->first_same_value == 0)
+ 	  /* If elt was removed, find current head of same class,
+ 	     or 0 if nothing remains of that class.  */
+ 	  {
diff --git a/packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch
new file mode 100644
index 0000000000..42ec190600
--- /dev/null
+++ b/packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch
@@ -0,0 +1,12 @@
+Index: gcc-4.1.1/Makefile.in
+===================================================================
+--- gcc-4.1.1.orig/Makefile.in	2006-08-06 13:32:44.000000000 +0200
++++ gcc-4.1.1/Makefile.in	2006-08-06 13:32:46.000000000 +0200
+@@ -194,6 +194,7 @@
+ 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
+ 	CC="$(CC_FOR_TARGET)"; export CC; \
+ 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
++	CPP="$(CC_FOR_TARGET) -E"; export CCP; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+ 	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
diff --git a/packages/gcc/gcc-4.2-20060513/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.2-20060513/zecke-xgcc-cpp.patch
new file mode 100644
index 0000000000..ba7d7257d9
--- /dev/null
+++ b/packages/gcc/gcc-4.2-20060513/zecke-xgcc-cpp.patch
@@ -0,0 +1,12 @@
+Index: gcc-4.0.2/Makefile.in
+===================================================================
+--- gcc-4.0.2.orig/Makefile.in	2006-08-06 13:17:09.000000000 +0200
++++ gcc-4.0.2/Makefile.in	2006-08-06 13:18:35.000000000 +0200
+@@ -197,6 +197,7 @@
+ 	AS="$(AS_FOR_TARGET)"; export AS; \
+ 	CC="$(CC_FOR_TARGET)"; export CC; \
+ 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
++	CPP="$(CC_FOR_TARGET) -E"; export CCP; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+ 	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
diff --git a/packages/gcc/gcc-cross-initial_3.3.3.bb b/packages/gcc/gcc-cross-initial_3.3.3.bb
index e3b365da18..c650e4fe57 100644
--- a/packages/gcc/gcc-cross-initial_3.3.3.bb
+++ b/packages/gcc/gcc-cross-initial_3.3.3.bb
@@ -1,5 +1,5 @@
 SECTION = "devel"
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
 DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
diff --git a/packages/gcc/gcc-cross-initial_3.3.4.bb b/packages/gcc/gcc-cross-initial_3.3.4.bb
index e3b365da18..c650e4fe57 100644
--- a/packages/gcc/gcc-cross-initial_3.3.4.bb
+++ b/packages/gcc/gcc-cross-initial_3.3.4.bb
@@ -1,5 +1,5 @@
 SECTION = "devel"
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
 DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
diff --git a/packages/gcc/gcc-cross-initial_3.4.3.bb b/packages/gcc/gcc-cross-initial_3.4.3.bb
index 48c80864e2..307c6f7d4c 100644
--- a/packages/gcc/gcc-cross-initial_3.4.3.bb
+++ b/packages/gcc/gcc-cross-initial_3.4.3.bb
@@ -1,4 +1,4 @@
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
 DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
diff --git a/packages/gcc/gcc-cross-initial_3.4.4.bb b/packages/gcc/gcc-cross-initial_3.4.4.bb
index 48c80864e2..307c6f7d4c 100644
--- a/packages/gcc/gcc-cross-initial_3.4.4.bb
+++ b/packages/gcc/gcc-cross-initial_3.4.4.bb
@@ -1,4 +1,4 @@
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
 DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
diff --git a/packages/gcc/gcc-cross-initial_4.0.2.bb b/packages/gcc/gcc-cross-initial_4.0.2.bb
index 68dafe3f1a..037f3032a6 100644
--- a/packages/gcc/gcc-cross-initial_4.0.2.bb
+++ b/packages/gcc/gcc-cross-initial_4.0.2.bb
@@ -1,4 +1,4 @@
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
 DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
diff --git a/packages/gcc/gcc-cross-initial_4.1-20060217.bb b/packages/gcc/gcc-cross-initial_4.1-20060217.bb
index 68dafe3f1a..037f3032a6 100644
--- a/packages/gcc/gcc-cross-initial_4.1-20060217.bb
+++ b/packages/gcc/gcc-cross-initial_4.1-20060217.bb
@@ -1,4 +1,4 @@
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
 DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
diff --git a/packages/gcc/gcc-cross-initial_4.1.0.bb b/packages/gcc/gcc-cross-initial_4.1.0.bb
index 63308c2cfe..1e23ef9330 100644
--- a/packages/gcc/gcc-cross-initial_4.1.0.bb
+++ b/packages/gcc/gcc-cross-initial_4.1.0.bb
@@ -1,4 +1,4 @@
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
 DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
diff --git a/packages/gcc/gcc-cross-initial_4.1.1.bb b/packages/gcc/gcc-cross-initial_4.1.1.bb
index 63308c2cfe..1e23ef9330 100644
--- a/packages/gcc/gcc-cross-initial_4.1.1.bb
+++ b/packages/gcc/gcc-cross-initial_4.1.1.bb
@@ -1,4 +1,4 @@
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
 DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
diff --git a/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb b/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
index 48c80864e2..307c6f7d4c 100644
--- a/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
@@ -1,4 +1,4 @@
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
 DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
diff --git a/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb b/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb
index 48c80864e2..307c6f7d4c 100644
--- a/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb
+++ b/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb
@@ -1,4 +1,4 @@
-include gcc-cross_${PV}.bb
+require gcc-cross_${PV}.bb
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
 DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
diff --git a/packages/gcc/gcc-cross-kernel-3.3.3_3.3.3.bb b/packages/gcc/gcc-cross-kernel-3.3.3_3.3.3.bb
index 7db2409093..7f274bee30 100644
--- a/packages/gcc/gcc-cross-kernel-3.3.3_3.3.3.bb
+++ b/packages/gcc/gcc-cross-kernel-3.3.3_3.3.3.bb
@@ -2,7 +2,7 @@ SECTION = "devel"
 # cut-down gcc for kernel builds
 # only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc.
 
-include gcc-cross-initial_${PV}.bb
+require gcc-cross-initial_${PV}.bb
 
 PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}"
 
diff --git a/packages/gcc/gcc-cross-kernel-3.3.4_3.3.4.bb b/packages/gcc/gcc-cross-kernel-3.3.4_3.3.4.bb
index 7db2409093..7f274bee30 100644
--- a/packages/gcc/gcc-cross-kernel-3.3.4_3.3.4.bb
+++ b/packages/gcc/gcc-cross-kernel-3.3.4_3.3.4.bb
@@ -2,7 +2,7 @@ SECTION = "devel"
 # cut-down gcc for kernel builds
 # only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc.
 
-include gcc-cross-initial_${PV}.bb
+require gcc-cross-initial_${PV}.bb
 
 PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}"
 
diff --git a/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb b/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb
index 368cbb1e47..03c6ce2b86 100644
--- a/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb
+++ b/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb
@@ -2,7 +2,7 @@ SECTION = "devel"
 # cut-down gcc for kernel builds
 # only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc.
 
-include gcc-cross-initial_${PV}.bb
+require gcc-cross-initial_${PV}.bb
 
 PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}"
 
diff --git a/packages/gcc/gcc-cross-sdk_3.3.4.bb b/packages/gcc/gcc-cross-sdk_3.3.4.bb
index deb92c9b32..4b2c583fcb 100644
--- a/packages/gcc/gcc-cross-sdk_3.3.4.bb
+++ b/packages/gcc/gcc-cross-sdk_3.3.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
-include gcc_${PV}.bb
+require gcc_${PV}.bb
 PR = "r3"
 
 inherit sdk
@@ -12,5 +12,5 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PACKAGES = "${PN}"
 
-include gcc3-build-sdk.inc
-include gcc-package-sdk.inc
+require gcc3-build-sdk.inc
+require gcc-package-sdk.inc
diff --git a/packages/gcc/gcc-cross-sdk_3.4.3.bb b/packages/gcc/gcc-cross-sdk_3.4.3.bb
index 205606331e..e6907deb1b 100644
--- a/packages/gcc/gcc-cross-sdk_3.4.3.bb
+++ b/packages/gcc/gcc-cross-sdk_3.4.3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
-include gcc_${PV}.bb
+require gcc_${PV}.bb
 PR = "r0"
 
 inherit sdk
@@ -12,5 +12,5 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PACKAGES = "${PN}"
 
-include gcc3-build-sdk.inc
-include gcc-package-sdk.inc
+require gcc3-build-sdk.inc
+require gcc-package-sdk.inc
diff --git a/packages/gcc/gcc-cross-sdk_3.4.4.bb b/packages/gcc/gcc-cross-sdk_3.4.4.bb
index 205606331e..e6907deb1b 100644
--- a/packages/gcc/gcc-cross-sdk_3.4.4.bb
+++ b/packages/gcc/gcc-cross-sdk_3.4.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
-include gcc_${PV}.bb
+require gcc_${PV}.bb
 PR = "r0"
 
 inherit sdk
@@ -12,5 +12,5 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PACKAGES = "${PN}"
 
-include gcc3-build-sdk.inc
-include gcc-package-sdk.inc
+require gcc3-build-sdk.inc
+require gcc-package-sdk.inc
diff --git a/packages/gcc/gcc-cross-sdk_4.1.0.bb b/packages/gcc/gcc-cross-sdk_4.1.0.bb
index 671ee68b36..7233f79504 100644
--- a/packages/gcc/gcc-cross-sdk_4.1.0.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
-include gcc_${PV}.bb
+require gcc_${PV}.bb
 PR = "r0"
 
 inherit sdk
@@ -12,5 +12,5 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PACKAGES = "${PN}"
 
-include gcc4-build-sdk.inc
-include gcc-package-sdk.inc
+require gcc4-build-sdk.inc
+require gcc-package-sdk.inc
diff --git a/packages/gcc/gcc-cross_3.3.3.bb b/packages/gcc/gcc-cross_3.3.3.bb
index 44ba65269e..a24752fe89 100644
--- a/packages/gcc/gcc-cross_3.3.3.bb
+++ b/packages/gcc/gcc-cross_3.3.3.bb
@@ -1,5 +1,5 @@
 SECTION = "devel"
-include gcc_${PV}.bb
+require gcc_${PV}.bb
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 
diff --git a/packages/gcc/gcc-cross_3.3.4.bb b/packages/gcc/gcc-cross_3.3.4.bb
index 597b47fba8..f7a2cded51 100644
--- a/packages/gcc/gcc-cross_3.3.4.bb
+++ b/packages/gcc/gcc-cross_3.3.4.bb
@@ -1,6 +1,6 @@
 SECTION = "devel"
-include gcc_${PV}.bb
-include gcc-paths-cross.inc
+require gcc_${PV}.bb
+require gcc-paths-cross.inc
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 
@@ -9,5 +9,5 @@ PR="r3"
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
-include gcc3-build-cross.inc
-include gcc-package-cross.inc
\ No newline at end of file
+require gcc3-build-cross.inc
+require gcc-package-cross.inc
\ No newline at end of file
diff --git a/packages/gcc/gcc-cross_3.4.3.bb b/packages/gcc/gcc-cross_3.4.3.bb
index a5d1bda170..b61223b39c 100644
--- a/packages/gcc/gcc-cross_3.4.3.bb
+++ b/packages/gcc/gcc-cross_3.4.3.bb
@@ -1,6 +1,6 @@
-include gcc_${PV}.bb
+require gcc_${PV}.bb
 # path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+require gcc-paths-cross.inc
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
@@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # cross build
-include gcc3-build-cross.inc
+require gcc3-build-cross.inc
 # cross packaging
-include gcc-package-cross.inc
+require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_3.4.4.bb b/packages/gcc/gcc-cross_3.4.4.bb
index d965e5b399..ef679365e1 100644
--- a/packages/gcc/gcc-cross_3.4.4.bb
+++ b/packages/gcc/gcc-cross_3.4.4.bb
@@ -1,6 +1,6 @@
-include gcc_${PV}.bb
+require gcc_${PV}.bb
 # path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+require gcc-paths-cross.inc
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
@@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # cross build
-include gcc3-build-cross.inc
+require gcc3-build-cross.inc
 # cross packaging
-include gcc-package-cross.inc
+require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_4.0.0.bb b/packages/gcc/gcc-cross_4.0.0.bb
index 6e299e8299..d2dc240126 100644
--- a/packages/gcc/gcc-cross_4.0.0.bb
+++ b/packages/gcc/gcc-cross_4.0.0.bb
@@ -1,6 +1,6 @@
-include gcc_${PV}.bb
+require gcc_${PV}.bb
 # path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+require gcc-paths-cross.inc
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
@@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # cross build
-include gcc3-build-cross.inc
+require gcc3-build-cross.inc
 # cross packaging
-include gcc-package-cross.inc
+require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_4.0.2.bb b/packages/gcc/gcc-cross_4.0.2.bb
index 6e299e8299..d2dc240126 100644
--- a/packages/gcc/gcc-cross_4.0.2.bb
+++ b/packages/gcc/gcc-cross_4.0.2.bb
@@ -1,6 +1,6 @@
-include gcc_${PV}.bb
+require gcc_${PV}.bb
 # path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+require gcc-paths-cross.inc
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
@@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # cross build
-include gcc3-build-cross.inc
+require gcc3-build-cross.inc
 # cross packaging
-include gcc-package-cross.inc
+require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_4.1-20060217.bb b/packages/gcc/gcc-cross_4.1-20060217.bb
index 6e299e8299..d2dc240126 100644
--- a/packages/gcc/gcc-cross_4.1-20060217.bb
+++ b/packages/gcc/gcc-cross_4.1-20060217.bb
@@ -1,6 +1,6 @@
-include gcc_${PV}.bb
+require gcc_${PV}.bb
 # path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+require gcc-paths-cross.inc
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
@@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # cross build
-include gcc3-build-cross.inc
+require gcc3-build-cross.inc
 # cross packaging
-include gcc-package-cross.inc
+require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb
index 4b0b5a1311..4e380c5f66 100644
--- a/packages/gcc/gcc-cross_4.1.0.bb
+++ b/packages/gcc/gcc-cross_4.1.0.bb
@@ -1,6 +1,6 @@
-include gcc_${PV}.bb
+require gcc_${PV}.bb
 # path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+require gcc-paths-cross.inc
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
@@ -11,8 +11,8 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # cross build
-include gcc3-build-cross.inc
+require gcc3-build-cross.inc
 # cross packaging
-include gcc-package-cross.inc
+require gcc-package-cross.inc
 
 EXTRA_OECONF += "--with-mpfr=${STAGING_DIR}/${BUILD_SYS}"
diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb
index 4e3805b676..4c530175f3 100644
--- a/packages/gcc/gcc-cross_4.1.1.bb
+++ b/packages/gcc/gcc-cross_4.1.1.bb
@@ -1,18 +1,18 @@
-include gcc_${PV}.bb
+require gcc_${PV}.bb
 # path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+require gcc-paths-cross.inc
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r5"
+PR = "r6"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # cross build
-include gcc3-build-cross.inc
+require gcc3-build-cross.inc
 # cross packaging
-include gcc-package-cross.inc
+require gcc-package-cross.inc
 
 EXTRA_OECONF += "--with-mpfr=${STAGING_DIR}/${BUILD_SYS}"
diff --git a/packages/gcc/gcc-cross_4.2-20060513.bb b/packages/gcc/gcc-cross_4.2-20060513.bb
index 4b0b5a1311..4e380c5f66 100644
--- a/packages/gcc/gcc-cross_4.2-20060513.bb
+++ b/packages/gcc/gcc-cross_4.2-20060513.bb
@@ -1,6 +1,6 @@
-include gcc_${PV}.bb
+require gcc_${PV}.bb
 # path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+require gcc-paths-cross.inc
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
@@ -11,8 +11,8 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # cross build
-include gcc3-build-cross.inc
+require gcc3-build-cross.inc
 # cross packaging
-include gcc-package-cross.inc
+require gcc-package-cross.inc
 
 EXTRA_OECONF += "--with-mpfr=${STAGING_DIR}/${BUILD_SYS}"
diff --git a/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
index 044383cb84..7ea8a0d166 100644
--- a/packages/gcc/gcc-cross_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
@@ -1,6 +1,6 @@
-include gcc_csl-arm-2005q3.bb
+require gcc_csl-arm-2005q3.bb
 # path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+require gcc-paths-cross.inc
 inherit cross
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
@@ -10,6 +10,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # cross build
-include gcc3-cross-build.inc
+require gcc3-build-cross.inc
 # cross packaging
-include gcc-package-cross.inc
+require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-cvs.bb b/packages/gcc/gcc-cross_csl-arm-cvs.bb
index f83de2598d..b894c2a86e 100644
--- a/packages/gcc/gcc-cross_csl-arm-cvs.bb
+++ b/packages/gcc/gcc-cross_csl-arm-cvs.bb
@@ -1,6 +1,6 @@
-include gcc_csl-arm-cvs.bb
+require gcc_csl-arm-cvs.bb
 # path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+require gcc-paths-cross.inc
 inherit cross
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
@@ -10,6 +10,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # cross build
-include gcc3-cross-build.inc
+require gcc3-build-cross.inc
 # cross packaging
-include gcc-package-cross.inc
+require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_csl-arm.bb b/packages/gcc/gcc-cross_csl-arm.bb
index 3be3c603a5..95bda6c95e 100644
--- a/packages/gcc/gcc-cross_csl-arm.bb
+++ b/packages/gcc/gcc-cross_csl-arm.bb
@@ -1,6 +1,6 @@
-include gcc_csl-arm.bb
+require gcc_csl-arm.bb
 # path mangling, needed by the cross packaging
-include gcc-paths-cross.inc
+require gcc-paths-cross.inc
 inherit cross
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
@@ -10,6 +10,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # cross build
-include gcc3-cross-build.inc
+require gcc3-build-cross.inc
 # cross packaging
-include gcc-package-cross.inc
+require gcc-package-cross.inc
diff --git a/packages/gcc/gcc4-build-sdk.inc b/packages/gcc/gcc4-build-sdk.inc
new file mode 100644
index 0000000000..e2ec9565a7
--- /dev/null
+++ b/packages/gcc/gcc4-build-sdk.inc
@@ -0,0 +1,27 @@
+USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
+
+SRC_URI += 'file://sdk-libstdc++-includes.patch;patch=1'
+
+STAGING_TARGET_INCDIR = "${STAGING_DIR}/${TARGET_SYS}/include"
+STAGING_TARGET_LIBDIR = "${STAGING_DIR}/${TARGET_SYS}/lib"
+
+do_configure () {
+       (cd ${S} && gnu-configize) || die "failure running gnu-configize"
+       (cd ${S}/libstdc++-v3 && autoreconf)
+       oe_runconf
+       mkdir -p gcc
+       ln -sf ${CROSS_DIR}/bin/${TARGET_PREFIX}as gcc/as
+       ln -sf ${CROSS_DIR}/bin/${TARGET_PREFIX}ld gcc/ld
+       ln -sf ${STAGING_TARGET_INCDIR}/* ${S}/include
+       ln -sf ${STAGING_TARGET_LIBDIR}/crt*.o gcc/
+}
+
+do_compile () {
+	export CC="${BUILD_CC}"
+	export AR_FOR_TARGET="${TARGET_SYS}-ar"
+	export RANLIB_FOR_TARGET="${TARGET_SYS}-ranlib"
+	export LD_FOR_TARGET="${TARGET_SYS}-ld"
+	export NM_FOR_TARGET="${TARGET_SYS}-nm"
+	export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc ${TARGET_CC_ARCH}"
+	oe_runmake CFLAGS_FOR_TARGET="-I${STAGING_TARGET_INCDIR}"
+}
diff --git a/packages/gcc/gcc_3.3.3.bb b/packages/gcc/gcc_3.3.3.bb
index 7f0091a18e..f46c481f69 100644
--- a/packages/gcc/gcc_3.3.3.bb
+++ b/packages/gcc/gcc_3.3.3.bb
@@ -93,6 +93,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://gcc-uclibc-3.3-110-conf.patch;patch=1 \
 	file://gcc-uclibc-3.3-120-softfloat.patch;patch=1 \
 	file://gcc-uclibc-3.3-200-code.patch;patch=1 \
+	file://zecke-xgcc-cpp.patch;patch=1 \
 	file://bash3.patch;patch=1"
 
 MIRRORS_prepend () {
diff --git a/packages/gcc/gcc_3.3.4.bb b/packages/gcc/gcc_3.3.4.bb
index dc3a66cd29..4a1d146dbb 100644
--- a/packages/gcc/gcc_3.3.4.bb
+++ b/packages/gcc/gcc_3.3.4.bb
@@ -70,6 +70,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://gcc-uclibc-3.3-110-conf.patch;patch=1 \
 	   file://gcc-uclibc-3.3-120-softfloat.patch;patch=1 \
 	   file://gcc-uclibc-3.3-200-code.patch;patch=1 \
+	   file://zecke-xgcc-cpp.patch;patch=1 \
 	   file://bash3.patch;patch=1"
 
 PREMIRRORS_prepend () {
diff --git a/packages/gcc/gcc_3.4.3.bb b/packages/gcc/gcc_3.4.3.bb
index 1cd108aa34..906465b1a9 100644
--- a/packages/gcc/gcc_3.4.3.bb
+++ b/packages/gcc/gcc_3.4.3.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 
 inherit autotools gettext
 
-include gcc-package.inc
+require gcc-package.inc
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://gcc34-reverse-compare.patch;patch=1 \
@@ -23,6 +23,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://GCC3.4.0VisibilityPatch.diff;patch=1 \
 	   file://15342.patch;patch=1 \
 	   file://always-fixincperm.patch;patch=1 \
-	   file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1"
+	   file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1 \
+	   file://zecke-xgcc-cpp.patch;patch=1 "
 
-include gcc3-build.inc
+require gcc3-build.inc
diff --git a/packages/gcc/gcc_3.4.4.bb b/packages/gcc/gcc_3.4.4.bb
index 579678066f..fece12cab0 100644
--- a/packages/gcc/gcc_3.4.4.bb
+++ b/packages/gcc/gcc_3.4.4.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 
 inherit autotools gettext
 
-include gcc-package.inc
+require gcc-package.inc
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://gcc34-reverse-compare.patch;patch=1 \
@@ -23,10 +23,11 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://GCC3.4.0VisibilityPatch.diff;patch=1 \
 	   file://15342.patch;patch=1 \
 	   file://always-fixincperm.patch;patch=1 \
-	   file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1"
+	   file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1 \
+	   file://zecke-xgcc-cpp.patch;patch=1 "
 
 SRC_URI += "file://gcc34-configure.in.patch;patch=1"
 SRC_URI += "file://gcc34-thumb-support.patch;patch=1"
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-include gcc3-build.inc
+require gcc3-build.inc
diff --git a/packages/gcc/gcc_4.0.0.bb b/packages/gcc/gcc_4.0.0.bb
index af54c17fb8..cf9d704c45 100644
--- a/packages/gcc/gcc_4.0.0.bb
+++ b/packages/gcc/gcc_4.0.0.bb
@@ -7,10 +7,11 @@ MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 
 inherit autotools gettext
 
-include gcc-package.inc
+require gcc-package.inc
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
+	file://zecke-xgcc-cpp.patch;patch=1 \
 	file://ldflags.patch;patch=1"
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-include gcc4-build.inc
+require gcc4-build.inc
diff --git a/packages/gcc/gcc_4.0.2.bb b/packages/gcc/gcc_4.0.2.bb
index a83a030c8b..73ff96e28c 100644
--- a/packages/gcc/gcc_4.0.2.bb
+++ b/packages/gcc/gcc_4.0.2.bb
@@ -8,13 +8,14 @@ PR = "r3"
 
 inherit autotools gettext
 
-include gcc-package.inc
+require gcc-package.inc
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://arm-nolibfloat.patch;patch=1 \
 	file://arm-softfloat.patch;patch=1 \
 	file://ldflags.patch;patch=1 \
-	file://GCOV_PREFIX_STRIP-cross-profile_4.1.patch;patch=1"
+	file://GCOV_PREFIX_STRIP-cross-profile_4.1.patch;patch=1 \
+	file://zecke-xgcc-cpp.patch;patch=1 "
 
 # uclibc patches below
 SRC_URI_append = " file://100-uclibc-conf.patch;patch=1   \
@@ -28,7 +29,7 @@ SRC_URI_append = " file://100-uclibc-conf.patch;patch=1   \
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
 
-include gcc4-build.inc
+require gcc4-build.inc
 
 EXTRA_OECONF += "--disable-libssp"
 
diff --git a/packages/gcc/gcc_4.1-20060217.bb b/packages/gcc/gcc_4.1-20060217.bb
index 66880d752b..6889f04a36 100644
--- a/packages/gcc/gcc_4.1-20060217.bb
+++ b/packages/gcc/gcc_4.1-20060217.bb
@@ -7,13 +7,14 @@ DEFAULT_PREFERENCE = "-99999"
 
 inherit autotools gettext
 
-include gcc-package.inc
+require gcc-package.inc
 
 SRC_URI = "http://ftp.nluug.nl/languages/gcc/snapshots/4.1-20060217/gcc-4.1-20060217.tar.bz2 \
 	file://arm-nolibfloat.patch;patch=1 \
 	file://arm-softfloat.patch;patch=1 \
+	file://zecke-xgcc-cpp.patch;patch=1 \
 	file://ldflags.patch;patch=1"
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-include gcc4-build.inc
+require gcc4-build.inc
diff --git a/packages/gcc/gcc_4.1.0.bb b/packages/gcc/gcc_4.1.0.bb
index 4d44978dab..862a1dfe5b 100644
--- a/packages/gcc/gcc_4.1.0.bb
+++ b/packages/gcc/gcc_4.1.0.bb
@@ -7,16 +7,17 @@ DEFAULT_PREFERENCE = "-1"
 
 inherit autotools gettext
 
-include gcc-package.inc
+require gcc-package.inc
 
 SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2 \
 	file://arm-nolibfloat.patch;patch=1 \
 	file://arm-softfloat.patch;patch=1 \
+	file://zecke-xgcc-cpp.patch;patch=1 \
 	file://ldflags.patch;patch=1"
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-include gcc4-build.inc
+require gcc4-build.inc
 EXTRA_OECONF += "--disable-libssp"
 
 FORTRAN = ""
diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb
index c5af490b17..e2d3d25ea8 100644
--- a/packages/gcc/gcc_4.1.1.bb
+++ b/packages/gcc/gcc_4.1.1.bb
@@ -1,4 +1,4 @@
-PR = "r5"
+PR = "r6"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 
 inherit autotools gettext
 
-include gcc-package.inc
+require gcc-package.inc
 
 SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \
 	file://100-uclibc-conf.patch;patch=1 \
@@ -25,7 +25,9 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \
 	file://gcc41-configure.in.patch;patch=1 \
 	file://arm-thumb.patch;patch=1 \
 	file://arm-thumb-cache.patch;patch=1 \
-	file://ldflags.patch;patch=1"
+	file://ldflags.patch;patch=1 \
+	file://cse.patch;patch=1 \
+	file://zecke-xgcc-cpp.patch;patch=1 "
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
@@ -38,7 +40,7 @@ HAS_G2C = "no"
 JAVA_arm = ""  
 
 LANGUAGES = "c,c++"
-include gcc3-build.inc
+require gcc3-build.inc
 
 
 EXTRA_OECONF += " --disable-libssp "
diff --git a/packages/gcc/gcc_4.2-20060513.bb b/packages/gcc/gcc_4.2-20060513.bb
index 68fa6d8d06..8960469a18 100644
--- a/packages/gcc/gcc_4.2-20060513.bb
+++ b/packages/gcc/gcc_4.2-20060513.bb
@@ -7,16 +7,17 @@ DEFAULT_PREFERENCE = "-1"
 
 inherit autotools gettext
 
-include gcc-package.inc
+require gcc-package.inc
 
 SRC_URI = "http://ftp.nluug.nl/languages/gcc/snapshots/${PV}/gcc-${PV}.tar.bz2 \
 	file://arm-nolibfloat.patch;patch=1 \
 	file://arm-softfloat.patch;patch=1 \
+	file://zecke-xgcc-cpp.patch;patch=1 \
 	file://ldflags.patch;patch=1"
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-include gcc4-build.inc
+require gcc4-build.inc
 EXTRA_OECONF += "--disable-libssp"
 
 FORTRAN = ""
diff --git a/packages/gcc/gcc_csl-arm-2005q3.bb b/packages/gcc/gcc_csl-arm-2005q3.bb
index 02e984358f..d1053dad1d 100644
--- a/packages/gcc/gcc_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc_csl-arm-2005q3.bb
@@ -10,7 +10,7 @@ FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
 
 inherit autotools gettext
 
-include gcc-package.inc
+require gcc-package.inc
 
 SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm/2005q3-2/arm-2005q3-2-arm-none-linux-gnueabi.src.tar.bz2 \
            file://gcc_optab_arm.patch;patch=1"
@@ -22,6 +22,6 @@ do_unpack2() {
 
 addtask unpack2 after do_unpack before do_patch
 
-include gcc3-build.inc
+require gcc3-build.inc
 
 S = "${WORKDIR}/gcc-2005q3"
diff --git a/packages/gcc/gcc_csl-arm-cvs.bb b/packages/gcc/gcc_csl-arm-cvs.bb
index bc704d51db..20b18b1085 100644
--- a/packages/gcc/gcc_csl-arm-cvs.bb
+++ b/packages/gcc/gcc_csl-arm-cvs.bb
@@ -1,4 +1,4 @@
-include gcc_csl-arm.bb
+require gcc_csl-arm.bb
 
 PV = "3.4.4+csl-arm-${SRCDATE}"
 BINV = "3.4.4"
diff --git a/packages/gcc/gcc_csl-arm.bb b/packages/gcc/gcc_csl-arm.bb
index d437ece065..5bf4fb0b99 100644
--- a/packages/gcc/gcc_csl-arm.bb
+++ b/packages/gcc/gcc_csl-arm.bb
@@ -12,12 +12,12 @@ DEFAULT_PREFERENCE = "-1"
 
 inherit autotools gettext
 
-include gcc-package.inc
+require gcc-package.inc
 
 SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/cvsroot/gcc;method=pserver;tag=csl-arm-branch;module=gcc;date=${SRCDATE} \
 	   file://gcc34-arm-tune.patch;patch=1"
 
-include gcc3-build.inc
+require gcc3-build.inc
 
 S = "${WORKDIR}/gcc"