From dc0358868e10aa5c08a720fc303b8f022c22e059 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 8 Feb 2016 00:51:56 +0100
Subject: use only gcc 5.2 for or1k

---
 toolchain/gcc/Makefile.inc | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'toolchain/gcc/Makefile.inc')

diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc
index 5843dd315..d2bf5f2e3 100644
--- a/toolchain/gcc/Makefile.inc
+++ b/toolchain/gcc/Makefile.inc
@@ -10,6 +10,13 @@ PKG_RELEASE:=		1
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 LIBSTDCXXVER:=		21
 endif
+ifeq ($(ADK_TOOLCHAIN_GCC_5_2_OR1K),y)
+PKG_VERSION:=		3455e5a172b0d178b88799b11a8897141b324b4e
+PKG_SITES:=		https://github.com/openrisc/or1k-gcc.git
+PKG_RELEASE:=		1
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+LIBSTDCXXVER:=		21
+endif
 ifeq ($(ADK_TOOLCHAIN_GCC_4_9_3),y)
 PKG_VERSION:=		4.9.3
 PKG_HASH:=		e6c63b40877bc756cc7cfe6ca98013eb15f02ec6c8c2cf68e24533ad1203aaba
@@ -18,20 +25,6 @@ PKG_RELEASE:=		1
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 LIBSTDCXXVER:=		20
 endif
-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
-LIBSTDCXXVER:=		20
-endif
 ifeq ($(ADK_TOOLCHAIN_GCC_4_8_5),y)
 PKG_VERSION:=		4.8.5
 PKG_HASH:=		1dbc5cd94c9947fe5dffd298e569de7f44c3cedbd428fceea59490d336d8295a
@@ -90,5 +83,5 @@ ifeq ($(ADK_TOOLCHAIN_GCC_GIT),y)
 PKG_VERSION:=		git
 PKG_SITES:=		git://gcc.gnu.org/git/gcc.git
 PKG_RELEASE:=		1
-LIBSTDCXXVER:=		19
+LIBSTDCXXVER:=		21
 endif
-- 
cgit v1.2.3