gcc: Uprev gcc and related to latest version

Uprev gcc to match master, and resync with latest mingw runtime.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

8 files changed, 33 insertions, 50 deletions

diff --git a/recipes-devtools/gcc/gcc-cross-canadian_4.8.bbappend b/recipes-devtools/gcc/gcc-cross-canadian_4.9.bbappend
index 030a9b9..030a9b9 100644
--- a/recipes-devtools/gcc/gcc-cross-canadian_4.8.bbappend
+++ b/recipes-devtools/gcc/gcc-cross-canadian_4.9.bbappend
diff --git a/recipes-devtools/gcc/gcc-crosssdk-initial_4.8.bbappend b/recipes-devtools/gcc/gcc-crosssdk-initial_4.9.bbappend
index 1c09342..1c09342 100644
--- a/recipes-devtools/gcc/gcc-crosssdk-initial_4.8.bbappend
+++ b/recipes-devtools/gcc/gcc-crosssdk-initial_4.9.bbappend
diff --git a/recipes-devtools/gcc/gcc-crosssdk_4.8.bbappend b/recipes-devtools/gcc/gcc-crosssdk_4.9.bbappend
index 77ba57f..77ba57f 100644
--- a/recipes-devtools/gcc/gcc-crosssdk_4.8.bbappend
+++ b/recipes-devtools/gcc/gcc-crosssdk_4.9.bbappend
diff --git a/recipes-devtools/gcc/gcc-runtime_4.8.bbappend b/recipes-devtools/gcc/gcc-runtime_4.9.bbappend
index 50ca3ca..50ca3ca 100644
--- a/recipes-devtools/gcc/gcc-runtime_4.8.bbappend
+++ b/recipes-devtools/gcc/gcc-runtime_4.9.bbappend
diff --git a/recipes-devtools/gcc/libgcc_4.8.bbappend b/recipes-devtools/gcc/libgcc_4.9.bbappend
index dd95317..dd95317 100644
--- a/recipes-devtools/gcc/libgcc_4.8.bbappend
+++ b/recipes-devtools/gcc/libgcc_4.9.bbappend
diff --git a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_2.0.8.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_2.0.8.bb
deleted file mode 100644
index a3d0e46..0000000
--- a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_2.0.8.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-DESCRIPTION = "Header files from the MingGW-w64 project"
-LICENSE = "ZPL"
-LIC_FILES_CHKSUM = "file://../COPYING;md5=3194ff3a0d16f018784d1847bc6a3c4d"
-
-COMPATIBLE_HOST = ".*-mingw.*"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.gz \
-           file://epsilon.patch"
-
-SRC_URI[md5sum] = "659e5baf45ac8e8b8526f29786ee1112"
-SRC_URI[sha256sum] = "1a5a2c57f90c7f1b5eb8402a52f93de645925a8af62c2cfe748f39ce66008cf4"
-
-S = "${WORKDIR}/mingw-w64-v${PV}/mingw-w64-headers"
-B = "${WORKDIR}/build-${TARGET_SYS}"
-
-inherit autotools nativesdk
-
-INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS = ""
-
-do_configure() {
-	oe_runconf
-}
-
-do_compile() {
-	:
-}
-
-FILES_${PN} += "${exec_prefix}/${TARGET_SYS}"
-
-do_install_append() {
-	# Move files to include folder where gcc-crosssdk-initial is looking
-	mv ${D}${exec_prefix}/${HOST_SYS}/include ${D}${exec_prefix}
-	rmdir ${D}${exec_prefix}/${HOST_SYS}
-
-	ln -s  ./ ${D}/${exec_prefix}/${HOST_SYS}
-}
-
-sysroot_stage_all_append_mingw32 () {
-	ln -s  ./ ${SYSROOT_DESTDIR}${exec_prefix}/${HOST_SYS}
-}
diff --git a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_3.1.0.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_3.1.0.bb
new file mode 100644
index 0000000..33e8bbb
--- /dev/null
+++ b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_3.1.0.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "Header files from the MingGW-w64 project"
+LICENSE = "ZPL"
+LIC_FILES_CHKSUM = "file://../COPYING;md5=bb936f0e04d8f1e19ad545100cee9654"
+
+COMPATIBLE_HOST = ".*-mingw.*"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2 \
+           file://epsilon.patch"
+
+SRC_URI[md5sum] = "df0e7657f46cbd59ed9cbe2a50c66e15"
+SRC_URI[sha256sum] = "ece7a7e7e1ab5e25d5ce469f8e4de7223696146fffa71c16e2a9b017d0e017d2"
+
+S = "${WORKDIR}/mingw-w64-v${PV}/mingw-w64-headers"
+B = "${WORKDIR}/build-${TARGET_SYS}"
+
+inherit autotools nativesdk
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS = ""
+
+do_configure() {
+	oe_runconf
+}
+
+do_compile() {
+	:
+}
+
+FILES_${PN} += "${exec_prefix}/${TARGET_SYS}"
diff --git a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_2.0.8.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_3.1.0.bb
index 14b5c7d..4c56c70 100644
--- a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_2.0.8.bb
+++ b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_3.1.0.bb
@@ -1,12 +1,12 @@
 DESCRIPTION = "Runtime libraries from MinGW-w64 project"
 LICENSE = "ZPL"
-LIC_FILES_CHKSUM = "file://../COPYING;md5=3194ff3a0d16f018784d1847bc6a3c4d"
+LIC_FILES_CHKSUM = "file://../COPYING;md5=bb936f0e04d8f1e19ad545100cee9654"
 
 COMPATIBLE_HOST = ".*-mingw.*"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.gz"
-SRC_URI[md5sum] = "659e5baf45ac8e8b8526f29786ee1112"
-SRC_URI[sha256sum] = "1a5a2c57f90c7f1b5eb8402a52f93de645925a8af62c2cfe748f39ce66008cf4"
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
+SRC_URI[md5sum] = "df0e7657f46cbd59ed9cbe2a50c66e15"
+SRC_URI[sha256sum] = "ece7a7e7e1ab5e25d5ce469f8e4de7223696146fffa71c16e2a9b017d0e017d2"
 
 S = "${WORKDIR}/mingw-w64-v${PV}/mingw-w64-crt"
 B = "${WORKDIR}/build-${TARGET_SYS}"
@@ -32,10 +32,5 @@ do_configure() {
     oe_runconf
 }
 
-do_install_append() {
-    # Move files to folder where gcc-crosssdk is looking
-    mv ${D}${exec_prefix}/${HOST_SYS}/lib* ${D}${exec_prefix}
-    rmdir ${D}${exec_prefix}/${HOST_SYS}
-}
 FILES_${PN} += "${exec_prefix}/libsrc"