Pārlūkot izejas kodu

bfin: allow newer gcc and kernel to be build, ICE with uClibc-ng regex, so disable it for now.

Waldemar Brodkorb 8 gadi atpakaļ
vecāks
revīzija
3c02cd629a

+ 2 - 0
mk/image.mk

@@ -147,6 +147,8 @@ ${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR}/.adk
 		echo "nod /dev/ttyAMA1 0660 0 0 c 204 65"; \
 		echo "nod /dev/ttySC0 0660 0 0 c 204 8"; \
 		echo "nod /dev/ttySC1 0660 0 0 c 204 9"; \
+		echo "nod /dev/ttyBF0 0660 0 0 c 204 64"; \
+		echo "nod /dev/ttyBF1 0660 0 0 c 204 65"; \
 	) >>$@
 
 

+ 2 - 2
target/bfin/uclibc-ng.config

@@ -198,8 +198,8 @@ UCLIBC_HAS_GNU_GETSUBOPT=y
 
 #
 # Big and Tall
-#
-UCLIBC_HAS_REGEX=y
+# ICE in gcc
+# UCLIBC_HAS_REGEX is not set
 UCLIBC_HAS_FNMATCH=y
 UCLIBC_HAS_WORDEXP=y
 UCLIBC_HAS_NFTW=y

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

@@ -22,7 +22,6 @@ config ADK_TOOLCHAIN_GCC_GIT
 
 config ADK_TOOLCHAIN_GCC_5_2_0
 	bool "5.2.0"
-	depends on !ADK_TARGET_ARCH_BFIN
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_C6X
@@ -34,7 +33,6 @@ config ADK_TOOLCHAIN_GCC_4_9_3
 	bool "4.9.3"
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_AVR32
-	depends on !ADK_TARGET_ARCH_BFIN
 	depends on !ADK_TARGET_ARCH_C6X
 	depends on !ADK_TARGET_ARCH_H8300
 	depends on !ADK_TARGET_ARCH_METAG

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

@@ -25,7 +25,6 @@ config ADK_TARGET_KERNEL_VERSION_4_2_6
 config ADK_TARGET_KERNEL_VERSION_4_1_10
 	bool "4.1.10"
 	depends on !ADK_TARGET_ARCH_ARC
-	depends on !ADK_TARGET_ARCH_BFIN
 	depends on !ADK_TARGET_ARCH_H8300
 	depends on !ADK_TARGET_ARCH_SPARC
 	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
@@ -34,7 +33,6 @@ config ADK_TARGET_KERNEL_VERSION_4_1_10
 config ADK_TARGET_KERNEL_VERSION_3_18_22
 	bool "3.18.22"
 	depends on !ADK_TARGET_ARCH_ARC
-	depends on !ADK_TARGET_ARCH_BFIN
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2

+ 12 - 0
toolchain/gcc/patches/4.9.3/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"

+ 12 - 0
toolchain/gcc/patches/4.9.3/gcc.bfin

@@ -0,0 +1,12 @@
+diff -Nur gcc-4.9.3.orig/gcc/config.gcc gcc-4.9.3/gcc/config.gcc
+--- gcc-4.9.3.orig/gcc/config.gcc	2015-05-21 22:50:59.000000000 +0200
++++ gcc-4.9.3/gcc/config.gcc	2015-11-23 22:51:58.686375134 +0100
+@@ -1101,7 +1101,7 @@
+ 	;;
+ bfin*-linux-uclibc*)
+ 	tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h gnu-user.h linux.h glibc-stdint.h bfin/linux.h ./linux-sysroot-suffix.h"
+-	tmake_file="bfin/t-bfin-linux t-slibgcc t-linux"
++	tmake_file="${tmake_file} bfin/t-bfin-linux t-slibgcc t-linux"
+ 	use_collect2=no
+ 	;;
+ bfin*-rtems*)

+ 12 - 0
toolchain/gcc/patches/5.2.0/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"

+ 12 - 0
toolchain/gcc/patches/5.2.0/gcc.bfin

@@ -0,0 +1,12 @@
+diff -Nur gcc-4.9.3.orig/gcc/config.gcc gcc-4.9.3/gcc/config.gcc
+--- gcc-4.9.3.orig/gcc/config.gcc	2015-05-21 22:50:59.000000000 +0200
++++ gcc-4.9.3/gcc/config.gcc	2015-11-23 22:51:58.686375134 +0100
+@@ -1101,7 +1101,7 @@
+ 	;;
+ bfin*-linux-uclibc*)
+ 	tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h gnu-user.h linux.h glibc-stdint.h bfin/linux.h ./linux-sysroot-suffix.h"
+-	tmake_file="bfin/t-bfin-linux t-slibgcc t-linux"
++	tmake_file="${tmake_file} bfin/t-bfin-linux t-slibgcc t-linux"
+ 	use_collect2=no
+ 	;;
+ bfin*-rtems*)