X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=toolchain%2FConfig.in;h=ecd9d200f177860d693fb95360b36d480c5cb6ff;hb=f59c84c431cb4d4685e3d398994d28acd0597642;hp=7257f1db093512f8af576d7199a41320db591d83;hpb=9c51ab13d386497081de772ba5689cacc13e7b4d;p=oweals%2Fopenwrt.git

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 7257f1db09..ecd9d200f1 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -43,7 +43,8 @@ menuconfig EXTERNAL_TOOLCHAIN
 	bool
 	prompt "Use external toolchain"  if DEVEL
 	help
-	  If enabled, OpenWrt will compile using an existing toolchain instead of compiling one
+	  If enabled, OpenWrt will compile using an existing toolchain instead of
+	  compiling one.
 
 	config NATIVE_TOOLCHAIN
 		bool
@@ -51,12 +52,15 @@ menuconfig EXTERNAL_TOOLCHAIN
 		depends on EXTERNAL_TOOLCHAIN
 		select NO_STRIP
 		help
-		  If enabled, OpenWrt will compile using the native toolchain for your host instead of compiling one
+		  If enabled, OpenWrt will compile using the native toolchain for your
+		  host instead of compiling one.
 
 	config TARGET_NAME
 		string
 		prompt "Target name"  if DEVEL
 		depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+		default "aarch64-unknown-linux-gnu"  if aarch64
+		default "aarch64_be-unknown-linux-gnu"  if aarch64_be
 		default "arm-unknown-linux-gnu"      if arm
 		default "armeb-unknown-linux-gnu"    if armeb
 		default "i486-unknown-linux-gnu"     if i386
@@ -69,6 +73,8 @@ menuconfig EXTERNAL_TOOLCHAIN
 		string
 		prompt "Toolchain prefix"  if DEVEL
 		depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+		default "aarch64-unknown-linux-gnu"  if aarch64
+		default "aarch64_be-unknown-linux-gnu"  if aarch64_be
 		default "arm-unknown-linux-gnu-"      if arm
 		default "armeb-unknown-linux-gnu-"    if armeb
 		default "i486-unknown-linux-gnu-"     if i386
@@ -81,6 +87,8 @@ menuconfig EXTERNAL_TOOLCHAIN
 		string
 		prompt "Toolchain root"  if DEVEL
 		depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+		default "/opt/cross/aarch64-unknown-linux-gnu"  if aarch64
+		default "/opt/cross/aarch64_be-unknown-linux-gnu"  if aarch64_be
 		default "/opt/cross/arm-unknown-linux-gnu"      if arm
 		default "/opt/cross/armeb-unknown-linux-gnu"    if armeb
 		default "/opt/cross/i486-unknown-linux-gnu"     if i386
@@ -95,10 +103,10 @@ menuconfig EXTERNAL_TOOLCHAIN
 		depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
 		default "uclibc"
 		help
-		  Specify the libc type used by the external toolchain. The given value us passed as -m
-		  flag to all gcc and g++ invocations. This is mainly intended for multilib toolchains
-		  which support glibc and uclibc at the same time. If no value is specified, no -m flag
-		  is passed.
+		  Specify the libc type used by the external toolchain. The given value
+		  is passed as -m flag to all gcc and g++ invocations. This is mainly
+		  intended for multilib toolchains which support glibc and uclibc at
+		  the same time. If no value is specified, no -m flag is passed.
 
 	config TOOLCHAIN_BIN_PATH
 		string
@@ -106,8 +114,8 @@ menuconfig EXTERNAL_TOOLCHAIN
 		depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
 		default "./usr/bin ./bin"
 		help
-		  Specify additional directories searched for toolchain binaries (override PATH)
-		  Use ./DIR for directories relative to the root above
+		  Specify additional directories searched for toolchain binaries
+		  (override PATH). Use ./DIR for directories relative to the root above.
 
 	config TOOLCHAIN_INC_PATH
 		string
@@ -115,8 +123,8 @@ menuconfig EXTERNAL_TOOLCHAIN
 		depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
 		default "./usr/include ./include"
 		help
-		  Specify additional directories searched for header files (override CPPFLAGS)
-		  Use ./DIR for directories relative to the root above
+		  Specify additional directories searched for header files (override
+		  CPPFLAGS). Use ./DIR for directories relative to the root above.
 
 	config TOOLCHAIN_LIB_PATH
 		string
@@ -124,8 +132,8 @@ menuconfig EXTERNAL_TOOLCHAIN
 		depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
 		default "./usr/lib ./lib"
 		help
-		  Specify additional directories searched for libraries (override LDFLAGS)
-		  Use ./DIR for directories relative to the root above
+		  Specify additional directories searched for libraries (override LDFLAGS).
+		  Use ./DIR for directories relative to the root above.
 
 config NEED_TOOLCHAIN
 	bool
@@ -203,6 +211,7 @@ comment "C Library"
 
 choice
 	prompt "C Library implementation" if TOOLCHAINOPTS
+	default LIBC_USE_EGLIBC if (aarch64 || aarch64_be)
 	default LIBC_USE_UCLIBC
 	help
 	  Select the C library implementation.
@@ -215,12 +224,12 @@ choice
 	config LIBC_USE_UCLIBC
 		select USE_UCLIBC
 		bool "Use uClibc"
+		depends on !(aarch64 || aarch64_be)
 
 	config LIBC_USE_MUSL
-		bool "Use musl"
 		select USE_MUSL
-		depends on BROKEN
-		depends on !(mips64 || mips64el)
+		bool "Use musl"
+		depends on !(mips64 || mips64el || aarch64 || aarch64_be)
 
 endchoice
 
@@ -233,11 +242,11 @@ comment "Debuggers"
 
 config GDB
 	bool
-	depends on !avr32
+	depends on !(avr32 || aarch64 || aarch64_be)
 	prompt "Build gdb" if TOOLCHAINOPTS
 	default y if !EXTERNAL_TOOLCHAIN
 	help
-		Enable if you want to build the gdb
+	  Enable if you want to build the gdb.
 
 config INSIGHT
 	bool
@@ -245,15 +254,15 @@ config INSIGHT
 	select GDB
 	default n
 	help
-		Enable if you want to build insight-gdb
+	  Enable if you want to build insight-gdb.
 
 config USE_EGLIBC
 	bool
-	default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && octeon
+	default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && (aarch64 || aarch64_be || octeon)
 
 config USE_UCLIBC
 	bool
-	default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && !octeon
+	default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && !(aarch64 || aarch64_be || octeon)
 
 config USE_MUSL
 	bool