10 files changed, 5 insertions, 91 deletions
diff --git a/packages/gcc/gcc-4.2.2.inc b/packages/gcc/gcc-4.2.2.inc
index 79277d3a06..4959cc711f 100644
--- a/packages/gcc/gcc-4.2.2.inc
+++ b/packages/gcc/gcc-4.2.2.inc
@@ -77,12 +77,5 @@ 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-initial_csl-arm-cvs.bb b/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb
deleted file mode 100644
index 1639511362..0000000000
--- a/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require gcc-cross_${PV}.bb
-require gcc-cross-initial.inc
diff --git a/packages/gcc/gcc-cross_3.3.3.bb b/packages/gcc/gcc-cross_3.3.3.bb
index 5fb22c92bd..b64756246c 100644
--- a/packages/gcc/gcc-cross_3.3.3.bb
+++ b/packages/gcc/gcc-cross_3.3.3.bb
@@ -1,15 +1,8 @@
 PR = "r3"
 
 require gcc-${PV}.inc
-require gcc-package-target.inc
-inherit cross
-
-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"
-INHIBIT_PACKAGE_STRIP = "1"
+require gcc-cross.inc
+require gcc-package-cross.inc
 
 EXTRA_OECONF_PATHS = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
 		--with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++"
@@ -61,34 +54,3 @@ do_stage_append () {
 	# We don't really need to keep this around
 	rm -rf ${CROSS_DIR}/share
 }
-
-python do_package() {
-	if bb.data.getVar('DEBIAN_NAMES', d, 1):
-		bb.data.setVar('PKG_libgcc', 'libgcc1', d)
-	bb.build.exec_func('package_do_package', d)
-}
-
-do_install () {
-	oe_runmake 'DESTDIR=${D}' install
-
-	# Move libgcc_s into /lib
-	mkdir -p ${D}${base_libdir}
-	if [ "${BUILD_SYS}" == "${TARGET_SYS}" ]; then
-		# native builds drop one pathname component
-		mv -f ${D}${prefix}/lib/libgcc_s.so.* ${D}${base_libdir}
-	else
-		mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${base_libdir}
-	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.
-	${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libstdc++.so.*
-	${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libg2c.so.*
-	${TARGET_PREFIX}strip ${D}${base_libdir}/libgcc_s.so.*
-}
diff --git a/packages/gcc/gcc-cross_csl-arm-cvs.bb b/packages/gcc/gcc-cross_csl-arm-cvs.bb
deleted file mode 100644
index 33d64dc8e7..0000000000
--- a/packages/gcc/gcc-cross_csl-arm-cvs.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-PR = "r1"
-
-require gcc-csl-arm-cvs.inc
-require gcc-cross.inc
-require gcc3-build-cross.inc
-require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_csl-arm.bb b/packages/gcc/gcc-cross_csl-arm.bb
deleted file mode 100644
index be567b4a1d..0000000000
--- a/packages/gcc/gcc-cross_csl-arm.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-PR = "r1"
-
-require gcc-csl-arm.inc
-require gcc-cross.inc
-require gcc3-build-cross.inc
-require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-csl-arm-cvs.inc b/packages/gcc/gcc-csl-arm-cvs.inc
deleted file mode 100644
index a575fcbbc0..0000000000
--- a/packages/gcc/gcc-csl-arm-cvs.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-require gcc-csl-arm.inc
-
-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"
-
-DEFAULT_PREFERENCE = "-1"
diff --git a/packages/gcc/gcc-csl-arm.inc b/packages/gcc/gcc-csl-arm.inc
deleted file mode 100644
index c9e68dfe6d..0000000000
--- a/packages/gcc/gcc-csl-arm.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-require gcc-common.inc
-BINV = "3.4.4"
-PV = "3.4.4+csl-arm-${SRCDATE}"
-
-FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
-DEFAULT_PREFERENCE = "-1"
-
-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_4.2.2.bb b/packages/gcc/gcc_4.2.2.bb
index b553b20f72..a32b55f91f 100644
--- a/packages/gcc/gcc_4.2.2.bb
+++ b/packages/gcc/gcc_4.2.2.bb
@@ -2,3 +2,6 @@ PR = "r6"
 
 require gcc-${PV}.inc
 require gcc-package-target.inc
+
+SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1"
+
diff --git a/packages/gcc/gcc_csl-arm-cvs.bb b/packages/gcc/gcc_csl-arm-cvs.bb
deleted file mode 100644
index 2cccfb4d25..0000000000
--- a/packages/gcc/gcc_csl-arm-cvs.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-PR = "r1"
-
-require gcc-${PV}.inc
-require gcc-package-target.inc
diff --git a/packages/gcc/gcc_csl-arm.bb b/packages/gcc/gcc_csl-arm.bb
deleted file mode 100644
index 2cccfb4d25..0000000000
--- a/packages/gcc/gcc_csl-arm.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-PR = "r1"
-
-require gcc-${PV}.inc
-require gcc-package-target.inc