- binutils 2.15.90.0.3 / gcc 3.4.0 toolchain

- support in glibc and uclibc for gcc 3.4.0
- new target setup for uclibc, TARGET_OS=linux-uclibc to match the uclibc
  project's setup and modern config.sub already has support for it.

BKrev: 408dcb42JOaGKxGg3PSn6IwU4Kimfw

26 files changed, 36 insertions, 105 deletions

diff --git a/gcc/gcc-3.4.0/gcc-uclibc-3.4.0-100-conf.patch.orig b/gcc/gcc-3.4.0/gcc-uclibc-3.4.0-100-conf.patch.orig
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-3.4.0/gcc-uclibc-3.4.0-100-conf.patch.orig
diff --git a/gcc/gcc-3.4.0/gcc-uclibc-3.4.0-120-softfloat.patch b/gcc/gcc-3.4.0/gcc-uclibc-3.4.0-120-softfloat.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-3.4.0/gcc-uclibc-3.4.0-120-softfloat.patch
diff --git a/gcc/gcc-3.4.0/gcc-uclibc-3.4.0-200-code.patch b/gcc/gcc-3.4.0/gcc-uclibc-3.4.0-200-code.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-3.4.0/gcc-uclibc-3.4.0-200-code.patch
diff --git a/gcc/gcc-3.4.0/gcc34-arm-ldm-peephole.patch b/gcc/gcc-3.4.0/gcc34-arm-ldm-peephole.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-3.4.0/gcc34-arm-ldm-peephole.patch
diff --git a/gcc/gcc-3.4.0/gcc34-arm-ldm.patch b/gcc/gcc-3.4.0/gcc34-arm-ldm.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-3.4.0/gcc34-arm-ldm.patch
diff --git a/gcc/gcc-3.4.0/gcc34-arm-tune.patch b/gcc/gcc-3.4.0/gcc34-arm-tune.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-3.4.0/gcc34-arm-tune.patch
diff --git a/gcc/gcc-3.4.0/gcc34-pre-modify.patch b/gcc/gcc-3.4.0/gcc34-pre-modify.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-3.4.0/gcc34-pre-modify.patch
diff --git a/gcc/gcc-3.4.0/gcc34-reverse-compare.patch b/gcc/gcc-3.4.0/gcc34-reverse-compare.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-3.4.0/gcc34-reverse-compare.patch
diff --git a/gcc/gcc-cross-initial_3.3.2.oe b/gcc/gcc-cross-initial_3.3.2.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-cross-initial_3.3.2.oe
diff --git a/gcc/gcc-cross-initial_3.3.3.oe b/gcc/gcc-cross-initial_3.3.3.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-cross-initial_3.3.3.oe
diff --git a/gcc/gcc-cross-initial_3.4.0.oe b/gcc/gcc-cross-initial_3.4.0.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-cross-initial_3.4.0.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..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-cross_3.4.0.oe
diff --git a/gcc/gcc-initial-cross_3.3.2.oe b/gcc/gcc-initial-cross_3.3.2.oe
deleted file mode 100644
index 4f9cb6ddb6..0000000000
--- a/gcc/gcc-initial-cross_3.3.2.oe
+++ /dev/null
@@ -1,21 +0,0 @@
-include gcc-cross_${PV}.oe
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils glibc-initial patcher-native"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
-
-EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
-		--disable-multilib \
-		--with-newlib \
-		--without-headers \
-		--disable-nls \
-		--enable-threads=no \
-		--enable-symvers=gnu \
-		--enable-__cxa_atexit \
-		--enable-languages=c \
-		--disable-shared \
-		--program-prefix=${TARGET_PREFIX}"
-
-do_stage_prepend () {
-	mkdir -p ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/${PV}
-	ln -sf libgcc.a ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/${PV}/libgcc_eh.a
-}
diff --git a/gcc/gcc-initial-cross_3.3.3.oe b/gcc/gcc-initial-cross_3.3.3.oe
deleted file mode 100644
index 804e70944f..0000000000
--- a/gcc/gcc-initial-cross_3.3.3.oe
+++ /dev/null
@@ -1,26 +0,0 @@
-include gcc-cross_${PV}.oe
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils glibc-initial patcher-native"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
-
-EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
-		--disable-multilib \
-		--with-newlib \
-		--without-headers \
-		--disable-nls \
-		--enable-threads=no \
-		--enable-symvers=gnu \
-		--enable-__cxa_atexit \
-		--enable-languages=c \
-		--disable-shared \
-		--program-prefix=${TARGET_PREFIX}"
-
-do_stage_prepend () {
-	mkdir -p ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/${PV}
-	ln -sf libgcc.a ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/${PV}/libgcc_eh.a
-}
-
-# Override the method from gcc-cross so we don't try to install libgcc
-do_install () {
-	oe_runmake 'DESTDIR=${D}' install
-}
diff --git a/gcc/gcc-initial-uclibc-cross_3.3.2.oe b/gcc/gcc-initial-uclibc-cross_3.3.2.oe
deleted file mode 100644
index ea0b0f1371..0000000000
--- a/gcc/gcc-initial-uclibc-cross_3.3.2.oe
+++ /dev/null
@@ -1,16 +0,0 @@
-include gcc-uclibc-cross_${PV}.oe
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils uclibc-initial patcher-native"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
-
-EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/local \
-                --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++ \
-                --enable-target-optspace \
-                --disable-nls \
-                --with-gnu-ld \
-                --disable-__cxa_atexit \
-                --enable-languages=c \
-                --disable-shared \
-		--disable-threads \
-                --enable-multilib \
-                --program-prefix=${TARGET_PREFIX}"
diff --git a/gcc/gcc-initial-uclibc-cross_3.3.3.oe b/gcc/gcc-initial-uclibc-cross_3.3.3.oe
deleted file mode 100644
index ea0b0f1371..0000000000
--- a/gcc/gcc-initial-uclibc-cross_3.3.3.oe
+++ /dev/null
@@ -1,16 +0,0 @@
-include gcc-uclibc-cross_${PV}.oe
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils uclibc-initial patcher-native"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
-
-EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/local \
-                --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++ \
-                --enable-target-optspace \
-                --disable-nls \
-                --with-gnu-ld \
-                --disable-__cxa_atexit \
-                --enable-languages=c \
-                --disable-shared \
-		--disable-threads \
-                --enable-multilib \
-                --program-prefix=${TARGET_PREFIX}"
diff --git a/gcc/gcc-uclibc-cross-initial_3.3.2.oe b/gcc/gcc-uclibc-cross-initial_3.3.2.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-uclibc-cross-initial_3.3.2.oe
diff --git a/gcc/gcc-uclibc-cross-initial_3.3.3.oe b/gcc/gcc-uclibc-cross-initial_3.3.3.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-uclibc-cross-initial_3.3.3.oe
diff --git a/gcc/gcc-uclibc-cross-initial_3.4.0.oe b/gcc/gcc-uclibc-cross-initial_3.4.0.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-uclibc-cross-initial_3.4.0.oe
diff --git a/gcc/gcc-uclibc-cross_3.4.0.oe b/gcc/gcc-uclibc-cross_3.4.0.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-uclibc-cross_3.4.0.oe
diff --git a/gcc/gcc-uclibc_3.3.2.oe b/gcc/gcc-uclibc_3.3.2.oe
index cdcfed787b..3cb6cb0dbf 100644
--- a/gcc/gcc-uclibc_3.3.2.oe
+++ b/gcc/gcc-uclibc_3.3.2.oe
@@ -5,13 +5,7 @@ DESCRIPTION = "The GNU cc and gcc C compilers (uclibc)."
 LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 
-# This will ONLY build to this target
-TARGET_VENDOR = "-uclibc"
-TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
-TARGET_PREFIX = "${TARGET_SYS}-"
-
-DEPENDS = "virtual/${HOST_PREFIX}binutils virtual/${HOST_PREFIX}gcc \
-           uclibc patcher"
+DEPENDS = "uclibc"
 
 PACKAGES = "${PN} ${PN}-symlinks \
            ${PN}-c++ ${PN}-c++-symlinks \
diff --git a/gcc/gcc-uclibc_3.3.3.oe b/gcc/gcc-uclibc_3.3.3.oe
index 390a0a217f..10e4bdb371 100644
--- a/gcc/gcc-uclibc_3.3.3.oe
+++ b/gcc/gcc-uclibc_3.3.3.oe
@@ -5,13 +5,7 @@ DESCRIPTION = "The GNU cc and gcc C compilers (uclibc)."
 LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 
-# This will ONLY build to this target
-TARGET_VENDOR = "-uclibc"
-TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
-TARGET_PREFIX = "${TARGET_SYS}-"
-
-DEPENDS = "virtual/${HOST_PREFIX}binutils virtual/${HOST_PREFIX}gcc \
-           uclibc patcher"
+DEPENDS = "uclibc"
 
 PACKAGES = "${PN} ${PN}-symlinks \
            ${PN}-c++ ${PN}-c++-symlinks \
diff --git a/gcc/gcc-uclibc_3.4.0.oe b/gcc/gcc-uclibc_3.4.0.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc-uclibc_3.4.0.oe
diff --git a/gcc/gcc_3.3.2.oe b/gcc/gcc_3.3.2.oe
index f1ebfa76db..ca6f239d34 100644
--- a/gcc/gcc_3.3.2.oe
+++ b/gcc/gcc_3.3.2.oe
@@ -4,13 +4,24 @@ DESCRIPTION = "The GNU cc and gcc C compilers."
 LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 
-# This will ONLY build to this target
-TARGET_VENDOR = ""
-TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
-TARGET_PREFIX = "${TARGET_SYS}-"
+#
+# For now, we will skip building of a gcc package if it is a uclibc one
+# and our build is not a uclibc one, and we skip a glibc one if our build
+# is a uclibc build.
+#
+# See the note in gcc/gcc_3.4.0.oe
+#
+
+python __anonymous () {
+    import oe, re
+    uc_pkg = (re.search('uclibc', oe.data.getVar('PN', d, 1)) != None)
+    uc_os = (re.match('.*uclibc$', oe.data.getVar('TARGET_OS', d, 1)) != None)
+    if uc_pkg != uc_os:
+        raise oe.parse.SkipPackage("incompatible with target %s" %
+                                   oe.data.getVar('TARGET_OS', d, 1))
+}
 
-DEPENDS = "virtual/${HOST_PREFIX}binutils virtual/${HOST_PREFIX}gcc \
-           glibc patcher"
+DEPENDS = "glibc"
 
 PACKAGES = "${PN} ${PN}-symlinks \
             ${PN}-c++ ${PN}-c++-symlinks \
diff --git a/gcc/gcc_3.3.3.oe b/gcc/gcc_3.3.3.oe
index 91985c449e..48358f48b8 100644
--- a/gcc/gcc_3.3.3.oe
+++ b/gcc/gcc_3.3.3.oe
@@ -4,13 +4,24 @@ DESCRIPTION = "The GNU cc and gcc C compilers."
 LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 
-# This will ONLY build to this target
-TARGET_VENDOR = ""
-TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
-TARGET_PREFIX = "${TARGET_SYS}-"
+#
+# For now, we will skip building of a gcc package if it is a uclibc one
+# and our build is not a uclibc one, and we skip a glibc one if our build
+# is a uclibc build.
+#
+# See the note in gcc/gcc_3.4.0.oe
+#
+
+python __anonymous () {
+    import oe, re
+    uc_pkg = (re.search('uclibc', oe.data.getVar('PN', d, 1)) != None)
+    uc_os = (re.match('.*uclibc$', oe.data.getVar('TARGET_OS', d, 1)) != None)
+    if uc_pkg != uc_os:
+        raise oe.parse.SkipPackage("incompatible with target %s" %
+                                   oe.data.getVar('TARGET_OS', d, 1))
+}
 
-DEPENDS = "virtual/${HOST_PREFIX}binutils virtual/${HOST_PREFIX}gcc \
-           glibc patcher"
+DEPENDS = "glibc"
 
 PACKAGES = "${PN} ${PN}-symlinks \
             ${PN}-c++ ${PN}-c++-symlinks \
diff --git a/gcc/gcc_3.4.0.oe b/gcc/gcc_3.4.0.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gcc/gcc_3.4.0.oe