From a58b26f88e2a4377e8c22f3a1269672815799c8c Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 15 Mar 2008 13:39:18 +0000
Subject: gcc: Create .inc files for each gcc version and update all .bb files
 to use these

---
 packages/gcc/gcc-3.3.3.inc          | 192 +++++++++++++++++++++++++++++++++++
 packages/gcc/gcc-3.3.4.inc          | 171 ++++++++++++++++++++++++++++++++
 packages/gcc/gcc-3.4.3.inc          |  28 ++++++
 packages/gcc/gcc-3.4.4.inc          |  33 ++++++
 packages/gcc/gcc-4.0.0.inc          |  16 +++
 packages/gcc/gcc-4.0.2.inc          |  37 +++++++
 packages/gcc/gcc-4.1.0.inc          |  27 +++++
 packages/gcc/gcc-4.1.1.inc          |  61 ++++++++++++
 packages/gcc/gcc-4.1.2.inc          |  76 ++++++++++++++
 packages/gcc/gcc-4.2.1.inc          | 110 ++++++++++++++++++++
 packages/gcc/gcc-4.2.2.inc          |  96 ++++++++++++++++++
 packages/gcc/gcc-cross-sdk_3.3.4.bb |   2 +-
 packages/gcc/gcc-cross-sdk_3.4.3.bb |   2 +-
 packages/gcc/gcc-cross-sdk_3.4.4.bb |   2 +-
 packages/gcc/gcc-cross-sdk_4.1.0.bb |   2 +-
 packages/gcc/gcc-cross-sdk_4.1.1.bb |   2 +-
 packages/gcc/gcc-cross-sdk_4.1.2.bb |   2 +-
 packages/gcc/gcc-cross-sdk_4.2.2.bb |   2 +-
 packages/gcc/gcc-cross_3.3.3.bb     |   2 +-
 packages/gcc/gcc-cross_3.3.4.bb     |   2 +-
 packages/gcc/gcc-cross_3.4.3.bb     |   2 +-
 packages/gcc/gcc-cross_3.4.4.bb     |   2 +-
 packages/gcc/gcc-cross_4.0.0.bb     |   2 +-
 packages/gcc/gcc-cross_4.0.2.bb     |   2 +-
 packages/gcc/gcc-cross_4.1.0.bb     |   2 +-
 packages/gcc/gcc-cross_4.1.1.bb     |   2 +-
 packages/gcc/gcc-cross_4.1.2.bb     |   2 +-
 packages/gcc/gcc-cross_4.2.1.bb     |   2 +-
 packages/gcc/gcc-cross_4.2.2.bb     |   2 +-
 packages/gcc/gcc-csl-arm-2005q3.inc |  29 ++++++
 packages/gcc/gcc-csl-arm-cvs.inc    |  10 ++
 packages/gcc/gcc-csl-arm.inc        |  22 ++++
 packages/gcc/gcc_3.3.3.bb           | 193 +-----------------------------------
 packages/gcc/gcc_3.3.4.bb           | 172 +-------------------------------
 packages/gcc/gcc_3.4.3.bb           |  29 +-----
 packages/gcc/gcc_3.4.4.bb           |  34 +------
 packages/gcc/gcc_4.0.0.bb           |  17 +---
 packages/gcc/gcc_4.0.2.bb           |  38 +------
 packages/gcc/gcc_4.1.0.bb           |  28 +-----
 packages/gcc/gcc_4.1.1.bb           |  62 +-----------
 packages/gcc/gcc_4.1.2.bb           |  77 +-------------
 packages/gcc/gcc_4.2.1.bb           | 111 +--------------------
 packages/gcc/gcc_4.2.2.bb           |  97 +-----------------
 packages/gcc/gcc_csl-arm-2005q3.bb  |  30 +-----
 packages/gcc/gcc_csl-arm-cvs.bb     |  11 +-
 packages/gcc/gcc_csl-arm.bb         |  23 +----
 46 files changed, 940 insertions(+), 926 deletions(-)
 create mode 100644 packages/gcc/gcc-3.3.3.inc
 create mode 100644 packages/gcc/gcc-3.3.4.inc
 create mode 100644 packages/gcc/gcc-3.4.3.inc
 create mode 100644 packages/gcc/gcc-3.4.4.inc
 create mode 100644 packages/gcc/gcc-4.0.0.inc
 create mode 100644 packages/gcc/gcc-4.0.2.inc
 create mode 100644 packages/gcc/gcc-4.1.0.inc
 create mode 100644 packages/gcc/gcc-4.1.1.inc
 create mode 100644 packages/gcc/gcc-4.1.2.inc
 create mode 100644 packages/gcc/gcc-4.2.1.inc
 create mode 100644 packages/gcc/gcc-4.2.2.inc
 create mode 100644 packages/gcc/gcc-csl-arm-2005q3.inc
 create mode 100644 packages/gcc/gcc-csl-arm-cvs.inc
 create mode 100644 packages/gcc/gcc-csl-arm.inc

diff --git a/packages/gcc/gcc-3.3.3.inc b/packages/gcc/gcc-3.3.3.inc
new file mode 100644
index 0000000000..ea34debc64
--- /dev/null
+++ b/packages/gcc/gcc-3.3.3.inc
@@ -0,0 +1,192 @@
+SECTION = "devel"
+PR = "r3"
+inherit autotools gettext
+
+DESCRIPTION = "The GNU cc and gcc C compilers."
+HOMEPAGE = "http://www.gnu.org/software/gcc/"
+LICENSE = "GPL"
+
+# libgcc libstdc++ libg2c are listed in our FILES_*, but are actually
+# packaged in the respective cross packages.
+PACKAGES = "${PN} ${PN}-symlinks \
+            ${PN}-c++ ${PN}-c++-symlinks \
+            ${PN}-f77 ${PN}-f77-symlinks \
+            libstdc++-dev libg2c-dev \
+            ${PN}-doc"
+
+FILES_${PN} = "${bindir}/${TARGET_PREFIX}gcc \
+	       ${bindir}/${TARGET_PREFIX}cpp \
+	       ${bindir}/${TARGET_PREFIX}gcov \
+	       ${bindir}/${TARGET_PREFIX}gccbug \
+	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/cc1 \
+	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/collect2 \
+	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/crt* \
+	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/specs \
+	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/lib* \
+	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/include"
+
+FILES_${PN}-symlinks = "${bindir}/cc \
+			${bindir}/gcc \
+			${bindir}/cpp \
+			${bindir}/gcov \
+			${bindir}/gccbug"
+
+FILES_${PN}-c++ = "${bindir}/${TARGET_PREFIX}g++ \
+		   ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/cc1plus"
+
+FILES_${PN}-c++-symlinks = "${bindir}/c++ \
+			    ${bindir}/g++"
+
+FILES_libgcc = "/lib/libgcc_s.so.*"
+
+# Called from within gcc-cross, so libdir is set wrong
+#FILES_libstdc++ = "${libdir}/libstdc++.so.*"
+FILES_libstdc++ = "${libdir}/libstdc++.so.*"
+
+FILES_libstdc++-dev = "${includedir}/c++/${PV} \
+		       ${libdir}/libstdc++.so \
+		       ${libdir}/libstdc++.la \
+		       ${libdir}/libstdc++.a \
+		       ${libdir}/libsupc++.la \
+		       ${libdir}/libsupc++.a"
+
+FILES_${PN}-doc = "${infodir} \
+		   ${mandir} \
+		   ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/include/README"
+
+SRC_URI = "${GNU_MIRROR}/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2 \
+	   file://config.sub.patch;patch=1 \
+	   file://empty6.patch;patch=1 \
+	   file://pr10392-1-test.patch;patch=1 \
+	   file://pr10412-1-test.patch;patch=1 \
+	   file://pr10589-1-test.patch;patch=1 \
+	   file://pr11162-1-test.patch;patch=1 \
+	   file://pr11587-1-test.patch;patch=1 \
+	   file://pr11608.patch;patch=1 \
+	   file://pr11736-1-test.patch;patch=1 \
+	   file://pr11864-1-test.patch;patch=1 \
+	   file://pr12009.patch;patch=1 \
+	   file://pr12010.patch;patch=1 \
+	   file://pr13260-test.patch;patch=1 \
+	   file://pr9365-1-test.patch;patch=1 \
+	   file://sh-lib1funcs_sizeAndType.patch;patch=1 \
+	   file://sh-pic-set_fpscr-gcc-3.3.2.patch;patch=1 \
+	   file://thunk3.patch;patch=1 \
+	   file://arm-10730.dpatch;patch=1;pnum=0 \
+	   file://arm-12527.dpatch;patch=1;pnum=0 \
+	   file://arm-14558.dpatch;patch=1;pnum=0 \
+	   file://arm-common.dpatch;patch=1;pnum=0 \
+	   file://arm-gotoff.dpatch;patch=1;pnum=0 \
+	   file://arm-ldm.dpatch;patch=1;pnum=0 \
+	   file://arm-tune.patch;patch=1;pnum=0 \
+	   file://arm-xscale.patch;patch=1;pnum=0 \
+	   file://arm-14302.patch;patch=1;pnum=0 \
+	   file://arm-ldm-peephole.patch;patch=1;pnum=0 \
+	   file://libibery-crosstool.patch;patch=1;pnum=1 \
+	   file://reverse-compare.patch;patch=1 \
+	   file://gcc34-15089.patch;patch=1 \
+	file://gcc-uclibc-3.3-100-conf.patch;patch=1 \
+	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 () {
+${GNU_MIRROR}/gcc/releases/	http://gcc.get-software.com/releases/
+}
+
+S = "${WORKDIR}/gcc-${PV}"
+B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
+
+EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']} \
+                --with-gnu-ld \
+                --enable-shared \
+                --enable-multilib \
+                --enable-target-optspace \
+                --enable-languages=c,c++,f77 \
+                --enable-threads=posix \
+                --enable-c99 \
+                --enable-long-long \
+                --enable-symvers=gnu \
+                --program-prefix=${TARGET_PREFIX} \
+                ${EXTRA_OECONF_PATHS} \
+                ${EXTRA_OECONF_DEP}"
+
+EXTRA_OECONF_PATHS = "--with-local-prefix=${prefix}/local \
+                      --with-gxx-include-dir=${includedir}/c++/${PV}"
+
+EXTRA_OECONF_DEP = ""
+EXTRA_OECONF_uclibc = "--disable-__cxa_atexit"
+EXTRA_OECONF_glibc = "--enable-__cxa_atexit"
+EXTRA_OECONF += "${@get_gcc_fpu_setting(bb, d)}"
+
+require gcc-fpu.inc
+
+python __anonymous () {
+    import bb, re
+    if (re.match('linux-uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None):
+        bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d)
+    elif (re.match('linux$', bb.data.getVar('TARGET_OS', d, 1)) != None):
+        bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d)
+}
+
+do_configure () {
+	# Setup these vars for cross building only
+	if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
+		export CC_FOR_TARGET="${CCACHE} ${HOST_PREFIX}gcc"
+		export GCC_FOR_TARGET="${CCACHE} ${HOST_PREFIX}gcc"
+		export CXX_FOR_TARGET="${CCACHE} ${HOST_PREFIX}g++"
+		export AS_FOR_TARGET="${HOST_PREFIX}as"
+		export LD_FOR_TARGET="${HOST_PREFIX}ld"
+		export NM_FOR_TARGET="${HOST_PREFIX}nm"
+		export AR_FOR_TARGET="${HOST_PREFIX}ar"
+		export RANLIB_FOR_TARGET="${HOST_PREFIX}ranlib"
+	fi
+	(cd ${S} && gnu-configize) || die "failure running gnu-configize"
+	oe_runconf
+}
+
+do_install () {
+	autotools_do_install
+
+	# Cleanup some of the gcc-lib stuff
+	rm -rf ${D}${libdir}/gcc-lib/${TARGET_SYS}/${PV}/install-tools
+
+	# Move libgcc_s into /lib
+	mkdir -p ${D}${base_libdir}
+	mv -f ${D}${libdir}/libgcc_s.so.* ${D}${base_libdir}
+	rm -f ${D}${libdir}/libgcc_s.so
+	ln -sf `echo ${libdir}/gcc-lib/${TARGET_SYS}/${PV} | tr -s / |
+		sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.? \
+		${D}${libdir}/gcc-lib/${TARGET_SYS}/${PV}/libgcc_s.so
+
+	# Cleanup manpages..
+	rm -rf ${D}${mandir}/man7
+	mv ${D}${mandir}/man1/cpp.1 \
+	   ${D}${mandir}/man1/${TARGET_SYS}-cpp.1
+	mv ${D}${mandir}/man1/gcov.1 \
+	   ${D}${mandir}/man1/${TARGET_SYS}-gcov.1
+
+	# We use libiberty from binutils
+	rm -f ${D}${libdir}/libiberty.a
+
+	cd ${D}${bindir}
+
+	# We care about g++ not c++
+	rm -f *c++
+
+	# We don't care about the gcc-<version> ones for this
+	rm -f *gcc-?.?*
+
+	# These sometimes show up, they are strange, we remove them
+	rm -f ${TARGET_ARCH}-*${TARGET_ARCH}-*
+
+	# Symlinks so we can use these trivially on the target
+	ln -sf ${TARGET_SYS}-g77 g77
+	ln -sf ${TARGET_SYS}-g++ g++
+	ln -sf ${TARGET_SYS}-gcc gcc
+	ln -sf g77 f77
+	ln -sf g++ c++
+	ln -sf gcc cc
+}
diff --git a/packages/gcc/gcc-3.3.4.inc b/packages/gcc/gcc-3.3.4.inc
new file mode 100644
index 0000000000..294e57d7df
--- /dev/null
+++ b/packages/gcc/gcc-3.3.4.inc
@@ -0,0 +1,171 @@
+SECTION = "devel"
+PR = "r3"
+inherit autotools gettext
+
+DESCRIPTION = "The GNU cc and gcc C compilers."
+HOMEPAGE = "http://www.gnu.org/software/gcc/"
+LICENSE = "GPL"
+
+# libgcc libstdc++ libg2c are listed in our FILES_*, but are actually
+# packaged in the respective cross packages.
+PACKAGES = "${PN} ${PN}-symlinks \
+            ${PN}-c++ ${PN}-c++-symlinks \
+            ${PN}-f77 ${PN}-f77-symlinks \
+            libstdc++-dev libg2c-dev \
+            ${PN}-doc"
+
+FILES_${PN} = "${bindir}/${TARGET_PREFIX}gcc \
+	       ${bindir}/${TARGET_PREFIX}cpp \
+	       ${bindir}/${TARGET_PREFIX}gcov \
+	       ${bindir}/${TARGET_PREFIX}gccbug \
+	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/cc1 \
+	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/collect2 \
+	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/crt* \
+	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/specs \
+	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/lib* \
+	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/include"
+
+FILES_${PN}-symlinks = "${bindir}/cc \
+			${bindir}/gcc \
+			${bindir}/cpp \
+			${bindir}/gcov \
+			${bindir}/gccbug"
+
+FILES_${PN}-c++ = "${bindir}/${TARGET_PREFIX}g++ \
+		   ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/cc1plus"
+
+FILES_${PN}-c++-symlinks = "${bindir}/c++ \
+			    ${bindir}/g++"
+
+FILES_libgcc = "/lib/libgcc_s.so.*"
+
+# Called from within gcc-cross, so libdir is set wrong
+#FILES_libstdc++ = "${libdir}/libstdc++.so.*"
+FILES_libstdc++ = "${libdir}/libstdc++.so.*"
+
+FILES_libstdc++-dev = "${includedir}/c++/${PV} \
+		       ${libdir}/libstdc++.so \
+		       ${libdir}/libstdc++.la \
+		       ${libdir}/libstdc++.a \
+		       ${libdir}/libsupc++.la \
+		       ${libdir}/libsupc++.a"
+
+FILES_${PN}-doc = "${infodir} \
+		   ${mandir} \
+		   ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/include/README"
+
+SRC_URI = "${GNU_MIRROR}/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2 \
+	   file://arm-gotoff.dpatch;patch=1;pnum=0 \
+	   file://arm-ldm.dpatch;patch=1;pnum=0 \
+	   file://arm-tune.patch;patch=1;pnum=0 \
+	   file://arm-ldm-peephole.patch;patch=1;pnum=0 \
+	   file://libibery-crosstool.patch;patch=1;pnum=1 \
+	   file://reverse-compare.patch;patch=1 \
+	   file://gcc34-15089.patch;patch=1 \
+	   file://gcc-uclibc-3.3-100-conf.patch;patch=1 \
+	   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://gcc-com.patch;patch=1 \
+	   file://bash3.patch;patch=1"
+
+PREMIRRORS_prepend () {
+${GNU_MIRROR}/gcc/releases/	ftp://gcc.gnu.org/pub/gcc/releases/
+${GNU_MIRROR}/gcc/releases/	http://gcc.get-software.com/releases/
+}
+
+S = "${WORKDIR}/gcc-${PV}"
+B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
+
+EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']} \
+                --with-gnu-ld \
+                --enable-shared \
+                --enable-multilib \
+                --enable-target-optspace \
+                --enable-languages=c,c++,f77 \
+                --enable-threads=posix \
+                --enable-c99 \
+                --enable-long-long \
+                --enable-symvers=gnu \
+                --program-prefix=${TARGET_PREFIX} \
+                ${EXTRA_OECONF_PATHS} \
+                ${EXTRA_OECONF_DEP}"
+
+EXTRA_OECONF_PATHS = "--with-local-prefix=${prefix}/local \
+                      --with-gxx-include-dir=${includedir}/c++/${PV}"
+
+EXTRA_OECONF_DEP = ""
+EXTRA_OECONF_uclibc = "--disable-__cxa_atexit"
+EXTRA_OECONF_glibc = "--enable-__cxa_atexit"
+EXTRA_OECONF += "${@get_gcc_fpu_setting(bb, d)}"
+
+require gcc-fpu.inc
+
+python __anonymous () {
+    import bb, re
+    if (re.match('linux-uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None):
+        bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d)
+    elif (re.match('linux$', bb.data.getVar('TARGET_OS', d, 1)) != None):
+        bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d)
+}
+
+do_configure () {
+	# Setup these vars for cross building only
+	if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
+		export CC_FOR_TARGET="${CCACHE} ${HOST_PREFIX}gcc"
+		export GCC_FOR_TARGET="${CCACHE} ${HOST_PREFIX}gcc"
+		export CXX_FOR_TARGET="${CCACHE} ${HOST_PREFIX}g++"
+		export AS_FOR_TARGET="${HOST_PREFIX}as"
+		export LD_FOR_TARGET="${HOST_PREFIX}ld"
+		export NM_FOR_TARGET="${HOST_PREFIX}nm"
+		export AR_FOR_TARGET="${HOST_PREFIX}ar"
+		export RANLIB_FOR_TARGET="${HOST_PREFIX}ranlib"
+	fi
+	(cd ${S} && gnu-configize) || die "failure running gnu-configize"
+	oe_runconf
+}
+
+do_install () {
+	autotools_do_install
+
+	# Cleanup some of the gcc-lib stuff
+	rm -rf ${D}${libdir}/gcc-lib/${TARGET_SYS}/${PV}/install-tools
+
+	# Move libgcc_s into /lib
+	mkdir -p ${D}${base_libdir}
+	mv -f ${D}${libdir}/libgcc_s.so.* ${D}${base_libdir}
+	rm -f ${D}${libdir}/libgcc_s.so
+	ln -sf `echo ${libdir}/gcc-lib/${TARGET_SYS}/${PV} | tr -s / |
+		sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.? \
+		${D}${libdir}/gcc-lib/${TARGET_SYS}/${PV}/libgcc_s.so
+
+	# Cleanup manpages..
+	rm -rf ${D}${mandir}/man7
+	mv ${D}${mandir}/man1/cpp.1 \
+	   ${D}${mandir}/man1/${TARGET_SYS}-cpp.1
+	mv ${D}${mandir}/man1/gcov.1 \
+	   ${D}${mandir}/man1/${TARGET_SYS}-gcov.1
+
+	# We use libiberty from binutils
+	rm -f ${D}${libdir}/libiberty.a
+
+	cd ${D}${bindir}
+
+	# We care about g++ not c++
+	rm -f *c++
+
+	# We don't care about the gcc-<version> ones for this
+	rm -f *gcc-?.?*
+
+	# These sometimes show up, they are strange, we remove them
+	rm -f ${TARGET_ARCH}-*${TARGET_ARCH}-*
+
+	# Symlinks so we can use these trivially on the target
+	ln -sf ${TARGET_SYS}-g77 g77
+	ln -sf ${TARGET_SYS}-g++ g++
+	ln -sf ${TARGET_SYS}-gcc gcc
+	ln -sf g77 f77
+	ln -sf g++ c++
+	ln -sf gcc cc
+}
diff --git a/packages/gcc/gcc-3.4.3.inc b/packages/gcc/gcc-3.4.3.inc
new file mode 100644
index 0000000000..c4d6df955d
--- /dev/null
+++ b/packages/gcc/gcc-3.4.3.inc
@@ -0,0 +1,28 @@
+PR = "r12"
+DESCRIPTION = "The GNU cc and gcc C compilers."
+HOMEPAGE = "http://www.gnu.org/software/gcc/"
+SECTION = "devel"
+LICENSE = "GPL"
+
+inherit autotools gettext
+
+require gcc-package.inc
+
+SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
+	   file://gcc34-reverse-compare.patch;patch=1 \
+	   file://gcc34-arm-ldm.patch;patch=1 \
+	   file://gcc34-arm-ldm-peephole.patch;patch=1 \
+	   file://gcc34-arm-tune.patch;patch=1 \
+	   file://gcc-3.4.1-uclibc-100-conf.patch;patch=1 \
+	   file://gcc-3.4.1-uclibc-200-locale.patch;patch=1 \
+	   file://gcc-3.4.0-arm-lib1asm.patch;patch=1 \
+	   file://gcc-3.4.0-arm-nolibfloat.patch;patch=1 \
+	   file://gcc-3.4.0-arm-bigendian.patch;patch=1 \
+	   file://gcc-3.4.0-arm-bigendian-uclibc.patch;patch=1 \
+	   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://zecke-xgcc-cpp.patch;patch=1 "
+
+require gcc3-build.inc
diff --git a/packages/gcc/gcc-3.4.4.inc b/packages/gcc/gcc-3.4.4.inc
new file mode 100644
index 0000000000..4694d3ac5e
--- /dev/null
+++ b/packages/gcc/gcc-3.4.4.inc
@@ -0,0 +1,33 @@
+PR = "r7"
+DESCRIPTION = "The GNU cc and gcc C compilers."
+HOMEPAGE = "http://www.gnu.org/software/gcc/"
+SECTION = "devel"
+LICENSE = "GPL"
+
+inherit autotools gettext
+
+require gcc-package.inc
+
+SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
+	   file://gcc34-reverse-compare.patch;patch=1 \
+	   file://gcc34-arm-ldm.patch;patch=1 \
+	   file://gcc34-arm-ldm-peephole.patch;patch=1 \
+	   file://gcc34-arm-tune.patch;patch=1 \
+	   file://gcc-3.4.1-uclibc-100-conf.patch;patch=1 \
+	   file://gcc-3.4.1-uclibc-200-locale.patch;patch=1 \
+	   file://gcc-3.4.0-arm-lib1asm.patch;patch=1 \
+	   file://gcc-3.4.0-arm-nolibfloat.patch;patch=1 \
+	   file://gcc-3.4.0-arm-bigendian.patch;patch=1 \
+	   file://gcc-3.4.0-arm-bigendian-uclibc.patch;patch=1 \
+	   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://zecke-xgcc-cpp.patch;patch=1 \
+	   file://gcc4-mtune-compat.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 "
+
+require gcc3-build.inc
diff --git a/packages/gcc/gcc-4.0.0.inc b/packages/gcc/gcc-4.0.0.inc
new file mode 100644
index 0000000000..9f75bf1f54
--- /dev/null
+++ b/packages/gcc/gcc-4.0.0.inc
@@ -0,0 +1,16 @@
+DESCRIPTION = "The GNU cc and gcc C compilers."
+HOMEPAGE = "http://www.gnu.org/software/gcc/"
+SECTION = "devel"
+LICENSE = "GPL"
+PR = "r3"
+
+inherit autotools gettext
+
+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 "
+
+require gcc4-build.inc
diff --git a/packages/gcc/gcc-4.0.2.inc b/packages/gcc/gcc-4.0.2.inc
new file mode 100644
index 0000000000..2945592659
--- /dev/null
+++ b/packages/gcc/gcc-4.0.2.inc
@@ -0,0 +1,37 @@
+DESCRIPTION = "The GNU cc and gcc C compilers."
+HOMEPAGE = "http://www.gnu.org/software/gcc/"
+SECTION = "devel"
+LICENSE = "GPL"
+DEPENDS = "mpfr gmp"
+PR = "r7"
+
+inherit autotools gettext
+
+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://zecke-xgcc-cpp.patch;patch=1 "
+
+# uclibc patches below
+SRC_URI_append = " file://100-uclibc-conf.patch;patch=1   \
+                   file://200-uclibc-locale.patch;patch=1 \
+                   file://301-missing-execinfo_h.patch;patch=1 \
+                   file://302-c99-snprintf.patch;patch=1  \
+                   file://303-c99-complex-ugly-hack.patch;patch=1 \
+                   file://800-arm-bigendian.patch;patch=1 \
+                   file://zecke-host-cpp-ac-hack.patch;patch=1 \
+		   file://gcc-4.0.2-atmel.0.99.2.patch;patch=1 \
+		   "
+
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+
+
+require gcc4-build.inc
+
+EXTRA_OECONF += "--disable-libssp"
+
+FORTRAN = ""
diff --git a/packages/gcc/gcc-4.1.0.inc b/packages/gcc/gcc-4.1.0.inc
new file mode 100644
index 0000000000..6a5f607729
--- /dev/null
+++ b/packages/gcc/gcc-4.1.0.inc
@@ -0,0 +1,27 @@
+DESCRIPTION = "The GNU cc and gcc C compilers."
+HOMEPAGE = "http://www.gnu.org/software/gcc/"
+SECTION = "devel"
+LICENSE = "GPL"
+PR = "r3"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit autotools gettext
+
+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 \
+    file://pr34130.patch;patch=1"
+
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+
+require gcc4-build.inc
+EXTRA_OECONF += "--disable-libssp"
+
+FORTRAN = ""
+
+
diff --git a/packages/gcc/gcc-4.1.1.inc b/packages/gcc/gcc-4.1.1.inc
new file mode 100644
index 0000000000..4b538219b3
--- /dev/null
+++ b/packages/gcc/gcc-4.1.1.inc
@@ -0,0 +1,61 @@
+DESCRIPTION = "The GNU cc and gcc C compilers."
+HOMEPAGE = "http://www.gnu.org/software/gcc/"
+SECTION = "devel"
+LICENSE = "GPL"
+PR = "r18"
+
+inherit autotools gettext
+
+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 \
+	file://110-arm-eabi.patch;patch=1 \
+	file://200-uclibc-locale.patch;patch=1 \
+	file://300-libstdc++-pic.patch;patch=1 \
+	file://301-missing-execinfo_h.patch;patch=1 \
+	file://302-c99-snprintf.patch;patch=1 \
+	file://303-c99-complex-ugly-hack.patch;patch=1 \
+	file://304-index_macro.patch;patch=1 \
+	file://602-sdk-libstdc++-includes.patch;patch=1 \
+	file://740-sh-pr24836.patch;patch=1 \
+	file://800-arm-bigendian.patch;patch=1 \
+	file://801-arm-bigendian-eabi.patch;patch=1 \
+	file://arm-nolibfloat.patch;patch=1 \
+	file://arm-softfloat.patch;patch=1 \
+	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://cse.patch;patch=1 \
+	file://zecke-xgcc-cpp.patch;patch=1 \
+	file://unbreak-armv4t.patch;patch=1 \
+        file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
+        file://gcc-4.1.1-pr13685-1.patch;patch=1 \
+        file://gcc-ignore-cache.patch;patch=1 \
+        file://gcc-4.1.1-e300cx.patch;patch=1 \
+        file://pr34130.patch;patch=1 \
+	"
+
+SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
+
+#This is a dirty hack to get gcc 4.1.1 to compile for glibc AND uclibc on ppc
+#the patch that is need it to get gcc support soft-floats with glibc, makes gcc fail with uclibc
+SRC_URI_append_linux = " file://ppc-gcc-41-20060515.patch;patch=1 \
+                         file://ppc-sfp-long-double-gcc411-7.patch;patch=1 "
+
+
+#Set the fortran bits
+# 'fortran' or '', not 'f77' like gcc3 had
+FORTRAN = ""
+
+#Set the java bits
+JAVA_arm = ""
+JAVA = ""
+
+LANGUAGES = "c,c++${FORTRAN}${JAVA}"
+require gcc3-build.inc
+
+
+EXTRA_OECONF += " --disable-libssp "
+
diff --git a/packages/gcc/gcc-4.1.2.inc b/packages/gcc/gcc-4.1.2.inc
new file mode 100644
index 0000000000..fc75e942bb
--- /dev/null
+++ b/packages/gcc/gcc-4.1.2.inc
@@ -0,0 +1,76 @@
+DESCRIPTION = "The GNU cc and gcc C compilers."
+HOMEPAGE = "http://www.gnu.org/software/gcc/"
+SECTION = "devel"
+LICENSE = "GPL"
+# NOTE: split PR.  If the main .bb changes something that affects its *build*
+# remember to increment the -cross .bb PR too.
+PR = "r11"
+
+inherit autotools gettext
+
+require gcc-package.inc
+
+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 \
+	file://100-uclibc-conf.patch;patch=1 \
+	file://110-arm-eabi.patch;patch=1 \
+	file://200-uclibc-locale.patch;patch=1 \
+	file://300-libstdc++-pic.patch;patch=1 \
+	file://301-missing-execinfo_h.patch;patch=1 \
+	file://302-c99-snprintf.patch;patch=1 \
+	file://303-c99-complex-ugly-hack.patch;patch=1 \
+	file://304-index_macro.patch;patch=1 \
+	file://602-sdk-libstdc++-includes.patch;patch=1 \
+	file://740-sh-pr24836.patch;patch=1 \
+	file://800-arm-bigendian.patch;patch=1 \
+	file://arm-nolibfloat.patch;patch=1 \
+	file://arm-softfloat.patch;patch=1 \
+	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://zecke-xgcc-cpp.patch;patch=1 \
+	file://unbreak-armv4t.patch;patch=1 \
+        file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
+	file://cache-amnesia.patch;patch=1 \
+	file://gfortran.patch;patch=1 \
+        file://gcc-4.0.2-e300c2c3.patch;patch=1 \
+        file://pr34130.patch;patch=1 \
+       "
+
+SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
+
+SRC_URI_avr32 = "http://www.angstrom-distribution.org/unstable/sources/gcc-4.1.2-atmel.1.1.0.tar.gz \
+#           file://100-uclibc-conf.patch;patch=1 \
+#           file://200-uclibc-locale.patch;patch=1 \
+#           file://300-libstdc++-pic.patch;patch=1 \
+           file://301-missing-execinfo_h.patch;patch=1 \
+           file://302-c99-snprintf.patch;patch=1 \
+           file://303-c99-complex-ugly-hack.patch;patch=1 \
+           file://304-index_macro.patch;patch=1 \
+           file://602-sdk-libstdc++-includes.patch;patch=1 \
+           file://gcc41-configure.in.patch;patch=1 \
+           file://ldflags.patch;patch=1 \
+           file://zecke-xgcc-cpp.patch;patch=1 \
+           file://cache-amnesia.patch;patch=1 \
+           "
+
+do_compile_prepend_avr32() {
+       ln -sf ${S}/libstdc++-v3/config/os/uclibc/ ${S}/libstdc++-v3/config/os/uclibc-linux
+}
+
+#Set the fortran bits
+# ',fortran' or '', not 'f77' like gcc3 had
+FORTRAN = ""
+
+#Set the java bits
+JAVA = ""
+JAVA_arm = ""
+
+
+LANGUAGES = "c,c++${FORTRAN}${JAVA}"
+require gcc3-build.inc
+ARCH_FLAGS_FOR_TARGET=-isystem${STAGING_INCDIR}
+
+
+EXTRA_OECONF += " --disable-libssp "
+
diff --git a/packages/gcc/gcc-4.2.1.inc b/packages/gcc/gcc-4.2.1.inc
new file mode 100644
index 0000000000..2e74e99ab4
--- /dev/null
+++ b/packages/gcc/gcc-4.2.1.inc
@@ -0,0 +1,110 @@
+DESCRIPTION = "The GNU cc and gcc C compilers."
+HOMEPAGE = "http://www.gnu.org/software/gcc/"
+SECTION = "devel"
+LICENSE = "GPL"
+PR = "r9"
+
+inherit autotools gettext
+
+require gcc-package.inc
+
+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
+	file://100-uclibc-conf.patch;patch=1 \
+	file://103-uclibc-conf-noupstream.patch;patch=1 \
+	file://200-uclibc-locale.patch;patch=1 \
+	file://203-uclibc-locale-no__x.patch;patch=1 \
+	file://204-uclibc-locale-wchar_fix.patch;patch=1 \
+	file://205-uclibc-locale-update.patch;patch=1 \
+	file://300-libstdc++-pic.patch;patch=1 \
+	file://301-missing-execinfo_h.patch;patch=1 \
+	file://302-c99-snprintf.patch;patch=1 \
+	file://303-c99-complex-ugly-hack.patch;patch=1 \
+	file://304-index_macro.patch;patch=1 \
+	file://305-libmudflap-susv3-legacy.patch;patch=1 \
+	file://306-libstdc++-namespace.patch;patch=1 \
+	file://307-locale_facets.patch;patch=1 \
+	file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
+	file://602-sdk-libstdc++-includes.patch;patch=1 \
+	file://740-sh-pr24836.patch;patch=1 \
+	file://800-arm-bigendian.patch;patch=1 \
+	file://904-flatten-switch-stmt-00.patch;patch=1 \
+	file://arm-nolibfloat.patch;patch=1 \
+	file://arm-softfloat.patch;patch=1 \
+	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://zecke-xgcc-cpp.patch;patch=1 \
+	file://unbreak-armv4t.patch;patch=1 \
+	file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
+	file://cache-amnesia.patch;patch=1 \
+	file://gfortran.patch;patch=1 \
+	file://pr34130.patch;patch=1 \
+"
+
+SRC_URI_avr32 = " http://ewi546.ewi.utwente.nl/tmp/avr32-gcc-4.2.1-atmel.1.0.3.tar.gz \
+        file://100-uclibc-conf.patch;patch=1 \
+        file://103-uclibc-conf-noupstream.patch;patch=1 \
+        file://200-uclibc-locale.patch;patch=1 \
+        file://203-uclibc-locale-no__x.patch;patch=1 \
+        file://204-uclibc-locale-wchar_fix.patch;patch=1 \
+        file://205-uclibc-locale-update.patch;patch=1 \
+        file://300-libstdc++-pic.patch;patch=1 \
+        file://301-missing-execinfo_h.patch;patch=1 \
+        file://302-c99-snprintf.patch;patch=1 \
+        file://303-c99-complex-ugly-hack.patch;patch=1 \
+        file://304-index_macro.patch;patch=1 \
+        file://305-libmudflap-susv3-legacy.patch;patch=1 \
+        file://306-libstdc++-namespace.patch;patch=1 \
+        file://307-locale_facets.patch;patch=1 \
+        file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
+        file://602-sdk-libstdc++-includes.patch;patch=1 \
+        file://740-sh-pr24836.patch;patch=1 \
+        file://904-flatten-switch-stmt-00.patch;patch=1 \
+        file://gcc41-configure.in.patch;patch=1 \
+        file://ldflags.patch;patch=1 \
+        file://zecke-xgcc-cpp.patch;patch=1 \
+        file://cache-amnesia.patch;patch=1 \
+        file://gfortran.patch;patch=1 \
+"
+
+SRC_URI_append_ep93xx = " \
+        file://arm-crunch-saveregs.patch;patch=1 \
+        file://arm-crunch-20000320.patch;patch=1 \
+        file://arm-crunch-compare.patch;patch=1 \
+        file://arm-crunch-compare-unordered.patch;patch=1 \
+        file://arm-crunch-compare-geu.patch;patch=1 \
+        file://arm-crunch-eabi-ieee754.patch;patch=1 \
+        file://arm-crunch-eabi-ieee754-div.patch;patch=1 \
+        file://arm-crunch-64bit-disable0.patch;patch=1 \
+        file://arm-crunch-offset.patch;patch=1 \
+        file://arm-crunch-fp_consts.patch;patch=1 \
+        file://arm-crunch-neg2.patch;patch=1 \
+        file://arm-crunch-predicates3.patch;patch=1 \
+        file://arm-crunch-cfcvtds-disable.patch;patch=1 \
+        file://arm-crunch-floatsi-disable.patch;patch=1 \
+        file://arm-crunch-truncsi-disable.patch;patch=1 \
+        file://arm-crunch-cfcvt64-disable.patch;patch=1 \
+        file://arm-crunch-cirrus-bugfixes.patch;patch=1 \
+       "
+
+PACKAGE_ARCH_ep93xx = "${MACHINE_ARCH}"
+
+SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
+
+#Set the fortran bits
+# 'i,fortran' or '', not 'f77' like gcc3 had
+FORTRAN = ""
+FORTRAN_linux-gnueabi = ",fortran"
+
+#Set the java bits
+JAVA = ""
+JAVA_arm = ""
+
+LANGUAGES = "c,c++${FORTRAN}${JAVA}"
+require gcc3-build.inc
+ARCH_FLAGS_FOR_TARGET=-isystem${STAGING_INCDIR}
+
+
+EXTRA_OECONF += " --disable-libgomp --disable-libssp --disable-bootstrap "
+
diff --git a/packages/gcc/gcc-4.2.2.inc b/packages/gcc/gcc-4.2.2.inc
new file mode 100644
index 0000000000..0a0e9cdd16
--- /dev/null
+++ b/packages/gcc/gcc-4.2.2.inc
@@ -0,0 +1,96 @@
+DESCRIPTION = "The GNU cc and gcc C compilers."
+HOMEPAGE = "http://www.gnu.org/software/gcc/"
+SECTION = "devel"
+LICENSE = "GPL"
+PR = "r6"
+
+inherit autotools gettext
+
+require gcc-package.inc
+
+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
+	file://100-uclibc-conf.patch;patch=1 \
+	file://103-uclibc-conf-noupstream.patch;patch=1 \
+	file://200-uclibc-locale.patch;patch=1 \
+	file://203-uclibc-locale-no__x.patch;patch=1 \
+	file://204-uclibc-locale-wchar_fix.patch;patch=1 \
+	file://205-uclibc-locale-update.patch;patch=1 \
+	file://300-libstdc++-pic.patch;patch=1 \
+	file://301-missing-execinfo_h.patch;patch=1 \
+	file://302-c99-snprintf.patch;patch=1 \
+	file://303-c99-complex-ugly-hack.patch;patch=1 \
+	file://304-index_macro.patch;patch=1 \
+	file://305-libmudflap-susv3-legacy.patch;patch=1 \
+	file://306-libstdc++-namespace.patch;patch=1 \
+	file://307-locale_facets.patch;patch=1 \
+	file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
+	file://602-sdk-libstdc++-includes.patch;patch=1 \
+	file://740-sh-pr24836.patch;patch=1 \
+	file://800-arm-bigendian.patch;patch=1 \
+	file://801-arm-bigendian-eabi.patch;patch=1 \
+	file://904-flatten-switch-stmt-00.patch;patch=1 \
+	file://arm-nolibfloat.patch;patch=1 \
+	file://arm-softfloat.patch;patch=1 \
+	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://zecke-xgcc-cpp.patch;patch=1 \
+	file://unbreak-armv4t.patch;patch=1 \
+	file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
+	file://cache-amnesia.patch;patch=1 \
+	file://gfortran.patch;patch=1 \
+	file://gcc-4.0.2-e300c2c3.patch;patch=1 \
+	file://pr34130.patch;patch=1 \
+	file://fortran-static-linking.patch;patch=1 \
+	file://intermask-bigendian.patch;patch=1 \
+"
+
+SRC_URI_append_ep93xx = " \
+        file://arm-crunch-saveregs.patch;patch=1 \
+        file://arm-crunch-20000320.patch;patch=1 \
+        file://arm-crunch-compare.patch;patch=1 \
+        file://arm-crunch-compare-unordered.patch;patch=1 \
+        file://arm-crunch-compare-geu.patch;patch=1 \
+        file://arm-crunch-eabi-ieee754.patch;patch=1 \
+        file://arm-crunch-eabi-ieee754-div.patch;patch=1 \
+        file://arm-crunch-64bit-disable0.patch;patch=1 \
+        file://arm-crunch-offset.patch;patch=1 \
+        file://arm-crunch-fp_consts.patch;patch=1 \
+        file://arm-crunch-neg2.patch;patch=1 \
+        file://arm-crunch-predicates3.patch;patch=1 \
+        file://arm-crunch-cfcvtds-disable.patch;patch=1 \
+        file://arm-crunch-floatsi-disable.patch;patch=1 \
+        file://arm-crunch-truncsi-disable.patch;patch=1 \
+        file://arm-crunch-cfcvt64-disable.patch;patch=1 \
+        file://arm-crunch-cirrus-bugfixes.patch;patch=1 \
+       "
+
+PACKAGE_ARCH_ep93xx = "${MACHINE_ARCH}"
+
+SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
+
+#Set the fortran bits
+# 'i,fortran' or '', not 'f77' like gcc3 had
+FORTRAN = ""
+FORTRAN_linux-gnueabi = ",fortran"
+
+DEPENDS += " gmp mpfr "
+
+#Set the java bits
+JAVA = ""
+JAVA_arm = ""
+
+LANGUAGES = "c,c++${FORTRAN}${JAVA}"
+require gcc3-build.inc
+ARCH_FLAGS_FOR_TARGET=-isystem${STAGING_INCDIR}
+
+
+EXTRA_OECONF += " --disable-libssp --disable-bootstrap "
+
+# We know some one is including us, but we only want to apply this fortran hack for the real gcc
+python __anonymous () {
+    import bb
+    if bb.data.getVar('PN', d, True) == "gcc":
+        bb.data.setVar('SRC_URI_append', ' file://fortran-cross-compile-hack.patch;patch=1', d)
+}
diff --git a/packages/gcc/gcc-cross-sdk_3.3.4.bb b/packages/gcc/gcc-cross-sdk_3.3.4.bb
index 4b2c583fcb..1c9a328d24 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"
-require gcc_${PV}.bb
+require gcc-${PV}.inc
 PR = "r3"
 
 inherit sdk
diff --git a/packages/gcc/gcc-cross-sdk_3.4.3.bb b/packages/gcc/gcc-cross-sdk_3.4.3.bb
index a8e9a67a96..86ff88cd78 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"
-require gcc_${PV}.bb
+require gcc-${PV}.inc
 PR = "r1"
 
 inherit sdk
diff --git a/packages/gcc/gcc-cross-sdk_3.4.4.bb b/packages/gcc/gcc-cross-sdk_3.4.4.bb
index 4b2c583fcb..1c9a328d24 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"
-require gcc_${PV}.bb
+require gcc-${PV}.inc
 PR = "r3"
 
 inherit sdk
diff --git a/packages/gcc/gcc-cross-sdk_4.1.0.bb b/packages/gcc/gcc-cross-sdk_4.1.0.bb
index cd9fe9ee92..432d9f31e8 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"
-require gcc_${PV}.bb
+require gcc-${PV}.inc
 PR = "r2"
 
 inherit sdk
diff --git a/packages/gcc/gcc-cross-sdk_4.1.1.bb b/packages/gcc/gcc-cross-sdk_4.1.1.bb
index 1b5ad5e401..c0f27b137e 100644
--- a/packages/gcc/gcc-cross-sdk_4.1.1.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.1.bb
@@ -11,6 +11,6 @@ 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}"
 
-require gcc_${PV}.bb
+require gcc-${PV}.inc
 require gcc4-build-sdk.inc
 require gcc-package-sdk.inc
diff --git a/packages/gcc/gcc-cross-sdk_4.1.2.bb b/packages/gcc/gcc-cross-sdk_4.1.2.bb
index 85ff74ec33..cd7990b36f 100644
--- a/packages/gcc/gcc-cross-sdk_4.1.2.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.2.bb
@@ -6,7 +6,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 
-require gcc_${PV}.bb
+require gcc-${PV}.inc
 require gcc4-build-sdk.inc
 require gcc-package-sdk.inc
 
diff --git a/packages/gcc/gcc-cross-sdk_4.2.2.bb b/packages/gcc/gcc-cross-sdk_4.2.2.bb
index ba360698bd..9a1b7fb362 100644
--- a/packages/gcc/gcc-cross-sdk_4.2.2.bb
+++ b/packages/gcc/gcc-cross-sdk_4.2.2.bb
@@ -10,7 +10,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 
 PACKAGES = "${PN}"
 
-require gcc_${PV}.bb
+require gcc-${PV}.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 509fe59469..4dec8d8648 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"
-require gcc_${PV}.bb
+require gcc-${PV}.inc
 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 7cee36d66c..fb6538b7b8 100644
--- a/packages/gcc/gcc-cross_3.3.4.bb
+++ b/packages/gcc/gcc-cross_3.3.4.bb
@@ -1,5 +1,5 @@
 SECTION = "devel"
-require gcc_${PV}.bb
+require gcc-${PV}.inc
 require gcc-paths-cross.inc
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
diff --git a/packages/gcc/gcc-cross_3.4.3.bb b/packages/gcc/gcc-cross_3.4.3.bb
index 7ba02967f5..0b23012088 100644
--- a/packages/gcc/gcc-cross_3.4.3.bb
+++ b/packages/gcc/gcc-cross_3.4.3.bb
@@ -1,4 +1,4 @@
-require gcc_${PV}.bb
+require gcc-${PV}.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
diff --git a/packages/gcc/gcc-cross_3.4.4.bb b/packages/gcc/gcc-cross_3.4.4.bb
index 3248e8d688..a364bc6869 100644
--- a/packages/gcc/gcc-cross_3.4.4.bb
+++ b/packages/gcc/gcc-cross_3.4.4.bb
@@ -1,4 +1,4 @@
-require gcc_${PV}.bb
+require gcc-${PV}.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
diff --git a/packages/gcc/gcc-cross_4.0.0.bb b/packages/gcc/gcc-cross_4.0.0.bb
index 716f54b63e..0391aa729f 100644
--- a/packages/gcc/gcc-cross_4.0.0.bb
+++ b/packages/gcc/gcc-cross_4.0.0.bb
@@ -1,4 +1,4 @@
-require gcc_${PV}.bb
+require gcc-${PV}.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
diff --git a/packages/gcc/gcc-cross_4.0.2.bb b/packages/gcc/gcc-cross_4.0.2.bb
index 5b1ff0bd97..11bb13a5d2 100644
--- a/packages/gcc/gcc-cross_4.0.2.bb
+++ b/packages/gcc/gcc-cross_4.0.2.bb
@@ -1,4 +1,4 @@
-require gcc_${PV}.bb
+require gcc-${PV}.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb
index 6dddb45bc0..4a1eb70138 100644
--- a/packages/gcc/gcc-cross_4.1.0.bb
+++ b/packages/gcc/gcc-cross_4.1.0.bb
@@ -1,4 +1,4 @@
-require gcc_${PV}.bb
+require gcc-${PV}.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb
index 4d79d2dca4..09fc68c7ff 100644
--- a/packages/gcc/gcc-cross_4.1.1.bb
+++ b/packages/gcc/gcc-cross_4.1.1.bb
@@ -1,4 +1,4 @@
-require gcc_${PV}.bb
+require gcc-${PV}.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb
index c5b1d811bd..750804749c 100644
--- a/packages/gcc/gcc-cross_4.1.2.bb
+++ b/packages/gcc/gcc-cross_4.1.2.bb
@@ -1,4 +1,4 @@
-require gcc_${PV}.bb
+require gcc-${PV}.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb
index 4b1de4bd35..b24d4b544b 100644
--- a/packages/gcc/gcc-cross_4.2.1.bb
+++ b/packages/gcc/gcc-cross_4.2.1.bb
@@ -1,4 +1,4 @@
-require gcc_${PV}.bb
+require gcc-${PV}.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb
index def16597e0..f42e902a25 100644
--- a/packages/gcc/gcc-cross_4.2.2.bb
+++ b/packages/gcc/gcc-cross_4.2.2.bb
@@ -1,4 +1,4 @@
-require gcc_${PV}.bb
+require gcc-${PV}.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
diff --git a/packages/gcc/gcc-csl-arm-2005q3.inc b/packages/gcc/gcc-csl-arm-2005q3.inc
new file mode 100644
index 0000000000..b90f6907bb
--- /dev/null
+++ b/packages/gcc/gcc-csl-arm-2005q3.inc
@@ -0,0 +1,29 @@
+DESCRIPTION = "The GNU cc and gcc C compilers."
+HOMEPAGE = "http://www.gnu.org/software/gcc/"
+SECTION = "devel"
+LICENSE = "GPL"
+BINV = "3.4.4"
+PV = "3.4.4+csl-arm-2005q3"
+PV_chinook-compat = "3.4.4cs2005q3.2"
+PR = "r3"
+
+FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
+
+inherit autotools gettext
+
+require gcc-package.inc
+
+SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2005q3-2-arm-none-eabi.src.tar.bz2 \
+           file://gcc_optab_arm.patch;patch=1 \
+           file://gcc-3.4.4-eabi-bigendian.patch;patch=1"
+
+do_unpack2() {
+	cd ${WORKDIR}
+	tar -xvjf ./arm-2005q3-2-arm-none-eabi/gcc-2005q3-2.tar.bz2
+}
+
+addtask unpack2 after do_unpack before do_patch
+
+require gcc3-build.inc
+
+S = "${WORKDIR}/gcc-2005q3"
diff --git a/packages/gcc/gcc-csl-arm-cvs.inc b/packages/gcc/gcc-csl-arm-cvs.inc
new file mode 100644
index 0000000000..d8e5fee2bb
--- /dev/null
+++ b/packages/gcc/gcc-csl-arm-cvs.inc
@@ -0,0 +1,10 @@
+require gcc_csl-arm.bb
+
+PV = "3.4.4+csl-arm-${SRCDATE}"
+BINV = "3.4.4"
+
+SRC_URI += "file://15342.patch;patch=1 file://gcc-3.4.0-arm-lib1asm.patch;patch=1 file://no-libfloat.patch;patch=1"
+
+PR = "r1"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/packages/gcc/gcc-csl-arm.inc b/packages/gcc/gcc-csl-arm.inc
new file mode 100644
index 0000000000..2599498fda
--- /dev/null
+++ b/packages/gcc/gcc-csl-arm.inc
@@ -0,0 +1,22 @@
+DESCRIPTION = "The GNU cc and gcc C compilers."
+HOMEPAGE = "http://www.gnu.org/software/gcc/"
+SECTION = "devel"
+LICENSE = "GPL"
+BINV = "3.4.4"
+PV = "3.4.4+csl-arm-${SRCDATE}"
+PR = "r1"
+
+FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
+DEFAULT_PREFERENCE = "-1"
+
+inherit autotools gettext
+
+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"
+
+require gcc3-build.inc
+
+S = "${WORKDIR}/gcc"
+
diff --git a/packages/gcc/gcc_3.3.3.bb b/packages/gcc/gcc_3.3.3.bb
index ea34debc64..4bdf9a2459 100644
--- a/packages/gcc/gcc_3.3.3.bb
+++ b/packages/gcc/gcc_3.3.3.bb
@@ -1,192 +1 @@
-SECTION = "devel"
-PR = "r3"
-inherit autotools gettext
-
-DESCRIPTION = "The GNU cc and gcc C compilers."
-HOMEPAGE = "http://www.gnu.org/software/gcc/"
-LICENSE = "GPL"
-
-# libgcc libstdc++ libg2c are listed in our FILES_*, but are actually
-# packaged in the respective cross packages.
-PACKAGES = "${PN} ${PN}-symlinks \
-            ${PN}-c++ ${PN}-c++-symlinks \
-            ${PN}-f77 ${PN}-f77-symlinks \
-            libstdc++-dev libg2c-dev \
-            ${PN}-doc"
-
-FILES_${PN} = "${bindir}/${TARGET_PREFIX}gcc \
-	       ${bindir}/${TARGET_PREFIX}cpp \
-	       ${bindir}/${TARGET_PREFIX}gcov \
-	       ${bindir}/${TARGET_PREFIX}gccbug \
-	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/cc1 \
-	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/collect2 \
-	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/crt* \
-	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/specs \
-	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/lib* \
-	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/include"
-
-FILES_${PN}-symlinks = "${bindir}/cc \
-			${bindir}/gcc \
-			${bindir}/cpp \
-			${bindir}/gcov \
-			${bindir}/gccbug"
-
-FILES_${PN}-c++ = "${bindir}/${TARGET_PREFIX}g++ \
-		   ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/cc1plus"
-
-FILES_${PN}-c++-symlinks = "${bindir}/c++ \
-			    ${bindir}/g++"
-
-FILES_libgcc = "/lib/libgcc_s.so.*"
-
-# Called from within gcc-cross, so libdir is set wrong
-#FILES_libstdc++ = "${libdir}/libstdc++.so.*"
-FILES_libstdc++ = "${libdir}/libstdc++.so.*"
-
-FILES_libstdc++-dev = "${includedir}/c++/${PV} \
-		       ${libdir}/libstdc++.so \
-		       ${libdir}/libstdc++.la \
-		       ${libdir}/libstdc++.a \
-		       ${libdir}/libsupc++.la \
-		       ${libdir}/libsupc++.a"
-
-FILES_${PN}-doc = "${infodir} \
-		   ${mandir} \
-		   ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/include/README"
-
-SRC_URI = "${GNU_MIRROR}/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2 \
-	   file://config.sub.patch;patch=1 \
-	   file://empty6.patch;patch=1 \
-	   file://pr10392-1-test.patch;patch=1 \
-	   file://pr10412-1-test.patch;patch=1 \
-	   file://pr10589-1-test.patch;patch=1 \
-	   file://pr11162-1-test.patch;patch=1 \
-	   file://pr11587-1-test.patch;patch=1 \
-	   file://pr11608.patch;patch=1 \
-	   file://pr11736-1-test.patch;patch=1 \
-	   file://pr11864-1-test.patch;patch=1 \
-	   file://pr12009.patch;patch=1 \
-	   file://pr12010.patch;patch=1 \
-	   file://pr13260-test.patch;patch=1 \
-	   file://pr9365-1-test.patch;patch=1 \
-	   file://sh-lib1funcs_sizeAndType.patch;patch=1 \
-	   file://sh-pic-set_fpscr-gcc-3.3.2.patch;patch=1 \
-	   file://thunk3.patch;patch=1 \
-	   file://arm-10730.dpatch;patch=1;pnum=0 \
-	   file://arm-12527.dpatch;patch=1;pnum=0 \
-	   file://arm-14558.dpatch;patch=1;pnum=0 \
-	   file://arm-common.dpatch;patch=1;pnum=0 \
-	   file://arm-gotoff.dpatch;patch=1;pnum=0 \
-	   file://arm-ldm.dpatch;patch=1;pnum=0 \
-	   file://arm-tune.patch;patch=1;pnum=0 \
-	   file://arm-xscale.patch;patch=1;pnum=0 \
-	   file://arm-14302.patch;patch=1;pnum=0 \
-	   file://arm-ldm-peephole.patch;patch=1;pnum=0 \
-	   file://libibery-crosstool.patch;patch=1;pnum=1 \
-	   file://reverse-compare.patch;patch=1 \
-	   file://gcc34-15089.patch;patch=1 \
-	file://gcc-uclibc-3.3-100-conf.patch;patch=1 \
-	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 () {
-${GNU_MIRROR}/gcc/releases/	http://gcc.get-software.com/releases/
-}
-
-S = "${WORKDIR}/gcc-${PV}"
-B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
-
-EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']} \
-                --with-gnu-ld \
-                --enable-shared \
-                --enable-multilib \
-                --enable-target-optspace \
-                --enable-languages=c,c++,f77 \
-                --enable-threads=posix \
-                --enable-c99 \
-                --enable-long-long \
-                --enable-symvers=gnu \
-                --program-prefix=${TARGET_PREFIX} \
-                ${EXTRA_OECONF_PATHS} \
-                ${EXTRA_OECONF_DEP}"
-
-EXTRA_OECONF_PATHS = "--with-local-prefix=${prefix}/local \
-                      --with-gxx-include-dir=${includedir}/c++/${PV}"
-
-EXTRA_OECONF_DEP = ""
-EXTRA_OECONF_uclibc = "--disable-__cxa_atexit"
-EXTRA_OECONF_glibc = "--enable-__cxa_atexit"
-EXTRA_OECONF += "${@get_gcc_fpu_setting(bb, d)}"
-
-require gcc-fpu.inc
-
-python __anonymous () {
-    import bb, re
-    if (re.match('linux-uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None):
-        bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d)
-    elif (re.match('linux$', bb.data.getVar('TARGET_OS', d, 1)) != None):
-        bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d)
-}
-
-do_configure () {
-	# Setup these vars for cross building only
-	if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
-		export CC_FOR_TARGET="${CCACHE} ${HOST_PREFIX}gcc"
-		export GCC_FOR_TARGET="${CCACHE} ${HOST_PREFIX}gcc"
-		export CXX_FOR_TARGET="${CCACHE} ${HOST_PREFIX}g++"
-		export AS_FOR_TARGET="${HOST_PREFIX}as"
-		export LD_FOR_TARGET="${HOST_PREFIX}ld"
-		export NM_FOR_TARGET="${HOST_PREFIX}nm"
-		export AR_FOR_TARGET="${HOST_PREFIX}ar"
-		export RANLIB_FOR_TARGET="${HOST_PREFIX}ranlib"
-	fi
-	(cd ${S} && gnu-configize) || die "failure running gnu-configize"
-	oe_runconf
-}
-
-do_install () {
-	autotools_do_install
-
-	# Cleanup some of the gcc-lib stuff
-	rm -rf ${D}${libdir}/gcc-lib/${TARGET_SYS}/${PV}/install-tools
-
-	# Move libgcc_s into /lib
-	mkdir -p ${D}${base_libdir}
-	mv -f ${D}${libdir}/libgcc_s.so.* ${D}${base_libdir}
-	rm -f ${D}${libdir}/libgcc_s.so
-	ln -sf `echo ${libdir}/gcc-lib/${TARGET_SYS}/${PV} | tr -s / |
-		sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.? \
-		${D}${libdir}/gcc-lib/${TARGET_SYS}/${PV}/libgcc_s.so
-
-	# Cleanup manpages..
-	rm -rf ${D}${mandir}/man7
-	mv ${D}${mandir}/man1/cpp.1 \
-	   ${D}${mandir}/man1/${TARGET_SYS}-cpp.1
-	mv ${D}${mandir}/man1/gcov.1 \
-	   ${D}${mandir}/man1/${TARGET_SYS}-gcov.1
-
-	# We use libiberty from binutils
-	rm -f ${D}${libdir}/libiberty.a
-
-	cd ${D}${bindir}
-
-	# We care about g++ not c++
-	rm -f *c++
-
-	# We don't care about the gcc-<version> ones for this
-	rm -f *gcc-?.?*
-
-	# These sometimes show up, they are strange, we remove them
-	rm -f ${TARGET_ARCH}-*${TARGET_ARCH}-*
-
-	# Symlinks so we can use these trivially on the target
-	ln -sf ${TARGET_SYS}-g77 g77
-	ln -sf ${TARGET_SYS}-g++ g++
-	ln -sf ${TARGET_SYS}-gcc gcc
-	ln -sf g77 f77
-	ln -sf g++ c++
-	ln -sf gcc cc
-}
+require gcc-${PV}.inc
diff --git a/packages/gcc/gcc_3.3.4.bb b/packages/gcc/gcc_3.3.4.bb
index 294e57d7df..4bdf9a2459 100644
--- a/packages/gcc/gcc_3.3.4.bb
+++ b/packages/gcc/gcc_3.3.4.bb
@@ -1,171 +1 @@
-SECTION = "devel"
-PR = "r3"
-inherit autotools gettext
-
-DESCRIPTION = "The GNU cc and gcc C compilers."
-HOMEPAGE = "http://www.gnu.org/software/gcc/"
-LICENSE = "GPL"
-
-# libgcc libstdc++ libg2c are listed in our FILES_*, but are actually
-# packaged in the respective cross packages.
-PACKAGES = "${PN} ${PN}-symlinks \
-            ${PN}-c++ ${PN}-c++-symlinks \
-            ${PN}-f77 ${PN}-f77-symlinks \
-            libstdc++-dev libg2c-dev \
-            ${PN}-doc"
-
-FILES_${PN} = "${bindir}/${TARGET_PREFIX}gcc \
-	       ${bindir}/${TARGET_PREFIX}cpp \
-	       ${bindir}/${TARGET_PREFIX}gcov \
-	       ${bindir}/${TARGET_PREFIX}gccbug \
-	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/cc1 \
-	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/collect2 \
-	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/crt* \
-	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/specs \
-	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/lib* \
-	       ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/include"
-
-FILES_${PN}-symlinks = "${bindir}/cc \
-			${bindir}/gcc \
-			${bindir}/cpp \
-			${bindir}/gcov \
-			${bindir}/gccbug"
-
-FILES_${PN}-c++ = "${bindir}/${TARGET_PREFIX}g++ \
-		   ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/cc1plus"
-
-FILES_${PN}-c++-symlinks = "${bindir}/c++ \
-			    ${bindir}/g++"
-
-FILES_libgcc = "/lib/libgcc_s.so.*"
-
-# Called from within gcc-cross, so libdir is set wrong
-#FILES_libstdc++ = "${libdir}/libstdc++.so.*"
-FILES_libstdc++ = "${libdir}/libstdc++.so.*"
-
-FILES_libstdc++-dev = "${includedir}/c++/${PV} \
-		       ${libdir}/libstdc++.so \
-		       ${libdir}/libstdc++.la \
-		       ${libdir}/libstdc++.a \
-		       ${libdir}/libsupc++.la \
-		       ${libdir}/libsupc++.a"
-
-FILES_${PN}-doc = "${infodir} \
-		   ${mandir} \
-		   ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/include/README"
-
-SRC_URI = "${GNU_MIRROR}/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2 \
-	   file://arm-gotoff.dpatch;patch=1;pnum=0 \
-	   file://arm-ldm.dpatch;patch=1;pnum=0 \
-	   file://arm-tune.patch;patch=1;pnum=0 \
-	   file://arm-ldm-peephole.patch;patch=1;pnum=0 \
-	   file://libibery-crosstool.patch;patch=1;pnum=1 \
-	   file://reverse-compare.patch;patch=1 \
-	   file://gcc34-15089.patch;patch=1 \
-	   file://gcc-uclibc-3.3-100-conf.patch;patch=1 \
-	   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://gcc-com.patch;patch=1 \
-	   file://bash3.patch;patch=1"
-
-PREMIRRORS_prepend () {
-${GNU_MIRROR}/gcc/releases/	ftp://gcc.gnu.org/pub/gcc/releases/
-${GNU_MIRROR}/gcc/releases/	http://gcc.get-software.com/releases/
-}
-
-S = "${WORKDIR}/gcc-${PV}"
-B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
-
-EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']} \
-                --with-gnu-ld \
-                --enable-shared \
-                --enable-multilib \
-                --enable-target-optspace \
-                --enable-languages=c,c++,f77 \
-                --enable-threads=posix \
-                --enable-c99 \
-                --enable-long-long \
-                --enable-symvers=gnu \
-                --program-prefix=${TARGET_PREFIX} \
-                ${EXTRA_OECONF_PATHS} \
-                ${EXTRA_OECONF_DEP}"
-
-EXTRA_OECONF_PATHS = "--with-local-prefix=${prefix}/local \
-                      --with-gxx-include-dir=${includedir}/c++/${PV}"
-
-EXTRA_OECONF_DEP = ""
-EXTRA_OECONF_uclibc = "--disable-__cxa_atexit"
-EXTRA_OECONF_glibc = "--enable-__cxa_atexit"
-EXTRA_OECONF += "${@get_gcc_fpu_setting(bb, d)}"
-
-require gcc-fpu.inc
-
-python __anonymous () {
-    import bb, re
-    if (re.match('linux-uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None):
-        bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d)
-    elif (re.match('linux$', bb.data.getVar('TARGET_OS', d, 1)) != None):
-        bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d)
-}
-
-do_configure () {
-	# Setup these vars for cross building only
-	if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
-		export CC_FOR_TARGET="${CCACHE} ${HOST_PREFIX}gcc"
-		export GCC_FOR_TARGET="${CCACHE} ${HOST_PREFIX}gcc"
-		export CXX_FOR_TARGET="${CCACHE} ${HOST_PREFIX}g++"
-		export AS_FOR_TARGET="${HOST_PREFIX}as"
-		export LD_FOR_TARGET="${HOST_PREFIX}ld"
-		export NM_FOR_TARGET="${HOST_PREFIX}nm"
-		export AR_FOR_TARGET="${HOST_PREFIX}ar"
-		export RANLIB_FOR_TARGET="${HOST_PREFIX}ranlib"
-	fi
-	(cd ${S} && gnu-configize) || die "failure running gnu-configize"
-	oe_runconf
-}
-
-do_install () {
-	autotools_do_install
-
-	# Cleanup some of the gcc-lib stuff
-	rm -rf ${D}${libdir}/gcc-lib/${TARGET_SYS}/${PV}/install-tools
-
-	# Move libgcc_s into /lib
-	mkdir -p ${D}${base_libdir}
-	mv -f ${D}${libdir}/libgcc_s.so.* ${D}${base_libdir}
-	rm -f ${D}${libdir}/libgcc_s.so
-	ln -sf `echo ${libdir}/gcc-lib/${TARGET_SYS}/${PV} | tr -s / |
-		sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.? \
-		${D}${libdir}/gcc-lib/${TARGET_SYS}/${PV}/libgcc_s.so
-
-	# Cleanup manpages..
-	rm -rf ${D}${mandir}/man7
-	mv ${D}${mandir}/man1/cpp.1 \
-	   ${D}${mandir}/man1/${TARGET_SYS}-cpp.1
-	mv ${D}${mandir}/man1/gcov.1 \
-	   ${D}${mandir}/man1/${TARGET_SYS}-gcov.1
-
-	# We use libiberty from binutils
-	rm -f ${D}${libdir}/libiberty.a
-
-	cd ${D}${bindir}
-
-	# We care about g++ not c++
-	rm -f *c++
-
-	# We don't care about the gcc-<version> ones for this
-	rm -f *gcc-?.?*
-
-	# These sometimes show up, they are strange, we remove them
-	rm -f ${TARGET_ARCH}-*${TARGET_ARCH}-*
-
-	# Symlinks so we can use these trivially on the target
-	ln -sf ${TARGET_SYS}-g77 g77
-	ln -sf ${TARGET_SYS}-g++ g++
-	ln -sf ${TARGET_SYS}-gcc gcc
-	ln -sf g77 f77
-	ln -sf g++ c++
-	ln -sf gcc cc
-}
+require gcc-${PV}.inc
diff --git a/packages/gcc/gcc_3.4.3.bb b/packages/gcc/gcc_3.4.3.bb
index c4d6df955d..4bdf9a2459 100644
--- a/packages/gcc/gcc_3.4.3.bb
+++ b/packages/gcc/gcc_3.4.3.bb
@@ -1,28 +1 @@
-PR = "r12"
-DESCRIPTION = "The GNU cc and gcc C compilers."
-HOMEPAGE = "http://www.gnu.org/software/gcc/"
-SECTION = "devel"
-LICENSE = "GPL"
-
-inherit autotools gettext
-
-require gcc-package.inc
-
-SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
-	   file://gcc34-reverse-compare.patch;patch=1 \
-	   file://gcc34-arm-ldm.patch;patch=1 \
-	   file://gcc34-arm-ldm-peephole.patch;patch=1 \
-	   file://gcc34-arm-tune.patch;patch=1 \
-	   file://gcc-3.4.1-uclibc-100-conf.patch;patch=1 \
-	   file://gcc-3.4.1-uclibc-200-locale.patch;patch=1 \
-	   file://gcc-3.4.0-arm-lib1asm.patch;patch=1 \
-	   file://gcc-3.4.0-arm-nolibfloat.patch;patch=1 \
-	   file://gcc-3.4.0-arm-bigendian.patch;patch=1 \
-	   file://gcc-3.4.0-arm-bigendian-uclibc.patch;patch=1 \
-	   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://zecke-xgcc-cpp.patch;patch=1 "
-
-require gcc3-build.inc
+require gcc-${PV}.inc
diff --git a/packages/gcc/gcc_3.4.4.bb b/packages/gcc/gcc_3.4.4.bb
index 4694d3ac5e..4bdf9a2459 100644
--- a/packages/gcc/gcc_3.4.4.bb
+++ b/packages/gcc/gcc_3.4.4.bb
@@ -1,33 +1 @@
-PR = "r7"
-DESCRIPTION = "The GNU cc and gcc C compilers."
-HOMEPAGE = "http://www.gnu.org/software/gcc/"
-SECTION = "devel"
-LICENSE = "GPL"
-
-inherit autotools gettext
-
-require gcc-package.inc
-
-SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
-	   file://gcc34-reverse-compare.patch;patch=1 \
-	   file://gcc34-arm-ldm.patch;patch=1 \
-	   file://gcc34-arm-ldm-peephole.patch;patch=1 \
-	   file://gcc34-arm-tune.patch;patch=1 \
-	   file://gcc-3.4.1-uclibc-100-conf.patch;patch=1 \
-	   file://gcc-3.4.1-uclibc-200-locale.patch;patch=1 \
-	   file://gcc-3.4.0-arm-lib1asm.patch;patch=1 \
-	   file://gcc-3.4.0-arm-nolibfloat.patch;patch=1 \
-	   file://gcc-3.4.0-arm-bigendian.patch;patch=1 \
-	   file://gcc-3.4.0-arm-bigendian-uclibc.patch;patch=1 \
-	   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://zecke-xgcc-cpp.patch;patch=1 \
-	   file://gcc4-mtune-compat.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 "
-
-require gcc3-build.inc
+require gcc-${PV}.inc
diff --git a/packages/gcc/gcc_4.0.0.bb b/packages/gcc/gcc_4.0.0.bb
index 9f75bf1f54..4bdf9a2459 100644
--- a/packages/gcc/gcc_4.0.0.bb
+++ b/packages/gcc/gcc_4.0.0.bb
@@ -1,16 +1 @@
-DESCRIPTION = "The GNU cc and gcc C compilers."
-HOMEPAGE = "http://www.gnu.org/software/gcc/"
-SECTION = "devel"
-LICENSE = "GPL"
-PR = "r3"
-
-inherit autotools gettext
-
-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 "
-
-require gcc4-build.inc
+require gcc-${PV}.inc
diff --git a/packages/gcc/gcc_4.0.2.bb b/packages/gcc/gcc_4.0.2.bb
index 2945592659..4bdf9a2459 100644
--- a/packages/gcc/gcc_4.0.2.bb
+++ b/packages/gcc/gcc_4.0.2.bb
@@ -1,37 +1 @@
-DESCRIPTION = "The GNU cc and gcc C compilers."
-HOMEPAGE = "http://www.gnu.org/software/gcc/"
-SECTION = "devel"
-LICENSE = "GPL"
-DEPENDS = "mpfr gmp"
-PR = "r7"
-
-inherit autotools gettext
-
-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://zecke-xgcc-cpp.patch;patch=1 "
-
-# uclibc patches below
-SRC_URI_append = " file://100-uclibc-conf.patch;patch=1   \
-                   file://200-uclibc-locale.patch;patch=1 \
-                   file://301-missing-execinfo_h.patch;patch=1 \
-                   file://302-c99-snprintf.patch;patch=1  \
-                   file://303-c99-complex-ugly-hack.patch;patch=1 \
-                   file://800-arm-bigendian.patch;patch=1 \
-                   file://zecke-host-cpp-ac-hack.patch;patch=1 \
-		   file://gcc-4.0.2-atmel.0.99.2.patch;patch=1 \
-		   "
-
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
-
-
-require gcc4-build.inc
-
-EXTRA_OECONF += "--disable-libssp"
-
-FORTRAN = ""
+require gcc-${PV}.inc
diff --git a/packages/gcc/gcc_4.1.0.bb b/packages/gcc/gcc_4.1.0.bb
index 6a5f607729..4bdf9a2459 100644
--- a/packages/gcc/gcc_4.1.0.bb
+++ b/packages/gcc/gcc_4.1.0.bb
@@ -1,27 +1 @@
-DESCRIPTION = "The GNU cc and gcc C compilers."
-HOMEPAGE = "http://www.gnu.org/software/gcc/"
-SECTION = "devel"
-LICENSE = "GPL"
-PR = "r3"
-
-DEFAULT_PREFERENCE = "-1"
-
-inherit autotools gettext
-
-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 \
-    file://pr34130.patch;patch=1"
-
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
-
-require gcc4-build.inc
-EXTRA_OECONF += "--disable-libssp"
-
-FORTRAN = ""
-
-
+require gcc-${PV}.inc
diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb
index 4b538219b3..4bdf9a2459 100644
--- a/packages/gcc/gcc_4.1.1.bb
+++ b/packages/gcc/gcc_4.1.1.bb
@@ -1,61 +1 @@
-DESCRIPTION = "The GNU cc and gcc C compilers."
-HOMEPAGE = "http://www.gnu.org/software/gcc/"
-SECTION = "devel"
-LICENSE = "GPL"
-PR = "r18"
-
-inherit autotools gettext
-
-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 \
-	file://110-arm-eabi.patch;patch=1 \
-	file://200-uclibc-locale.patch;patch=1 \
-	file://300-libstdc++-pic.patch;patch=1 \
-	file://301-missing-execinfo_h.patch;patch=1 \
-	file://302-c99-snprintf.patch;patch=1 \
-	file://303-c99-complex-ugly-hack.patch;patch=1 \
-	file://304-index_macro.patch;patch=1 \
-	file://602-sdk-libstdc++-includes.patch;patch=1 \
-	file://740-sh-pr24836.patch;patch=1 \
-	file://800-arm-bigendian.patch;patch=1 \
-	file://801-arm-bigendian-eabi.patch;patch=1 \
-	file://arm-nolibfloat.patch;patch=1 \
-	file://arm-softfloat.patch;patch=1 \
-	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://cse.patch;patch=1 \
-	file://zecke-xgcc-cpp.patch;patch=1 \
-	file://unbreak-armv4t.patch;patch=1 \
-        file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
-        file://gcc-4.1.1-pr13685-1.patch;patch=1 \
-        file://gcc-ignore-cache.patch;patch=1 \
-        file://gcc-4.1.1-e300cx.patch;patch=1 \
-        file://pr34130.patch;patch=1 \
-	"
-
-SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
-
-#This is a dirty hack to get gcc 4.1.1 to compile for glibc AND uclibc on ppc
-#the patch that is need it to get gcc support soft-floats with glibc, makes gcc fail with uclibc
-SRC_URI_append_linux = " file://ppc-gcc-41-20060515.patch;patch=1 \
-                         file://ppc-sfp-long-double-gcc411-7.patch;patch=1 "
-
-
-#Set the fortran bits
-# 'fortran' or '', not 'f77' like gcc3 had
-FORTRAN = ""
-
-#Set the java bits
-JAVA_arm = ""
-JAVA = ""
-
-LANGUAGES = "c,c++${FORTRAN}${JAVA}"
-require gcc3-build.inc
-
-
-EXTRA_OECONF += " --disable-libssp "
-
+require gcc-${PV}.inc
diff --git a/packages/gcc/gcc_4.1.2.bb b/packages/gcc/gcc_4.1.2.bb
index fc75e942bb..4bdf9a2459 100644
--- a/packages/gcc/gcc_4.1.2.bb
+++ b/packages/gcc/gcc_4.1.2.bb
@@ -1,76 +1 @@
-DESCRIPTION = "The GNU cc and gcc C compilers."
-HOMEPAGE = "http://www.gnu.org/software/gcc/"
-SECTION = "devel"
-LICENSE = "GPL"
-# NOTE: split PR.  If the main .bb changes something that affects its *build*
-# remember to increment the -cross .bb PR too.
-PR = "r11"
-
-inherit autotools gettext
-
-require gcc-package.inc
-
-SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 \
-	file://100-uclibc-conf.patch;patch=1 \
-	file://110-arm-eabi.patch;patch=1 \
-	file://200-uclibc-locale.patch;patch=1 \
-	file://300-libstdc++-pic.patch;patch=1 \
-	file://301-missing-execinfo_h.patch;patch=1 \
-	file://302-c99-snprintf.patch;patch=1 \
-	file://303-c99-complex-ugly-hack.patch;patch=1 \
-	file://304-index_macro.patch;patch=1 \
-	file://602-sdk-libstdc++-includes.patch;patch=1 \
-	file://740-sh-pr24836.patch;patch=1 \
-	file://800-arm-bigendian.patch;patch=1 \
-	file://arm-nolibfloat.patch;patch=1 \
-	file://arm-softfloat.patch;patch=1 \
-	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://zecke-xgcc-cpp.patch;patch=1 \
-	file://unbreak-armv4t.patch;patch=1 \
-        file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
-	file://cache-amnesia.patch;patch=1 \
-	file://gfortran.patch;patch=1 \
-        file://gcc-4.0.2-e300c2c3.patch;patch=1 \
-        file://pr34130.patch;patch=1 \
-       "
-
-SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
-
-SRC_URI_avr32 = "http://www.angstrom-distribution.org/unstable/sources/gcc-4.1.2-atmel.1.1.0.tar.gz \
-#           file://100-uclibc-conf.patch;patch=1 \
-#           file://200-uclibc-locale.patch;patch=1 \
-#           file://300-libstdc++-pic.patch;patch=1 \
-           file://301-missing-execinfo_h.patch;patch=1 \
-           file://302-c99-snprintf.patch;patch=1 \
-           file://303-c99-complex-ugly-hack.patch;patch=1 \
-           file://304-index_macro.patch;patch=1 \
-           file://602-sdk-libstdc++-includes.patch;patch=1 \
-           file://gcc41-configure.in.patch;patch=1 \
-           file://ldflags.patch;patch=1 \
-           file://zecke-xgcc-cpp.patch;patch=1 \
-           file://cache-amnesia.patch;patch=1 \
-           "
-
-do_compile_prepend_avr32() {
-       ln -sf ${S}/libstdc++-v3/config/os/uclibc/ ${S}/libstdc++-v3/config/os/uclibc-linux
-}
-
-#Set the fortran bits
-# ',fortran' or '', not 'f77' like gcc3 had
-FORTRAN = ""
-
-#Set the java bits
-JAVA = ""
-JAVA_arm = ""
-
-
-LANGUAGES = "c,c++${FORTRAN}${JAVA}"
-require gcc3-build.inc
-ARCH_FLAGS_FOR_TARGET=-isystem${STAGING_INCDIR}
-
-
-EXTRA_OECONF += " --disable-libssp "
-
+require gcc-${PV}.inc
diff --git a/packages/gcc/gcc_4.2.1.bb b/packages/gcc/gcc_4.2.1.bb
index 2e74e99ab4..4bdf9a2459 100644
--- a/packages/gcc/gcc_4.2.1.bb
+++ b/packages/gcc/gcc_4.2.1.bb
@@ -1,110 +1 @@
-DESCRIPTION = "The GNU cc and gcc C compilers."
-HOMEPAGE = "http://www.gnu.org/software/gcc/"
-SECTION = "devel"
-LICENSE = "GPL"
-PR = "r9"
-
-inherit autotools gettext
-
-require gcc-package.inc
-
-SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
-	file://100-uclibc-conf.patch;patch=1 \
-	file://103-uclibc-conf-noupstream.patch;patch=1 \
-	file://200-uclibc-locale.patch;patch=1 \
-	file://203-uclibc-locale-no__x.patch;patch=1 \
-	file://204-uclibc-locale-wchar_fix.patch;patch=1 \
-	file://205-uclibc-locale-update.patch;patch=1 \
-	file://300-libstdc++-pic.patch;patch=1 \
-	file://301-missing-execinfo_h.patch;patch=1 \
-	file://302-c99-snprintf.patch;patch=1 \
-	file://303-c99-complex-ugly-hack.patch;patch=1 \
-	file://304-index_macro.patch;patch=1 \
-	file://305-libmudflap-susv3-legacy.patch;patch=1 \
-	file://306-libstdc++-namespace.patch;patch=1 \
-	file://307-locale_facets.patch;patch=1 \
-	file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
-	file://602-sdk-libstdc++-includes.patch;patch=1 \
-	file://740-sh-pr24836.patch;patch=1 \
-	file://800-arm-bigendian.patch;patch=1 \
-	file://904-flatten-switch-stmt-00.patch;patch=1 \
-	file://arm-nolibfloat.patch;patch=1 \
-	file://arm-softfloat.patch;patch=1 \
-	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://zecke-xgcc-cpp.patch;patch=1 \
-	file://unbreak-armv4t.patch;patch=1 \
-	file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
-	file://cache-amnesia.patch;patch=1 \
-	file://gfortran.patch;patch=1 \
-	file://pr34130.patch;patch=1 \
-"
-
-SRC_URI_avr32 = " http://ewi546.ewi.utwente.nl/tmp/avr32-gcc-4.2.1-atmel.1.0.3.tar.gz \
-        file://100-uclibc-conf.patch;patch=1 \
-        file://103-uclibc-conf-noupstream.patch;patch=1 \
-        file://200-uclibc-locale.patch;patch=1 \
-        file://203-uclibc-locale-no__x.patch;patch=1 \
-        file://204-uclibc-locale-wchar_fix.patch;patch=1 \
-        file://205-uclibc-locale-update.patch;patch=1 \
-        file://300-libstdc++-pic.patch;patch=1 \
-        file://301-missing-execinfo_h.patch;patch=1 \
-        file://302-c99-snprintf.patch;patch=1 \
-        file://303-c99-complex-ugly-hack.patch;patch=1 \
-        file://304-index_macro.patch;patch=1 \
-        file://305-libmudflap-susv3-legacy.patch;patch=1 \
-        file://306-libstdc++-namespace.patch;patch=1 \
-        file://307-locale_facets.patch;patch=1 \
-        file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
-        file://602-sdk-libstdc++-includes.patch;patch=1 \
-        file://740-sh-pr24836.patch;patch=1 \
-        file://904-flatten-switch-stmt-00.patch;patch=1 \
-        file://gcc41-configure.in.patch;patch=1 \
-        file://ldflags.patch;patch=1 \
-        file://zecke-xgcc-cpp.patch;patch=1 \
-        file://cache-amnesia.patch;patch=1 \
-        file://gfortran.patch;patch=1 \
-"
-
-SRC_URI_append_ep93xx = " \
-        file://arm-crunch-saveregs.patch;patch=1 \
-        file://arm-crunch-20000320.patch;patch=1 \
-        file://arm-crunch-compare.patch;patch=1 \
-        file://arm-crunch-compare-unordered.patch;patch=1 \
-        file://arm-crunch-compare-geu.patch;patch=1 \
-        file://arm-crunch-eabi-ieee754.patch;patch=1 \
-        file://arm-crunch-eabi-ieee754-div.patch;patch=1 \
-        file://arm-crunch-64bit-disable0.patch;patch=1 \
-        file://arm-crunch-offset.patch;patch=1 \
-        file://arm-crunch-fp_consts.patch;patch=1 \
-        file://arm-crunch-neg2.patch;patch=1 \
-        file://arm-crunch-predicates3.patch;patch=1 \
-        file://arm-crunch-cfcvtds-disable.patch;patch=1 \
-        file://arm-crunch-floatsi-disable.patch;patch=1 \
-        file://arm-crunch-truncsi-disable.patch;patch=1 \
-        file://arm-crunch-cfcvt64-disable.patch;patch=1 \
-        file://arm-crunch-cirrus-bugfixes.patch;patch=1 \
-       "
-
-PACKAGE_ARCH_ep93xx = "${MACHINE_ARCH}"
-
-SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
-
-#Set the fortran bits
-# 'i,fortran' or '', not 'f77' like gcc3 had
-FORTRAN = ""
-FORTRAN_linux-gnueabi = ",fortran"
-
-#Set the java bits
-JAVA = ""
-JAVA_arm = ""
-
-LANGUAGES = "c,c++${FORTRAN}${JAVA}"
-require gcc3-build.inc
-ARCH_FLAGS_FOR_TARGET=-isystem${STAGING_INCDIR}
-
-
-EXTRA_OECONF += " --disable-libgomp --disable-libssp --disable-bootstrap "
-
+require gcc-${PV}.inc
diff --git a/packages/gcc/gcc_4.2.2.bb b/packages/gcc/gcc_4.2.2.bb
index 0a0e9cdd16..4bdf9a2459 100644
--- a/packages/gcc/gcc_4.2.2.bb
+++ b/packages/gcc/gcc_4.2.2.bb
@@ -1,96 +1 @@
-DESCRIPTION = "The GNU cc and gcc C compilers."
-HOMEPAGE = "http://www.gnu.org/software/gcc/"
-SECTION = "devel"
-LICENSE = "GPL"
-PR = "r6"
-
-inherit autotools gettext
-
-require gcc-package.inc
-
-SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
-	file://100-uclibc-conf.patch;patch=1 \
-	file://103-uclibc-conf-noupstream.patch;patch=1 \
-	file://200-uclibc-locale.patch;patch=1 \
-	file://203-uclibc-locale-no__x.patch;patch=1 \
-	file://204-uclibc-locale-wchar_fix.patch;patch=1 \
-	file://205-uclibc-locale-update.patch;patch=1 \
-	file://300-libstdc++-pic.patch;patch=1 \
-	file://301-missing-execinfo_h.patch;patch=1 \
-	file://302-c99-snprintf.patch;patch=1 \
-	file://303-c99-complex-ugly-hack.patch;patch=1 \
-	file://304-index_macro.patch;patch=1 \
-	file://305-libmudflap-susv3-legacy.patch;patch=1 \
-	file://306-libstdc++-namespace.patch;patch=1 \
-	file://307-locale_facets.patch;patch=1 \
-	file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
-	file://602-sdk-libstdc++-includes.patch;patch=1 \
-	file://740-sh-pr24836.patch;patch=1 \
-	file://800-arm-bigendian.patch;patch=1 \
-	file://801-arm-bigendian-eabi.patch;patch=1 \
-	file://904-flatten-switch-stmt-00.patch;patch=1 \
-	file://arm-nolibfloat.patch;patch=1 \
-	file://arm-softfloat.patch;patch=1 \
-	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://zecke-xgcc-cpp.patch;patch=1 \
-	file://unbreak-armv4t.patch;patch=1 \
-	file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
-	file://cache-amnesia.patch;patch=1 \
-	file://gfortran.patch;patch=1 \
-	file://gcc-4.0.2-e300c2c3.patch;patch=1 \
-	file://pr34130.patch;patch=1 \
-	file://fortran-static-linking.patch;patch=1 \
-	file://intermask-bigendian.patch;patch=1 \
-"
-
-SRC_URI_append_ep93xx = " \
-        file://arm-crunch-saveregs.patch;patch=1 \
-        file://arm-crunch-20000320.patch;patch=1 \
-        file://arm-crunch-compare.patch;patch=1 \
-        file://arm-crunch-compare-unordered.patch;patch=1 \
-        file://arm-crunch-compare-geu.patch;patch=1 \
-        file://arm-crunch-eabi-ieee754.patch;patch=1 \
-        file://arm-crunch-eabi-ieee754-div.patch;patch=1 \
-        file://arm-crunch-64bit-disable0.patch;patch=1 \
-        file://arm-crunch-offset.patch;patch=1 \
-        file://arm-crunch-fp_consts.patch;patch=1 \
-        file://arm-crunch-neg2.patch;patch=1 \
-        file://arm-crunch-predicates3.patch;patch=1 \
-        file://arm-crunch-cfcvtds-disable.patch;patch=1 \
-        file://arm-crunch-floatsi-disable.patch;patch=1 \
-        file://arm-crunch-truncsi-disable.patch;patch=1 \
-        file://arm-crunch-cfcvt64-disable.patch;patch=1 \
-        file://arm-crunch-cirrus-bugfixes.patch;patch=1 \
-       "
-
-PACKAGE_ARCH_ep93xx = "${MACHINE_ARCH}"
-
-SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
-
-#Set the fortran bits
-# 'i,fortran' or '', not 'f77' like gcc3 had
-FORTRAN = ""
-FORTRAN_linux-gnueabi = ",fortran"
-
-DEPENDS += " gmp mpfr "
-
-#Set the java bits
-JAVA = ""
-JAVA_arm = ""
-
-LANGUAGES = "c,c++${FORTRAN}${JAVA}"
-require gcc3-build.inc
-ARCH_FLAGS_FOR_TARGET=-isystem${STAGING_INCDIR}
-
-
-EXTRA_OECONF += " --disable-libssp --disable-bootstrap "
-
-# We know some one is including us, but we only want to apply this fortran hack for the real gcc
-python __anonymous () {
-    import bb
-    if bb.data.getVar('PN', d, True) == "gcc":
-        bb.data.setVar('SRC_URI_append', ' file://fortran-cross-compile-hack.patch;patch=1', d)
-}
+require gcc-${PV}.inc
diff --git a/packages/gcc/gcc_csl-arm-2005q3.bb b/packages/gcc/gcc_csl-arm-2005q3.bb
index b90f6907bb..4bdf9a2459 100644
--- a/packages/gcc/gcc_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc_csl-arm-2005q3.bb
@@ -1,29 +1 @@
-DESCRIPTION = "The GNU cc and gcc C compilers."
-HOMEPAGE = "http://www.gnu.org/software/gcc/"
-SECTION = "devel"
-LICENSE = "GPL"
-BINV = "3.4.4"
-PV = "3.4.4+csl-arm-2005q3"
-PV_chinook-compat = "3.4.4cs2005q3.2"
-PR = "r3"
-
-FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
-
-inherit autotools gettext
-
-require gcc-package.inc
-
-SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2005q3-2-arm-none-eabi.src.tar.bz2 \
-           file://gcc_optab_arm.patch;patch=1 \
-           file://gcc-3.4.4-eabi-bigendian.patch;patch=1"
-
-do_unpack2() {
-	cd ${WORKDIR}
-	tar -xvjf ./arm-2005q3-2-arm-none-eabi/gcc-2005q3-2.tar.bz2
-}
-
-addtask unpack2 after do_unpack before do_patch
-
-require gcc3-build.inc
-
-S = "${WORKDIR}/gcc-2005q3"
+require gcc-${PV}.inc
diff --git a/packages/gcc/gcc_csl-arm-cvs.bb b/packages/gcc/gcc_csl-arm-cvs.bb
index d8e5fee2bb..4bdf9a2459 100644
--- a/packages/gcc/gcc_csl-arm-cvs.bb
+++ b/packages/gcc/gcc_csl-arm-cvs.bb
@@ -1,10 +1 @@
-require gcc_csl-arm.bb
-
-PV = "3.4.4+csl-arm-${SRCDATE}"
-BINV = "3.4.4"
-
-SRC_URI += "file://15342.patch;patch=1 file://gcc-3.4.0-arm-lib1asm.patch;patch=1 file://no-libfloat.patch;patch=1"
-
-PR = "r1"
-
-DEFAULT_PREFERENCE = "-1"
+require gcc-${PV}.inc
diff --git a/packages/gcc/gcc_csl-arm.bb b/packages/gcc/gcc_csl-arm.bb
index 2599498fda..4bdf9a2459 100644
--- a/packages/gcc/gcc_csl-arm.bb
+++ b/packages/gcc/gcc_csl-arm.bb
@@ -1,22 +1 @@
-DESCRIPTION = "The GNU cc and gcc C compilers."
-HOMEPAGE = "http://www.gnu.org/software/gcc/"
-SECTION = "devel"
-LICENSE = "GPL"
-BINV = "3.4.4"
-PV = "3.4.4+csl-arm-${SRCDATE}"
-PR = "r1"
-
-FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
-DEFAULT_PREFERENCE = "-1"
-
-inherit autotools gettext
-
-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"
-
-require gcc3-build.inc
-
-S = "${WORKDIR}/gcc"
-
+require gcc-${PV}.inc
-- 
cgit v1.2.3