Merge branch 'master' of git+ssh://openadk.org/git/openadk

9 files changed, 10 insertions, 30 deletions

diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc
index e522805f2..0acfdc50c 100644
--- a/toolchain/gcc/Makefile.inc
+++ b/toolchain/gcc/Makefile.inc
@@ -10,8 +10,8 @@ PKG_RELEASE:=		1
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 LIBSTDCXXVER:=		19
 endif
-ifeq ($(ADK_TOOLCHAIN_GCC_4_8_3),y)
-PKG_VERSION:=		4.8.3
+ifeq ($(ADK_TOOLCHAIN_GCC_4_8_4),y)
+PKG_VERSION:=		4.8.4
 PKG_MD5SUM:=		e2c60f5ef918be2db08df96c7d97d0c4
 PKG_SITES:=		${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/}
 PKG_RELEASE:=		1
diff --git a/toolchain/gcc/patches/4.8.3/miscompile.microblaze b/toolchain/gcc/patches/4.8.3/miscompile.microblaze
deleted file mode 100644
index d575054aa..000000000
--- a/toolchain/gcc/patches/4.8.3/miscompile.microblaze
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Nur gcc-4.8.3.orig/gcc/config/microblaze/microblaze.md gcc-4.8.3/gcc/config/microblaze/microblaze.md
---- gcc-4.8.3.orig/gcc/config/microblaze/microblaze.md	2014-02-23 19:59:26.000000000 +0100
-+++ gcc-4.8.3/gcc/config/microblaze/microblaze.md	2014-05-31 20:39:29.978608468 +0200
-@@ -1119,18 +1119,6 @@
-   }
- )
- 
--;;Load and store reverse
--(define_insn "movsi4_rev"
--  [(set (match_operand:SI 0 "reg_or_mem_operand" "=r,Q")
--        (bswap:SI (match_operand:SF 1 "reg_or_mem_operand" "Q,r")))]
--  "TARGET_REORDER"
--  "@
--   lwr\t%0,%y1,r0
--   swr\t%1,%y0,r0"
--  [(set_attr "type"     "load,store")
--  (set_attr "mode"      "SI")
--  (set_attr "length"    "4,4")])
--
- ;; 32-bit floating point moves
- 
- (define_expand "movsf"
diff --git a/toolchain/gcc/patches/4.8.3/cflags.patch b/toolchain/gcc/patches/4.8.4/cflags.patch
index 4f9de8069..4f9de8069 100644
--- a/toolchain/gcc/patches/4.8.3/cflags.patch
+++ b/toolchain/gcc/patches/4.8.4/cflags.patch
diff --git a/toolchain/gcc/patches/4.8.3/disable-atomics.m68k b/toolchain/gcc/patches/4.8.4/disable-atomics.m68k
index 4ab553218..4ab553218 100644
--- a/toolchain/gcc/patches/4.8.3/disable-atomics.m68k
+++ b/toolchain/gcc/patches/4.8.4/disable-atomics.m68k
diff --git a/toolchain/gcc/patches/4.8.3/disable-tm.m68k b/toolchain/gcc/patches/4.8.4/disable-tm.m68k
index 02b5cb854..02b5cb854 100644
--- a/toolchain/gcc/patches/4.8.3/disable-tm.m68k
+++ b/toolchain/gcc/patches/4.8.4/disable-tm.m68k
diff --git a/toolchain/gcc/patches/4.8.3/gcc.musl b/toolchain/gcc/patches/4.8.4/gcc.musl
index 4150dfcdf..4150dfcdf 100644
--- a/toolchain/gcc/patches/4.8.3/gcc.musl
+++ b/toolchain/gcc/patches/4.8.4/gcc.musl
diff --git a/toolchain/gcc/patches/4.8.3/uclibc-cmath.ppc b/toolchain/gcc/patches/4.8.4/uclibc-cmath.ppc
index 81bd123fc..81bd123fc 100644
--- a/toolchain/gcc/patches/4.8.3/uclibc-cmath.ppc
+++ b/toolchain/gcc/patches/4.8.4/uclibc-cmath.ppc
diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile
index 39d96e2d9..d39af8e88 100644
--- a/toolchain/uclibc-ng/Makefile
+++ b/toolchain/uclibc-ng/Makefile
@@ -10,9 +10,10 @@ include ${ADK_TOPDIR}/mk/buildhlp.mk
 
 TARGET_CFLAGS:=$(filter-out -flto,$(TARGET_CFLAGS))
 
-ifeq (${ADK_MAKE_PARALLEL},y)
-UCLIBC_MAKEOPTS+=	-j${ADK_MAKE_JOBS}
-endif
+# parallel building is broken at the moment
+#ifeq (${ADK_MAKE_PARALLEL},y)
+#UCLIBC_MAKEOPTS+=	-j${ADK_MAKE_JOBS}
+#endif
 
 $(WRKBUILD)/.headers:
 	$(SED) 's,^CROSS_COMPILE=.*,CROSS_COMPILE=$(TARGET_CROSS),g' $(WRKBUILD)/Rules.mak
diff --git a/toolchain/uclibc/Makefile b/toolchain/uclibc/Makefile
index fd4427377..4612ff305 100644
--- a/toolchain/uclibc/Makefile
+++ b/toolchain/uclibc/Makefile
@@ -11,9 +11,10 @@ include ${ADK_TOPDIR}/mk/buildhlp.mk
 TARGET_CFLAGS:=$(filter-out -flto,$(TARGET_CFLAGS))
 TARGET_CFLAGS:=$(filter-out -mtext-section-literals,$(TARGET_CFLAGS))
 
-ifeq (${ADK_MAKE_PARALLEL},y)
-UCLIBC_MAKEOPTS+=	-j${ADK_MAKE_JOBS}
-endif
+# parallel building is broken at the moment
+#ifeq (${ADK_MAKE_PARALLEL},y)
+#UCLIBC_MAKEOPTS+=	-j${ADK_MAKE_JOBS}
+#endif
 
 $(WRKBUILD)/.headers:
 	$(SED) 's,^CROSS_COMPILE=.*,CROSS_COMPILE=$(TARGET_CROSS),g' $(WRKBUILD)/Rules.mak