Browse Source

bfin/tile: fix toolchain building

Waldemar Brodkorb 8 years ago
parent
commit
7d455976fb

+ 4 - 4
target/config/Config.in.binfmt

@@ -17,16 +17,16 @@ config ADK_TARGET_BINFMT_ELF
 	bool "ELF"
 	depends on (ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_M68K || ADK_TARGET_ARCH_SH || ADK_TARGET_ARCH_XTENSA) && ADK_TARGET_WITH_MMU
 
-config ADK_TARGET_BINFMT_FDPIC
-	bool "FDPIC"
-	depends on ADK_TARGET_ARCH_BFIN || ADK_TARGET_ARCH_FRV
-
 config ADK_TARGET_BINFMT_FLAT
 	bool "FLAT"
 	select ADK_TARGET_UCLINUX if ADK_TARGET_ARCH_BFIN
 	depends on (ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_M68K || ADK_TARGET_ARCH_SH || ADK_TARGET_ARCH_XTENSA) && ADK_TARGET_WITHOUT_MMU \
 		|| ADK_TARGET_ARCH_H8300 || ADK_TARGET_ARCH_LM32 || ADK_TARGET_ARCH_BFIN || ADK_TARGET_ARCH_FRV
 
+config ADK_TARGET_BINFMT_FDPIC
+	bool "FDPIC"
+	depends on ADK_TARGET_ARCH_BFIN || ADK_TARGET_ARCH_FRV
+
 config ADK_TARGET_BINFMT_DSBT
 	bool "DSBT"
 	depends on ADK_TARGET_ARCH_C6X

+ 2 - 0
target/config/Config.in.gcc

@@ -9,6 +9,7 @@ default ADK_TOOLCHAIN_GCC_4_8_5 if ADK_TARGET_ARCH_C6X
 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_0 if ADK_TARGET_ARCH_TILE
 default ADK_TOOLCHAIN_GCC_4_9_3
 
 config ADK_TOOLCHAIN_GCC_GIT
@@ -38,6 +39,7 @@ config ADK_TOOLCHAIN_GCC_4_9_3
 	depends on !ADK_TARGET_ARCH_H8300
 	depends on !ADK_TARGET_ARCH_METAG
 	depends on !ADK_TARGET_ARCH_OR1K
+	depends on !ADK_TARGET_ARCH_TILE
 
 config ADK_TOOLCHAIN_GCC_4_8_5
 	bool "4.8.5"

+ 3 - 0
target/config/Config.in.libc

@@ -55,14 +55,17 @@ prompt "C library version"
 config ADK_TARGET_LIB_UCLIBC_NG_1_0_9
 	bool "1.0.9"
 	depends on ADK_TARGET_LIB_UCLIBC_NG
+	depends on !ADK_TARGET_ARCH_BFIN
 
 config ADK_TARGET_LIB_UCLIBC_NG_1_0_8
 	bool "1.0.8"
 	depends on ADK_TARGET_LIB_UCLIBC_NG
+	depends on !ADK_TARGET_ARCH_BFIN
 
 config ADK_TARGET_LIB_UCLIBC_NG_1_0_7
 	bool "1.0.7"
 	depends on ADK_TARGET_LIB_UCLIBC_NG
+	depends on !ADK_TARGET_ARCH_BFIN
 
 config ADK_TARGET_LIB_UCLIBC_NG_GIT
 	bool "git"

+ 12 - 0
toolchain/gcc/patches/git/disable-dwarf.bfin

@@ -0,0 +1,12 @@
+diff -Nur gcc-git.orig/libgcc/config.host gcc-git/libgcc/config.host
+--- gcc-git.orig/libgcc/config.host	2015-10-23 21:12:52.000000000 +0200
++++ gcc-git/libgcc/config.host	2015-11-15 21:17:38.385745887 +0100
+@@ -231,7 +231,7 @@
+   esac
+   ;;
+ *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu)
+-  tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver t-linux"
++  tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver t-linux"
+   extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
+   if test x$enable_vtable_verify = xyes; then
+     extra_parts="$extra_parts vtv_start.o vtv_end.o vtv_start_preinit.o vtv_end_preinit.o"