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

17 files changed, 25 insertions, 2 deletions

diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index 2c2fb70a6..f0e17503a 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -8,7 +8,7 @@ PKG_NAME:=		gcc
 PKG_DESCR:=		GNU C compiler
 PKG_SECTION:=		lang
 PKG_OPTS:=		noremove
-PKG_DEPENDS:=		libmpc libgmp mpfr
+PKG_DEPENDS:=		libmpc libgmp mpfr libgcc
 PKG_BUILDDEP:=		libmpc gmp mpfr
 
 PKG_ARCH_DEPENDS:=	!avr32
@@ -37,6 +37,12 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_MIPS64EL),y)
 CONFIGURE_ARGS+=       --with-abi=$(ADK_TARGET_ABI)
 endif
 
+ifeq ($(ADK_TOOLCHAIN_GCC_SJLJ),y)
+CONFIGURE_ARGS+=	--enable-sjlj-exceptions
+else
+CONFIGURE_ARGS+=	--disable-sjlj-exceptions
+endif
+
 ifneq ($(ADK_PACKAGE_GXX),)
 CONFIGURE_ARGS+=	--enable-languages=c,c++
 else
@@ -50,7 +56,6 @@ CONFIGURE_ARGS+=	--host=$(REAL_GNU_TARGET_NAME) \
 			--without-headers \
 			--libexecdir=/usr/lib \
 			--disable-libssp \
-			--disable-sjlj-exceptions \
 			--disable-biarch \
 			--disable-libmudflap \
 			--disable-libgomp \
diff --git a/package/gcc/patches/cflags.patch b/package/gcc/patches/4.7.3/cflags.patch
index 3623d3872..3623d3872 100644
--- a/package/gcc/patches/cflags.patch
+++ b/package/gcc/patches/4.7.3/cflags.patch
diff --git a/package/gcc/patches/cross-gcc-fix.patch b/package/gcc/patches/4.7.3/cross-gcc-fix.patch
index f39b35fb9..f39b35fb9 100644
--- a/package/gcc/patches/cross-gcc-fix.patch
+++ b/package/gcc/patches/4.7.3/cross-gcc-fix.patch
diff --git a/package/gcc/patches/gcc-cppflags.patch b/package/gcc/patches/4.7.3/gcc-cppflags.patch
index 0971bbec9..0971bbec9 100644
--- a/package/gcc/patches/gcc-cppflags.patch
+++ b/package/gcc/patches/4.7.3/gcc-cppflags.patch
diff --git a/package/gcc/patches/ltmain.patch b/package/gcc/patches/4.7.3/ltmain.patch
index 215889b70..215889b70 100644
--- a/package/gcc/patches/ltmain.patch
+++ b/package/gcc/patches/4.7.3/ltmain.patch
diff --git a/package/gcc/patches/mirbsd-compat.patch b/package/gcc/patches/4.7.3/mirbsd-compat.patch
index 2f3ea0c87..2f3ea0c87 100644
--- a/package/gcc/patches/mirbsd-compat.patch
+++ b/package/gcc/patches/4.7.3/mirbsd-compat.patch
diff --git a/package/gcc/patches/musl-cris.patch b/package/gcc/patches/4.7.3/musl-cris.patch
index 4889263a1..4889263a1 100644
--- a/package/gcc/patches/musl-cris.patch
+++ b/package/gcc/patches/4.7.3/musl-cris.patch
diff --git a/package/gcc/patches/musl-cross.patch b/package/gcc/patches/4.7.3/musl-cross.patch
index 453ba9aec..453ba9aec 100644
--- a/package/gcc/patches/musl-cross.patch
+++ b/package/gcc/patches/4.7.3/musl-cross.patch
diff --git a/package/gcc/patches/musl-m68k.patch b/package/gcc/patches/4.7.3/musl-m68k.patch
index 54c7e0eef..54c7e0eef 100644
--- a/package/gcc/patches/musl-m68k.patch
+++ b/package/gcc/patches/4.7.3/musl-m68k.patch
diff --git a/package/gcc/patches/musl-mips64.patch b/package/gcc/patches/4.7.3/musl-mips64.patch
index 671ba9f28..671ba9f28 100644
--- a/package/gcc/patches/musl-mips64.patch
+++ b/package/gcc/patches/4.7.3/musl-mips64.patch
diff --git a/package/gcc/patches/musl-ppc.patch b/package/gcc/patches/4.7.3/musl-ppc.patch
index f4211ee73..f4211ee73 100644
--- a/package/gcc/patches/musl-ppc.patch
+++ b/package/gcc/patches/4.7.3/musl-ppc.patch
diff --git a/package/gcc/patches/musl-sh.patch b/package/gcc/patches/4.7.3/musl-sh.patch
index 7738f266e..7738f266e 100644
--- a/package/gcc/patches/musl-sh.patch
+++ b/package/gcc/patches/4.7.3/musl-sh.patch
diff --git a/package/gcc/patches/musl-sparc.patch b/package/gcc/patches/4.7.3/musl-sparc.patch
index 228b8522d..228b8522d 100644
--- a/package/gcc/patches/musl-sparc.patch
+++ b/package/gcc/patches/4.7.3/musl-sparc.patch
diff --git a/package/gcc/patches/sdt.patch b/package/gcc/patches/4.7.3/sdt.patch
index 7ee2cf1b7..7ee2cf1b7 100644
--- a/package/gcc/patches/sdt.patch
+++ b/package/gcc/patches/4.7.3/sdt.patch
diff --git a/package/gcc/patches/4.8.2/patch-libatomic_Makefile_in b/package/gcc/patches/4.8.2/patch-libatomic_Makefile_in
new file mode 100644
index 000000000..e67a62dd3
--- /dev/null
+++ b/package/gcc/patches/4.8.2/patch-libatomic_Makefile_in
@@ -0,0 +1,12 @@
+--- gcc-4.8.2.orig/libatomic/Makefile.in	2013-10-16 09:27:58.000000000 +0200
++++ gcc-4.8.2/libatomic/Makefile.in	2014-01-01 11:37:38.000000000 +0100
+@@ -298,7 +298,8 @@ PAT_N = $(word 2,$(PAT_SPLIT))
+ PAT_S = $(word 3,$(PAT_SPLIT))
+ IFUNC_DEF = -DIFUNC_ALT=$(PAT_S)
+ IFUNC_OPT = $(word $(PAT_S),$(IFUNC_OPTIONS))
+-M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
++@AMDEP_TRUE@M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
++@AMDEP_FALSE@M_DEPS = 
+ M_SIZE = -DN=$(PAT_N)
+ M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT))
+ M_FILE = $(PAT_BASE)_n.c
diff --git a/package/glibc/files/libc.so.microblaze b/package/glibc/files/libc.so.microblaze
new file mode 100644
index 000000000..4642dcbd5
--- /dev/null
+++ b/package/glibc/files/libc.so.microblaze
@@ -0,0 +1,5 @@
+/* GNU ld script
+   Use the shared library, but some functions are only in
+   the static library, so try that secondarily.  */
+OUTPUT_FORMAT(elf32-microblaze)
+GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld.so.1 ) )
diff --git a/target/microblaze/sys-available/qemu-microblaze b/target/microblaze/sys-available/qemu-microblaze
index 294f793ff..8f35db842 100644
--- a/target/microblaze/sys-available/qemu-microblaze
+++ b/target/microblaze/sys-available/qemu-microblaze
@@ -7,6 +7,7 @@ config ADK_TARGET_SYSTEM_QEMU_MICROBLAZE
 	select ADK_HARDWARE_QEMU
 	select ADK_TARGET_KERNEL_LINUXBIN
 	select ADK_USE_KERNEL_MINICONFIG
+	select ADK_TOOLCHAIN_GCC_SJLJ
 	help
 	 Qemu support for microblaze big endian architecture.