Merge openembedded@openembedded.bkbits.net:packages-devel

into hyperion.kergoth.com:/home/kergoth/code/packages

2004/11/19 05:56:33-06:00 ti.com!kergoth
Merge hyperion.kergoth.com:code/packages
into odin.sc.ti.com:/home/kergoth/code/packages

2004/11/19 05:55:33-06:00 ti.com!kergoth
Add gcc 3.4.3 (not used by default).

2004/11/19 05:53:44-06:00 ti.com!kergoth
First pass at consolodating some of the gcc build metadata into .inc files.

BKrev: 419ddf72ZyrGIieZ7do9IbnL_7fMoA

27 files changed, 28 insertions, 691 deletions

diff --git a/gcc/gcc-3.4.3/gcc-3.4.0-arm-bigendian-uclibc.patch b/gcc/gcc-3.4.3/gcc-3.4.0-arm-bigendian-uclibc.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-3.4.3/gcc-3.4.0-arm-bigendian-uclibc.patch
diff --git a/gcc/gcc-3.4.3/gcc-3.4.0-arm-bigendian.patch b/gcc/gcc-3.4.3/gcc-3.4.0-arm-bigendian.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-3.4.3/gcc-3.4.0-arm-bigendian.patch
diff --git a/gcc/gcc-3.4.3/gcc-3.4.0-arm-lib1asm.patch b/gcc/gcc-3.4.3/gcc-3.4.0-arm-lib1asm.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-3.4.3/gcc-3.4.0-arm-lib1asm.patch
diff --git a/gcc/gcc-3.4.3/gcc-3.4.0-arm-nolibfloat.patch b/gcc/gcc-3.4.3/gcc-3.4.0-arm-nolibfloat.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-3.4.3/gcc-3.4.0-arm-nolibfloat.patch
diff --git a/gcc/gcc-3.4.3/gcc-3.4.0-arm-softfloat.patch b/gcc/gcc-3.4.3/gcc-3.4.0-arm-softfloat.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-3.4.3/gcc-3.4.0-arm-softfloat.patch
diff --git a/gcc/gcc-3.4.3/gcc-3.4.1-uclibc-100-conf.patch b/gcc/gcc-3.4.3/gcc-3.4.1-uclibc-100-conf.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-3.4.3/gcc-3.4.1-uclibc-100-conf.patch
diff --git a/gcc/gcc-3.4.3/gcc-3.4.1-uclibc-200-locale.patch b/gcc/gcc-3.4.3/gcc-3.4.1-uclibc-200-locale.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-3.4.3/gcc-3.4.1-uclibc-200-locale.patch
diff --git a/gcc/gcc-3.4.3/gcc-uclibc-3.4.0-120-softfloat.patch b/gcc/gcc-3.4.3/gcc-uclibc-3.4.0-120-softfloat.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-3.4.3/gcc-uclibc-3.4.0-120-softfloat.patch
diff --git a/gcc/gcc-3.4.3/gcc34-arm-ldm-peephole.patch b/gcc/gcc-3.4.3/gcc34-arm-ldm-peephole.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-3.4.3/gcc34-arm-ldm-peephole.patch
diff --git a/gcc/gcc-3.4.3/gcc34-arm-ldm.patch b/gcc/gcc-3.4.3/gcc34-arm-ldm.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-3.4.3/gcc34-arm-ldm.patch
diff --git a/gcc/gcc-3.4.3/gcc34-arm-tune.patch b/gcc/gcc-3.4.3/gcc34-arm-tune.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-3.4.3/gcc34-arm-tune.patch
diff --git a/gcc/gcc-3.4.3/gcc34-reverse-compare.patch b/gcc/gcc-3.4.3/gcc34-reverse-compare.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-3.4.3/gcc34-reverse-compare.patch
diff --git a/gcc/gcc-3.4.3/sdk-libstdc++-includes.patch b/gcc/gcc-3.4.3/sdk-libstdc++-includes.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-3.4.3/sdk-libstdc++-includes.patch
diff --git a/gcc/gcc-cross-initial_3.4.1.oe b/gcc/gcc-cross-initial_3.4.1.oe
index 4faee47e4d..16c1aaecc6 100644
--- a/gcc/gcc-cross-initial_3.4.1.oe
+++ b/gcc/gcc-cross-initial_3.4.1.oe
@@ -1,10 +1,8 @@
-SECTION = "devel"
 include gcc-cross_${PV}.oe
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
 DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][oe.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
-
 PACKAGES = ""
 
 # This is intended to be a -very- basic config
diff --git a/gcc/gcc-cross-initial_3.4.2.oe b/gcc/gcc-cross-initial_3.4.2.oe
index 4faee47e4d..16c1aaecc6 100644
--- a/gcc/gcc-cross-initial_3.4.2.oe
+++ b/gcc/gcc-cross-initial_3.4.2.oe
@@ -1,10 +1,8 @@
-SECTION = "devel"
 include gcc-cross_${PV}.oe
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
 DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][oe.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
-
 PACKAGES = ""
 
 # This is intended to be a -very- basic config
diff --git a/gcc/gcc-cross-initial_3.4.3.oe b/gcc/gcc-cross-initial_3.4.3.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-cross-initial_3.4.3.oe
diff --git a/gcc/gcc-cross_3.4.0.oe b/gcc/gcc-cross_3.4.0.oe
new file mode 100644
index 0000000000..4fadc573f2
--- /dev/null
+++ b/gcc/gcc-cross_3.4.0.oe
@@ -0,0 +1,11 @@
+include gcc_${PV}.oe
+inherit cross
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/gcc-${PV}"
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
+
+# Files for these are defined in the main gcc.oe
+PACKAGES = "libgcc libstdc++ libg2c"
+
+include gcc3-cross-build.inc
diff --git a/gcc/gcc-cross_3.4.1.oe b/gcc/gcc-cross_3.4.1.oe
index 8c02b9ddb9..4fadc573f2 100644
--- a/gcc/gcc-cross_3.4.1.oe
+++ b/gcc/gcc-cross_3.4.1.oe
@@ -1,4 +1,3 @@
-SECTION = "devel"
 include gcc_${PV}.oe
 inherit cross
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/gcc-${PV}"
@@ -8,89 +7,5 @@ PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # Files for these are defined in the main gcc.oe
 PACKAGES = "libgcc libstdc++ libg2c"
-OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
-INHIBIT_PACKAGE_STRIP = 1
 
-EXTRA_OECONF_PATHS = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
-		--with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++"
-
-export CPPFLAGS = ""
-export CXXFLAGS = ""
-export CFLAGS = ""
-export LDFLAGS = ""
-
-do_configure () {
-	rm -f ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${PV}/libgcc_eh.a
-	(cd ${S} && gnu-configize) || die "failure running gnu-configize"
-	oe_runconf
-}
-
-do_compile_prepend () {
-	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"
-}
-
-do_stage_append () {
-	for d in info man share/doc share/locale ; do
-		rm -rf ${CROSS_DIR}/$d
-	done
-
-	# These aren't useful on the cross toolchain
-	rm -f ${CROSS_DIR}/bin/*gcov
-	rm -f ${CROSS_DIR}/bin/*gccbug
-
-	# Fix a few include links so cross builds are happier
-	if [ ! -e ${STAGING_INCDIR}/c++ ]; then
-		mkdir -p ${STAGING_INCDIR}
-		ln -sf ${CROSS_DIR}/${TARGET_SYS}/include/c++ \
-			${STAGING_INCDIR}/
-	fi
-
-	# We use libiberty from binutils
-	rm -f ${CROSS_DIR}/lib/libiberty.a
-
-	# We probably don't need these
-	rmdir ${CROSS_DIR}/include || :
-
-	# We don't really need to keep this around
-	rm -rf ${CROSS_DIR}/share
-}
-
-python do_package() {
-	if oe.data.getVar('DEBIAN_NAMES', d, 1):
-		oe.data.setVar('PKG_libgcc', 'libgcc1', d)
-	oe.build.exec_func('package_do_package', d)
-}
-
-do_install () {
-	oe_runmake 'DESTDIR=${D}' install
-
-	# Move libgcc_s into /lib
-	mkdir -p ${D}/lib
-	if [ -f ${D}/lib/libgcc_s.so.? ]; then
-		# Already in the right location
-		:
-	elif [ -f ${D}/${prefix}/lib/libgcc_s.so.? ]; then
-		mv -f ${D}/${prefix}/lib/libgcc_s.so.* ${D}/lib
-	else
-		mv -f ${D}/${prefix}/*/lib/libgcc_s.so.* ${D}/lib
-	fi
-
-	# Move libstdc++ and libg2c into libdir (resetting our prefix to /usr
-	TGT_LIBDIR=`echo ${libdir} | sed -e 's,${CROSS_DIR},/usr,'`
-	mkdir -p ${D}/${TGT_LIBDIR}
-	mv -f ${D}/${prefix}/*/lib/libstdc++.so.* ${D}/${TGT_LIBDIR}
-	mv -f ${D}/${prefix}/*/lib/libg2c.so.* ${D}/${TGT_LIBDIR}
-
-	# Manually run the target stripper since we won't get it run by
-	# the packaging.
-	if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then
-		${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libstdc++.so.*
-		${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libg2c.so.*
-		${TARGET_PREFIX}strip ${D}/lib/libgcc_s.so.*
-	fi
-}
+include gcc3-cross-build.inc
diff --git a/gcc/gcc-cross_3.4.2.oe b/gcc/gcc-cross_3.4.2.oe
index 8c02b9ddb9..4fadc573f2 100644
--- a/gcc/gcc-cross_3.4.2.oe
+++ b/gcc/gcc-cross_3.4.2.oe
@@ -1,4 +1,3 @@
-SECTION = "devel"
 include gcc_${PV}.oe
 inherit cross
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/gcc-${PV}"
@@ -8,89 +7,5 @@ PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
 # Files for these are defined in the main gcc.oe
 PACKAGES = "libgcc libstdc++ libg2c"
-OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
-INHIBIT_PACKAGE_STRIP = 1
 
-EXTRA_OECONF_PATHS = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
-		--with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++"
-
-export CPPFLAGS = ""
-export CXXFLAGS = ""
-export CFLAGS = ""
-export LDFLAGS = ""
-
-do_configure () {
-	rm -f ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${PV}/libgcc_eh.a
-	(cd ${S} && gnu-configize) || die "failure running gnu-configize"
-	oe_runconf
-}
-
-do_compile_prepend () {
-	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"
-}
-
-do_stage_append () {
-	for d in info man share/doc share/locale ; do
-		rm -rf ${CROSS_DIR}/$d
-	done
-
-	# These aren't useful on the cross toolchain
-	rm -f ${CROSS_DIR}/bin/*gcov
-	rm -f ${CROSS_DIR}/bin/*gccbug
-
-	# Fix a few include links so cross builds are happier
-	if [ ! -e ${STAGING_INCDIR}/c++ ]; then
-		mkdir -p ${STAGING_INCDIR}
-		ln -sf ${CROSS_DIR}/${TARGET_SYS}/include/c++ \
-			${STAGING_INCDIR}/
-	fi
-
-	# We use libiberty from binutils
-	rm -f ${CROSS_DIR}/lib/libiberty.a
-
-	# We probably don't need these
-	rmdir ${CROSS_DIR}/include || :
-
-	# We don't really need to keep this around
-	rm -rf ${CROSS_DIR}/share
-}
-
-python do_package() {
-	if oe.data.getVar('DEBIAN_NAMES', d, 1):
-		oe.data.setVar('PKG_libgcc', 'libgcc1', d)
-	oe.build.exec_func('package_do_package', d)
-}
-
-do_install () {
-	oe_runmake 'DESTDIR=${D}' install
-
-	# Move libgcc_s into /lib
-	mkdir -p ${D}/lib
-	if [ -f ${D}/lib/libgcc_s.so.? ]; then
-		# Already in the right location
-		:
-	elif [ -f ${D}/${prefix}/lib/libgcc_s.so.? ]; then
-		mv -f ${D}/${prefix}/lib/libgcc_s.so.* ${D}/lib
-	else
-		mv -f ${D}/${prefix}/*/lib/libgcc_s.so.* ${D}/lib
-	fi
-
-	# Move libstdc++ and libg2c into libdir (resetting our prefix to /usr
-	TGT_LIBDIR=`echo ${libdir} | sed -e 's,${CROSS_DIR},/usr,'`
-	mkdir -p ${D}/${TGT_LIBDIR}
-	mv -f ${D}/${prefix}/*/lib/libstdc++.so.* ${D}/${TGT_LIBDIR}
-	mv -f ${D}/${prefix}/*/lib/libg2c.so.* ${D}/${TGT_LIBDIR}
-
-	# Manually run the target stripper since we won't get it run by
-	# the packaging.
-	if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then
-		${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libstdc++.so.*
-		${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libg2c.so.*
-		${TARGET_PREFIX}strip ${D}/lib/libgcc_s.so.*
-	fi
-}
+include gcc3-cross-build.inc
diff --git a/gcc/gcc-cross_3.4.3.oe b/gcc/gcc-cross_3.4.3.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-cross_3.4.3.oe
diff --git a/gcc/gcc-package.inc b/gcc/gcc-package.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-package.inc
diff --git a/gcc/gcc3-build.inc b/gcc/gcc3-build.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc3-build.inc
diff --git a/gcc/gcc3-cross-build.inc b/gcc/gcc3-cross-build.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc3-cross-build.inc
diff --git a/gcc/gcc_3.4.0.oe b/gcc/gcc_3.4.0.oe
index 22fa5e2747..4b7f9322dc 100644
--- a/gcc/gcc_3.4.0.oe
+++ b/gcc/gcc_3.4.0.oe
@@ -1,188 +1,24 @@
-SECTION = "devel"
 PR = "r2"
-
-inherit autotools gettext
-
 DESCRIPTION = "The GNU cc and gcc C compilers."
+HOMEPAGE = "http://www.gnu.org/software/gcc/"
+SECTION = "devel"
 LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 
-# 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 \
-	       ${libexecdir}/gcc/${TARGET_SYS}/${PV}/cc1 \
-	       ${libexecdir}/gcc/${TARGET_SYS}/${PV}/collect2 \
-	       ${libdir}/gcc/${TARGET_SYS}/${PV}/*.o \
-	       ${libdir}/gcc/${TARGET_SYS}/${PV}/specs \
-	       ${libdir}/gcc/${TARGET_SYS}/${PV}/lib* \
-	       ${libdir}/gcc/${TARGET_SYS}/${PV}/include"
-
-FILES_${PN}-symlinks = "${bindir}/cc \
-			${bindir}/gcc \
-			${bindir}/cpp \
-			${bindir}/gcov \
-			${bindir}/gccbug"
-
-FILES_${PN}-f77 = "${bindir}/${TARGET_PREFIX}g77 \
-		   ${libexecdir}/gcc/${TARGET_SYS}/${PV}/f771"
-
-FILES_${PN}-f77-symlinks = "${bindir}/g77 \
-			    ${bindir}/f77"
-
-# Called from within gcc-cross, so libdir is set wrong
-#FILES_libg2c = "${libdir}/libg2c.so.*"
-FILES_libg2c = "/usr/lib/libg2c.so.*"
-
-FILES_libg2c-dev = "${libdir}/libg2c.so \
-			  ${libdir}/libg2c.a \
-			  ${libdir}/libfrtbegin.a"
-
-FILES_${PN}-c++ = "${bindir}/${TARGET_PREFIX}g++ \
-		   ${libexecdir}/gcc/${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++ = "/usr/lib/libstdc++.so.*"
-
-FILES_libstdc++-dev = "${includedir}/c++/${PV} \
-		       ${libdir}/libstdc++.so \
-		       ${libdir}/libstdc++.la \
-		       ${libdir}/libstdc++.a \
-		       ${libdir}/libsupc++.la \
-		       ${libdir}/libsupc++.a"
+inherit autotools gettext
 
-FILES_${PN}-doc = "${infodir} \
-		   ${mandir} \
-		   ${libdir}/gcc/${TARGET_SYS}/${PV}/include/README"
+include gcc-package.inc
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://gcc34-reverse-compare.patch;patch=1 \
-	   file://gcc34-pre-modify.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://gcc34-15089.patch;patch=1 \
-	   file://gcc34-15666.patch;patch=1 \
-	   file://gcc-uclibc-3.4.0-100-conf.patch;patch=1 \
-	   file://gcc-uclibc-3.4.0-200-code.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"
 
-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', ''][oe.data.getVar('USE_NLS', d, 1) != 'no']} \
-                --with-gnu-ld \
-                --enable-shared \
-                --enable-target-optspace \
-                --enable-languages=c,c++,f77 \
-                --enable-threads=posix \
-                --enable-multilib \
-                --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(oe, d)}"
-
-def get_gcc_fpu_setting(oe, d):
-	if oe.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
-		return "--with-float=soft"
-	return ""
-
-python __anonymous () {
-    import oe, re
-    if (re.match('linux-uclibc$', oe.data.getVar('TARGET_OS', d, 1)) != None):
-        oe.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d)
-    elif (re.match('linux$', oe.data.getVar('TARGET_OS', d, 1)) != None):
-        oe.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 /usr/lib{,exec}/gcc stuff ...
-	rm -r ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/install-tools
-	rm -r ${D}/${libexecdir}/gcc/${TARGET_SYS}/${PV}/install-tools
-
-	# Move libgcc_s into /lib
-	mkdir -p ${D}/lib
-	mv ${D}/${libdir}/libgcc_s.so.* ${D}/lib
-	rm ${D}/${libdir}/libgcc_s.so
-	ln -sf `echo ${libdir}/gcc/${TARGET_SYS}/${PV} \
-		| tr -s / \
-		| sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.? \
-		      ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/libgcc_s.so
-
-	# We don't need libtool libraries
-	rm ${D}/${libdir}/libg2c.la
-
-	# Cleanup manpages..
-	rm -r ${D}/${mandir}/man7
-
-	# We use libiberty from binutils
-	rm ${D}/${libdir}/libiberty.a
-
-	cd ${D}/${bindir}
-
-	# We care about g++ not c++
-	rm *c++
-
-	# We don't care about the gcc-<version> ones for this
-	rm *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
-}
+include gcc3-build.inc
diff --git a/gcc/gcc_3.4.1.oe b/gcc/gcc_3.4.1.oe
index 58001c4d4d..4b7f9322dc 100644
--- a/gcc/gcc_3.4.1.oe
+++ b/gcc/gcc_3.4.1.oe
@@ -1,73 +1,13 @@
-SECTION = "devel"
 PR = "r2"
-
-inherit autotools gettext
-
 DESCRIPTION = "The GNU cc and gcc C compilers."
+HOMEPAGE = "http://www.gnu.org/software/gcc/"
+SECTION = "devel"
 LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 
-# 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 \
-	       ${libexecdir}/gcc/${TARGET_SYS}/${PV}/cc1 \
-	       ${libexecdir}/gcc/${TARGET_SYS}/${PV}/collect2 \
-	       ${libdir}/gcc/${TARGET_SYS}/${PV}/*.o \
-	       ${libdir}/gcc/${TARGET_SYS}/${PV}/specs \
-	       ${libdir}/gcc/${TARGET_SYS}/${PV}/lib* \
-	       ${libdir}/gcc/${TARGET_SYS}/${PV}/include"
-
-FILES_${PN}-symlinks = "${bindir}/cc \
-			${bindir}/gcc \
-			${bindir}/cpp \
-			${bindir}/gcov \
-			${bindir}/gccbug"
-
-FILES_${PN}-f77 = "${bindir}/${TARGET_PREFIX}g77 \
-		   ${libexecdir}/gcc/${TARGET_SYS}/${PV}/f771"
-
-FILES_${PN}-f77-symlinks = "${bindir}/g77 \
-			    ${bindir}/f77"
-
-# Called from within gcc-cross, so libdir is set wrong
-#FILES_libg2c = "${libdir}/libg2c.so.*"
-FILES_libg2c = "/usr/lib/libg2c.so.*"
-
-FILES_libg2c-dev = "${libdir}/libg2c.so \
-			  ${libdir}/libg2c.a \
-			  ${libdir}/libfrtbegin.a"
-
-FILES_${PN}-c++ = "${bindir}/${TARGET_PREFIX}g++ \
-		   ${libexecdir}/gcc/${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++ = "/usr/lib/libstdc++.so.*"
-
-FILES_libstdc++-dev = "${includedir}/c++/${PV} \
-		       ${libdir}/libstdc++.so \
-		       ${libdir}/libstdc++.la \
-		       ${libdir}/libstdc++.a \
-		       ${libdir}/libsupc++.la \
-		       ${libdir}/libsupc++.a"
+inherit autotools gettext
 
-FILES_${PN}-doc = "${infodir} \
-		   ${mandir} \
-		   ${libdir}/gcc/${TARGET_SYS}/${PV}/include/README"
+include gcc-package.inc
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://gcc34-reverse-compare.patch;patch=1 \
@@ -81,106 +21,4 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://gcc-3.4.0-arm-bigendian.patch;patch=1 \
 	   file://gcc-3.4.0-arm-bigendian-uclibc.patch;patch=1"
 
-MIRRORS_prepend () {
-${GNU_MIRROR}/gcc/	http://gcc.get-software.com/releases/
-${GNU_MIRROR}/gcc/	http://mirrors.rcn.net/pub/sourceware/gcc/releases/
-}
-
-S = "${WORKDIR}/gcc-${PV}"
-B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
-
-EXTRA_OECONF = "${@['--enable-clocale=generic', ''][oe.data.getVar('USE_NLS', d, 1) != 'no']} \
-                --with-gnu-ld \
-                --enable-shared \
-                --enable-target-optspace \
-                --enable-languages=c,c++,f77 \
-                --enable-threads=posix \
-                --enable-multilib \
-                --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(oe, d)}"
-
-def get_gcc_fpu_setting(oe, d):
-	if oe.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
-		return "--with-float=soft"
-	return ""
-
-python __anonymous () {
-    import oe, re
-    if (re.match('linux-uclibc$', oe.data.getVar('TARGET_OS', d, 1)) != None):
-        oe.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d)
-    elif (re.match('linux$', oe.data.getVar('TARGET_OS', d, 1)) != None):
-        oe.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 /usr/lib{,exec}/gcc stuff ...
-	rm -r ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/install-tools
-	rm -r ${D}/${libexecdir}/gcc/${TARGET_SYS}/${PV}/install-tools
-
-	# Move libgcc_s into /lib
-	mkdir -p ${D}/lib
-	mv ${D}/${libdir}/libgcc_s.so.* ${D}/lib
-	rm ${D}/${libdir}/libgcc_s.so
-	ln -sf `echo ${libdir}/gcc/${TARGET_SYS}/${PV} \
-		| tr -s / \
-		| sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.? \
-		      ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/libgcc_s.so
-
-	# We don't need libtool libraries
-	rm ${D}/${libdir}/libg2c.la
-
-	# Cleanup manpages..
-	rm -r ${D}/${mandir}/man7
-
-	# We use libiberty from binutils
-	rm ${D}/${libdir}/libiberty.a
-
-	cd ${D}/${bindir}
-
-	# We care about g++ not c++
-	rm *c++
-
-	# We don't care about the gcc-<version> ones for this
-	rm *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
-}
+include gcc3-build.inc
diff --git a/gcc/gcc_3.4.2.oe b/gcc/gcc_3.4.2.oe
index 11bf45b52f..4b7f9322dc 100644
--- a/gcc/gcc_3.4.2.oe
+++ b/gcc/gcc_3.4.2.oe
@@ -1,74 +1,13 @@
 PR = "r2"
-
-inherit autotools gettext
-
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 
-# 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 \
-	       ${libexecdir}/gcc/${TARGET_SYS}/${PV}/cc1 \
-	       ${libexecdir}/gcc/${TARGET_SYS}/${PV}/collect2 \
-	       ${libdir}/gcc/${TARGET_SYS}/${PV}/*.o \
-	       ${libdir}/gcc/${TARGET_SYS}/${PV}/specs \
-	       ${libdir}/gcc/${TARGET_SYS}/${PV}/lib* \
-	       ${libdir}/gcc/${TARGET_SYS}/${PV}/include"
-
-FILES_${PN}-symlinks = "${bindir}/cc \
-			${bindir}/gcc \
-			${bindir}/cpp \
-			${bindir}/gcov \
-			${bindir}/gccbug"
-
-FILES_${PN}-f77 = "${bindir}/${TARGET_PREFIX}g77 \
-		   ${libexecdir}/gcc/${TARGET_SYS}/${PV}/f771"
-
-FILES_${PN}-f77-symlinks = "${bindir}/g77 \
-			    ${bindir}/f77"
-
-# Called from within gcc-cross, so libdir is set wrong
-#FILES_libg2c = "${libdir}/libg2c.so.*"
-FILES_libg2c = "/usr/lib/libg2c.so.*"
-
-FILES_libg2c-dev = "${libdir}/libg2c.so \
-			  ${libdir}/libg2c.a \
-			  ${libdir}/libfrtbegin.a"
-
-FILES_${PN}-c++ = "${bindir}/${TARGET_PREFIX}g++ \
-		   ${libexecdir}/gcc/${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++ = "/usr/lib/libstdc++.so.*"
-
-FILES_libstdc++-dev = "${includedir}/c++/${PV} \
-		       ${libdir}/libstdc++.so \
-		       ${libdir}/libstdc++.la \
-		       ${libdir}/libstdc++.a \
-		       ${libdir}/libsupc++.la \
-		       ${libdir}/libsupc++.a"
+inherit autotools gettext
 
-FILES_${PN}-doc = "${infodir} \
-		   ${mandir} \
-		   ${libdir}/gcc/${TARGET_SYS}/${PV}/include/README"
+include gcc-package.inc
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://gcc34-reverse-compare.patch;patch=1 \
@@ -82,117 +21,4 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://gcc-3.4.0-arm-bigendian.patch;patch=1 \
 	   file://gcc-3.4.0-arm-bigendian-uclibc.patch;patch=1"
 
-MIRRORS_prepend () {
-${GNU_MIRROR}/gcc/	http://gcc.get-software.com/releases/
-${GNU_MIRROR}/gcc/	http://mirrors.rcn.net/pub/sourceware/gcc/releases/
-}
-
-S = "${WORKDIR}/gcc-${PV}"
-B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
-
-EXTRA_OECONF = "${@['--enable-clocale=generic', ''][oe.data.getVar('USE_NLS', d, 1) != 'no']} \
-                --with-gnu-ld \
-                --enable-shared \
-                --enable-target-optspace \
-                --enable-languages=c,c++,f77 \
-                --enable-threads=posix \
-                --enable-multilib \
-                --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(oe, d)}"
-
-def get_gcc_fpu_setting(oe, d):
-	if oe.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
-		return "--with-float=soft"
-	return ""
-
-python __anonymous () {
-    import oe, re
-    if (re.match('linux-uclibc$', oe.data.getVar('TARGET_OS', d, 1)) != None):
-        oe.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d)
-    elif (re.match('linux$', oe.data.getVar('TARGET_OS', d, 1)) != None):
-        oe.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d)
-}
-
-CPPFLAGS = ""
-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
-	export CC_FOR_BUILD="${BUILD_CC}"
-	export CXX_FOR_BUILD="${BUILD_CXX}"
-	export CFLAGS_FOR_BUILD="${BUILD_CFLAGS}"
-	export CPPFLAGS_FOR_BUILD="${BUILD_CPPFLAGS}"
-	export CXXFLAGS_FOR_BUILD="${BUILD_CXXFLAGS}"
-	export LDFLAGS_FOR_BUILD="${BUILD_LDFLAGS}"
-	(cd ${S} && gnu-configize) || die "failure running gnu-configize"
-	oe_runconf
-}
-
-do_install () {
-	autotools_do_install
-
-	# Cleanup some of the /usr/lib{,exec}/gcc stuff ...
-	rm -r ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/install-tools
-	rm -r ${D}/${libexecdir}/gcc/${TARGET_SYS}/${PV}/install-tools
-
-	# Hack around specs file assumptions
-	sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/specs
-
-	# Move libgcc_s into /lib
-	mkdir -p ${D}/lib
-	mv ${D}/${libdir}/libgcc_s.so.* ${D}/lib
-	rm ${D}/${libdir}/libgcc_s.so
-	ln -sf `echo ${libdir}/gcc/${TARGET_SYS}/${PV} \
-		| tr -s / \
-		| sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.? \
-		      ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/libgcc_s.so
-
-	# We don't need libtool libraries
-	rm ${D}/${libdir}/libg2c.la
-
-	# Cleanup manpages..
-	rm -r ${D}/${mandir}/man7
-
-	# We use libiberty from binutils
-	rm ${D}/${libdir}/libiberty.a
-
-	cd ${D}/${bindir}
-
-	# We care about g++ not c++
-	rm *c++
-
-	# We don't care about the gcc-<version> ones for this
-	rm *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
-}
-
+include gcc3-build.inc
diff --git a/gcc/gcc_3.4.3.oe b/gcc/gcc_3.4.3.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc_3.4.3.oe