From e970fd7bc1045f2becab47872bfa53e6b26d1ecb Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 6 Nov 2015 03:08:26 +0100
Subject: or1k: use special gcc branches for uClibc-ng/musl

---
 target/config/Config.in.gcc | 24 ++++++++++++++++++++----
 toolchain/gcc/Makefile.inc  | 12 +++++++++---
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/target/config/Config.in.gcc b/target/config/Config.in.gcc
index a9a7517b4..a2984be8d 100644
--- a/target/config/Config.in.gcc
+++ b/target/config/Config.in.gcc
@@ -8,7 +8,8 @@ default ADK_TOOLCHAIN_GCC_4_4_7 if ADK_TARGET_ARCH_AVR32
 default ADK_TOOLCHAIN_GCC_4_5_4 if ADK_TARGET_ARCH_BFIN
 default ADK_TOOLCHAIN_GCC_4_7_4 if ADK_TARGET_ARCH_C6X
 default ADK_TOOLCHAIN_GCC_4_8_ARC if ADK_TARGET_ARCH_ARC
-default ADK_TOOLCHAIN_GCC_4_9_OR1K if ADK_TARGET_ARCH_OR1K
+default ADK_TOOLCHAIN_GCC_4_9_OR1K_UCLIBC_NG if ADK_TARGET_ARCH_OR1K && ADK_TARGET_LIB_UCLIBC_NG
+default ADK_TOOLCHAIN_GCC_5_2_OR1K_MUSL if ADK_TARGET_ARCH_OR1K && ADK_TARGET_LIB_MUSL
 default ADK_TOOLCHAIN_GCC_4_9_3
 
 config ADK_TOOLCHAIN_GCC_GIT
@@ -52,10 +53,15 @@ config ADK_TOOLCHAIN_GCC_4_8_5
 	depends on !ADK_TARGET_ARCH_METAG
 	depends on !ADK_TARGET_ARCH_OR1K
 
-config ADK_TOOLCHAIN_GCC_4_9_OR1K
-	bool "4.9-or1k"
-	depends on ADK_TARGET_ARCH_OR1K
+config ADK_TOOLCHAIN_GCC_4_9_OR1K_UCLIBC
+	bool "4.9-or1k-uclibc"
 	select ADK_DISABLE_HONOUR_CFLAGS
+	depends on ADK_TARGET_ARCH_OR1K && ADK_TARGET_LIB_UCLIBC_NG
+
+config ADK_TOOLCHAIN_GCC_5_2_OR1K_MUSL
+	bool "5.2-or1k-musl"
+	select ADK_DISABLE_HONOUR_CFLAGS
+	depends on ADK_TARGET_ARCH_OR1K && ADK_TARGET_LIB_MUSL
 
 config ADK_TOOLCHAIN_GCC_4_8_ARC
 	bool "4.8-arc"
@@ -64,6 +70,16 @@ config ADK_TOOLCHAIN_GCC_4_8_ARC
 
 config ADK_TOOLCHAIN_GCC_4_7_4
 	bool "4.7.4"
+	depends on !ADK_TARGET_ARCH_BFIN
+	depends on !ADK_TARGET_ARCH_AARCH64
+	depends on !ADK_TARGET_ARCH_ARC
+	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_CRIS
+	depends on !ADK_TARGET_ARCH_TILE
+	depends on !ADK_TARGET_ARCH_C6X
+	depends on !ADK_TARGET_ARCH_H8300
+	depends on !ADK_TARGET_ARCH_METAG
+	depends on !ADK_TARGET_ARCH_OR1K
 
 config ADK_TOOLCHAIN_GCC_4_5_4
 	bool "4.5.4"
diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc
index 476d3528e..8ea044595 100644
--- a/toolchain/gcc/Makefile.inc
+++ b/toolchain/gcc/Makefile.inc
@@ -18,9 +18,15 @@ PKG_RELEASE:=		1
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 LIBSTDCXXVER:=		20
 endif
-ifeq ($(ADK_TOOLCHAIN_GCC_4_9_OR1K),y)
-PKG_VERSION:=		4.9.2-or1k
-PKG_HASH:=		70b267bf3f8d72d8dd2bec61016357984df47c8ed693d577742bdc326f65f806
+ifeq ($(ADK_TOOLCHAIN_GCC_4_9_OR1K_UCLIBC),y)
+PKG_VERSION:=		80794b79e069d2dc28e15d2843ef55a7066ed9a1
+PKG_SITES:=		https://github.com/openrisc/or1k-gcc.git
+PKG_RELEASE:=		1
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+LIBSTDCXXVER:=		20
+endif
+ifeq ($(ADK_TOOLCHAIN_GCC_5_2_OR1K_MUSL),y)
+PKG_VERSION:=		3455e5a172b0d178b88799b11a8897141b324b4e
 PKG_SITES:=		https://github.com/openrisc/or1k-gcc.git
 PKG_RELEASE:=		1
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
-- 
cgit v1.2.3