16 files changed, 7 insertions, 190 deletions
diff --git a/meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb b/meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
deleted file mode 100644
index aff22fb69..000000000
--- a/meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require gcc-cross_csl-arm-2005q3.bb
-require gcc-cross-initial.inc
diff --git a/meta/packages/gcc/gcc-cross-initial_csl-arm-2006q1.bb b/meta/packages/gcc/gcc-cross-initial_csl-arm-2006q1.bb
deleted file mode 100644
index 2a5d4fc0c..000000000
--- a/meta/packages/gcc/gcc-cross-initial_csl-arm-2006q1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require gcc-cross_${PV}.bb
-require gcc-cross-initial.inc
-
-S = "${WORKDIR}/gcc-2006q1"
-
-EXTRA_OECONF += "--disable-libmudflap \
-		--disable-libssp"
diff --git a/meta/packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb b/meta/packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb
deleted file mode 100644
index 1a921d2d9..000000000
--- a/meta/packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require gcc-cross_${PV}.bb
-require gcc-cross-initial.inc
-
-S = "${WORKDIR}/gcc-4.2"
-
-EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap "
-
-# Hack till we fix *libc properly
-do_install_append() {
-	ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/
-}
-
diff --git a/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2005q3.bb b/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2005q3.bb
deleted file mode 100644
index 6e9c252e7..000000000
--- a/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2005q3.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require gcc-cross_csl-arm-2005q3.bb
-require gcc-cross-intermediate.inc
diff --git a/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2006q1.bb b/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2006q1.bb
deleted file mode 100644
index 2d4b55f99..000000000
--- a/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2006q1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require gcc-cross_${PV}.bb
-require gcc-cross-intermediate.inc
-
-S = "${WORKDIR}/gcc-2006q1"
-
-EXTRA_OECONF += "--disable-libmudflap \
-		--disable-libssp"
diff --git a/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2007q3.bb b/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2007q3.bb
deleted file mode 100644
index 0dabd0b8d..000000000
--- a/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2007q3.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require gcc-cross_${PV}.bb
-require gcc-cross-intermediate.inc
-
-S = "${WORKDIR}/gcc-4.2"
-
-EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap "
-
-# Hack till we fix *libc properly
-do_install_append() {
-	ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/
-}
-
diff --git a/meta/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb b/meta/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
index e4068cbeb..18cdc1392 100644
--- a/meta/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
+++ b/meta/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
@@ -2,11 +2,15 @@
 # This kernel compiler is required by the Nokia tablets
 # Please talk to Rod Whitby and Richard Purdie before considering removing this file.
 
-DEFAULT_PREFERENCE = "-1"
-
-require gcc-cross-initial_csl-arm-2005q3.bb
+require gcc-csl-arm-2005q3.inc
+require gcc-cross.inc
+require gcc-configure-cross.inc
+require gcc-package-cross.inc
+require gcc-cross-initial.inc
 require gcc-cross-kernel.inc
 
+DEFAULT_PREFERENCE = "-1"
+
 PR = "r1"
 
 SRC_URI += "file://gcc-3.4.4-makefile-fix.patch;patch=1"
diff --git a/meta/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/meta/packages/gcc/gcc-cross_csl-arm-2005q3.bb
deleted file mode 100644
index 508585501..000000000
--- a/meta/packages/gcc/gcc-cross_csl-arm-2005q3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-PR = "r3"
-
-require gcc-csl-arm-2005q3.inc
-require gcc-cross.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
diff --git a/meta/packages/gcc/gcc-cross_csl-arm-2006q1.bb b/meta/packages/gcc/gcc-cross_csl-arm-2006q1.bb
deleted file mode 100644
index 29231920b..000000000
--- a/meta/packages/gcc/gcc-cross_csl-arm-2006q1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-PR = "r2"
-
-require gcc-csl-arm-2006q1.inc
-require gcc-cross.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
diff --git a/meta/packages/gcc/gcc-cross_csl-arm-2007q3.bb b/meta/packages/gcc/gcc-cross_csl-arm-2007q3.bb
deleted file mode 100644
index b00bebc5c..000000000
--- a/meta/packages/gcc/gcc-cross_csl-arm-2007q3.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-PR = "r0"
-
-require gcc-csl-arm-2007q3.inc
-require gcc-cross4.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
-
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
-
-EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
-
-#We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include
-CFLAGS = ""
-CXXFLAGS = ""
-LDFLAGS = ""
-
-# staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain
-do_compile_prepend() {
-	ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/
-	ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/
-	ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/ 
-	sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure
-
-}
-
-ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${target_libdir} -isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/meta/packages/gcc/gcc-csl-arm-2006q1.inc b/meta/packages/gcc/gcc-csl-arm-2006q1.inc
deleted file mode 100644
index a208170b4..000000000
--- a/meta/packages/gcc/gcc-csl-arm-2006q1.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-require gcc-common.inc
-
-BINV = "4.1.0"
-PV = "4.1.0+csl-arm-2006q1-6"
-
-FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
-
-SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2006q1-6-arm-none-eabi.src.tar.bz2 \
-           file://gcc-configure-no-fortran.patch;patch=1;pnum=1 \
-           file://gcc-new-makeinfo.patch;patch=1"
-
-S = "${WORKDIR}/gcc-2006q1"
-
-do_unpack2() {
-	cd ${WORKDIR}
-	tar -xvjf ./arm-2006q1-6-arm-none-eabi/gcc-2006q1-6.tar.bz2
-}
-
-addtask unpack2 after do_unpack before do_patch
diff --git a/meta/packages/gcc/gcc-csl-arm-2007q3.inc b/meta/packages/gcc/gcc-csl-arm-2007q3.inc
deleted file mode 100644
index 601b4f011..000000000
--- a/meta/packages/gcc/gcc-csl-arm-2007q3.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-require gcc-common.inc
-
-BINV = "4.2.1"
-PV = "4.2.1+csl-arm-2007q3-53"
-
-FILESPATH = "${FILE_DIRNAME}/gcc-csl-arm-2007q3:${FILE_DIRNAME}/gcc-csl-arm"
-
-SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2007q3-53-arm-none-eabi.src.tar.bz2 \
-           file://gcc-new-makeinfo.patch;patch=1 \
-#           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://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://gcc41-configure.in.patch;patch=1 \
-           file://arm-nolibfloat.patch;patch=1 \
-           file://arm-softfloat.patch;patch=1 \
-           file://zecke-xgcc-cpp.patch;patch=1 \
-#           file://gfortran.patch;patch=1 \
-#           file://fortran-static-linking.patch;patch=1 \
-#           file://gcc-configure-no-fortran.patch;patch=1;pnum=1 \
-#           file://gcc-new-makeinfo.patch;patch=1 \
-"
-
-
-S = "${WORKDIR}/gcc-4.2"
-
-do_unpack2() {
-	cd ${WORKDIR}
-	tar -xvjf ./arm-2007q3-53-arm-none-eabi/gcc-2007q3-53.tar.bz2
-}
-
-# Language Overrides
-FORTRAN = ""
-#FORTRAN_linux-gnueabi = ",fortran"
-#JAVA = ",java"
-
-EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
-ARM_INSTRUCTION_SET = "arm"
-
-addtask unpack2 after do_unpack before do_patch
diff --git a/meta/packages/gcc/gcc-csl-arm-2007q3/gcc-new-makeinfo.patch b/meta/packages/gcc/gcc-csl-arm-2007q3/gcc-new-makeinfo.patch
deleted file mode 100644
index b59bd76c8..000000000
--- a/meta/packages/gcc/gcc-csl-arm-2007q3/gcc-new-makeinfo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- /tmp/configure	2008-05-18 12:57:11.378648834 +0200
-+++ gcc-4.2/configure	2008-05-18 12:58:38.309478684 +0200
-@@ -3776,7 +3776,7 @@
-     # For an installed makeinfo, we require it to be from texinfo 4.4 or
-     # higher, else we use the "missing" dummy.
-     if ${MAKEINFO} --version \
--       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
-+       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
-       :
-     else
-       MAKEINFO="$MISSING makeinfo"
---- /tmp/configure.in	2008-05-18 12:57:32.665314708 +0200
-+++ gcc-4.2/configure.in	2008-05-18 12:59:03.000000000 +0200
-@@ -2271,7 +2271,7 @@
-     # For an installed makeinfo, we require it to be from texinfo 4.4 or
-     # higher, else we use the "missing" dummy.
-     if ${MAKEINFO} --version \
--       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
-+       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
-       :
-     else
-       MAKEINFO="$MISSING makeinfo"
diff --git a/meta/packages/gcc/gcc_csl-arm-2005q3.bb b/meta/packages/gcc/gcc_csl-arm-2005q3.bb
deleted file mode 100644
index 2df12ef9e..000000000
--- a/meta/packages/gcc/gcc_csl-arm-2005q3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-PR = "r4"
-
-require gcc-${PV}.inc
-require gcc-configure-target.inc
-require gcc-package-target.inc
diff --git a/meta/packages/gcc/gcc_csl-arm-2006q1.bb b/meta/packages/gcc/gcc_csl-arm-2006q1.bb
deleted file mode 100644
index 4999c6a53..000000000
--- a/meta/packages/gcc/gcc_csl-arm-2006q1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-PR = "r2"
-
-require gcc-${PV}.inc
-require gcc-configure-target.inc
-require gcc-package-target.inc
diff --git a/meta/packages/gcc/gcc_csl-arm-2007q3.bb b/meta/packages/gcc/gcc_csl-arm-2007q3.bb
deleted file mode 100644
index d61071317..000000000
--- a/meta/packages/gcc/gcc_csl-arm-2007q3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-PR = "r0"
-
-require gcc-${PV}.inc
-require gcc-configure-target.inc
-require gcc-package-target.inc