Browse Source

gcc atch upstream, fix nios2 build for uClibc-ng

Waldemar Brodkorb 9 years ago
parent
commit
4d10aa3c43

+ 1 - 0
target/config/Config.in.compiler

@@ -23,6 +23,7 @@ default ADK_TOOLCHAIN_GCC_4_4 if ADK_TARGET_ARCH_AVR32
 default ADK_TOOLCHAIN_GCC_4_9 if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_SH
 default ADK_TOOLCHAIN_GCC_4_9 if ADK_TARGET_SYSTEM_KINETIS_K70
 default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_ARCH_XTENSA
+default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_ARCH_NIOS2
 default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_ARCH_BFIN
 default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_ARCH_C6X
 default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_ARCH_CR16

+ 1 - 0
target/config/Config.in.cpu

@@ -906,6 +906,7 @@ config ADK_TARGET_CPU_NIOS2
 	select ADK_TARGET_SUPPORTS_LT
 	select ADK_TARGET_SUPPORTS_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_USE_STATIC_LIBS if ADK_TARGET_LIB_UCLIBC_NG
 	depends on ADK_TARGET_ARCH_NIOS2
 
 # openrisc

+ 0 - 25
toolchain/gcc/patches/git/0001-fix-linker-name-for-uClibc.patch

@@ -1,25 +0,0 @@
-From 0e8273cfa622a448787e408a066c520ee18eed77 Mon Sep 17 00:00:00 2001
-From: Waldemar Brodkorb <wbx@uclibc-ng.org>
-Date: Sat, 1 Oct 2016 13:33:13 +0200
-Subject: [PATCH] fix linker name for uClibc
-
-Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
----
- gcc/config/microblaze/linux.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gcc/config/microblaze/linux.h b/gcc/config/microblaze/linux.h
-index ae8523c..b3bf43a 100644
---- a/gcc/config/microblaze/linux.h
-+++ b/gcc/config/microblaze/linux.h
-@@ -29,6 +29,7 @@
- #define TLS_NEEDS_GOT 1
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
- 
- #if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */
- #define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:;:el}"
--- 
-2.7.4 (Apple Git-66)
-