diff options
| -rw-r--r-- | target/config/Config.in.gcc | 13 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile.inc | 23 |
2 files changed, 11 insertions, 25 deletions
diff --git a/target/config/Config.in.gcc b/target/config/Config.in.gcc index efeb3b1de..75e31bf47 100644 --- a/target/config/Config.in.gcc +++ b/target/config/Config.in.gcc @@ -8,9 +8,7 @@ default ADK_TOOLCHAIN_GCC_4_4_7 if ADK_TARGET_ARCH_AVR32 default ADK_TOOLCHAIN_GCC_4_8_5 if ADK_TARGET_ARCH_C6X default ADK_TOOLCHAIN_GCC_4_9_3 if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_SH default ADK_TOOLCHAIN_GCC_4_8_ARC if ADK_TARGET_ARCH_ARC -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_5_2_OR1K_MUSL if ADK_TARGET_ARCH_OR1K && ADK_TARGET_LIB_NEWLIB +default ADK_TOOLCHAIN_GCC_5_2_OR1K if ADK_TARGET_ARCH_OR1K default ADK_TOOLCHAIN_GCC_GIT if ADK_TARGET_WITHOUT_MMU && ADK_TARGET_ARCH_XTENSA default ADK_TOOLCHAIN_GCC_5_3_0 @@ -58,13 +56,8 @@ 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_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" +config ADK_TOOLCHAIN_GCC_5_2_OR1K + bool "5.2-or1k" select ADK_DISABLE_HONOUR_CFLAGS depends on ADK_TARGET_ARCH_OR1K 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 |