merge of 36cb9cba2fd4c56a699cbd4285642c1a6f1fa710

     and 6412fbc6b6ef09f97014f02c61ab03c743c2e265

8 files changed, 34 insertions, 21 deletions

diff --git a/packages/gcc/gcc-cross-initial_csl-arm-20050416.bb b/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
index 48c80864e2..48c80864e2 100644
--- a/packages/gcc/gcc-cross-initial_csl-arm-20050416.bb
+++ b/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
diff --git a/packages/gcc/gcc-cross-initial_csl-arm-20050603.bb b/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb
index 48c80864e2..48c80864e2 100644
--- a/packages/gcc/gcc-cross-initial_csl-arm-20050603.bb
+++ b/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb
diff --git a/packages/gcc/gcc-cross_csl-arm-20050603.bb b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
index e815b2f9e3..93c58aca53 100644
--- a/packages/gcc/gcc-cross_csl-arm-20050603.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
@@ -1,4 +1,4 @@
-include gcc_csl-arm-20050603.bb
+include gcc_csl-arm-2005q3.bb
 # path mangling, needed by the cross packaging
 include gcc-paths-cross.inc
 inherit cross
diff --git a/packages/gcc/gcc-cross_csl-arm-20050416.bb b/packages/gcc/gcc-cross_csl-arm-cvs.bb
index e8df623aeb..f83de2598d 100644
--- a/packages/gcc/gcc-cross_csl-arm-20050416.bb
+++ b/packages/gcc/gcc-cross_csl-arm-cvs.bb
@@ -1,10 +1,10 @@
-include gcc_csl-arm-20050416.bb
+include gcc_csl-arm-cvs.bb
 # path mangling, needed by the cross packaging
 include gcc-paths-cross.inc
 inherit cross
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r4"
+PR = "r0"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc_csl-arm-20050416.bb b/packages/gcc/gcc_csl-arm-20050416.bb
deleted file mode 100644
index 58badbb8ab..0000000000
--- a/packages/gcc/gcc_csl-arm-20050416.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-include gcc_csl-arm.bb
-
-SRC_URI += "file://15342.patch;patch=1 file://gcc-3.4.0-arm-lib1asm.patch;patch=1 file://no-libfloat.patch;patch=1"
-
-PR = "r3"
-
-SRCDATE = "20050416"
-OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
-DEFAULT_PREFERENCE_arm-linux = "-1"
-DEFAULT_PREFERENCE_arm-linuxeabi = "1"
-
diff --git a/packages/gcc/gcc_csl-arm-2005q3.bb b/packages/gcc/gcc_csl-arm-2005q3.bb
new file mode 100644
index 0000000000..7fa23a2438
--- /dev/null
+++ b/packages/gcc/gcc_csl-arm-2005q3.bb
@@ -0,0 +1,26 @@
+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"
+PR = "r0"
+
+FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
+
+inherit autotools gettext
+
+include gcc-package.inc
+
+SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm/2005q3-2/arm-2005q3-2-arm-none-linux-gnueabi.src.tar.bz2"
+
+do_unpack2() {
+	cd ${WORKDIR}
+	tar -xvjf ./arm-2005q3-2-arm-none-linux-gnueabi/gcc-2005q3-2.tar.bz2
+}
+
+addtask unpack2 after do_unpack before do_patch
+
+include gcc3-build.inc
+
+S = "${WORKDIR}/gcc-2005q3"
diff --git a/packages/gcc/gcc_csl-arm-20050603.bb b/packages/gcc/gcc_csl-arm-cvs.bb
index e322bba647..bc704d51db 100644
--- a/packages/gcc/gcc_csl-arm-20050603.bb
+++ b/packages/gcc/gcc_csl-arm-cvs.bb
@@ -7,7 +7,4 @@ SRC_URI += "file://15342.patch;patch=1 file://gcc-3.4.0-arm-lib1asm.patch;patch=
 
 PR = "r0"
 
-SRCDATE = "20050603"
-OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
-
-DEFAULT_PREFERENCE_arm = "-1"
+DEFAULT_PREFERENCE = "-1"
diff --git a/packages/gcc/gcc_csl-arm.bb b/packages/gcc/gcc_csl-arm.bb
index 03c6b8c19f..d437ece065 100644
--- a/packages/gcc/gcc_csl-arm.bb
+++ b/packages/gcc/gcc_csl-arm.bb
@@ -1,11 +1,12 @@
-PR = "r0"
 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>"
-PV = "3.4.3+csl-arm-${SRCDATE}"
-BINV = "3.4.3"
+BINV = "3.4.4"
+PV = "3.4.4+csl-arm-${SRCDATE}"
+PR = "r0"
+
 FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
 DEFAULT_PREFERENCE = "-1"