X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=toolchain%2FConfig.in;h=ecd9d200f177860d693fb95360b36d480c5cb6ff;hb=5cce8f9a0fe6a06011b1c092e674e25acd1b7dff;hp=aad709578cc14dab62063fb3c46bf3628c8e4e6c;hpb=40dde1ca6721037639bc1aeae456f58963c36374;p=oweals%2Fopenwrt.git

diff --git a/toolchain/Config.in b/toolchain/Config.in
index aad709578c..ecd9d200f1 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -59,6 +59,8 @@ menuconfig EXTERNAL_TOOLCHAIN
 		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
@@ -71,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
@@ -83,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
@@ -205,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.
@@ -217,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
 
@@ -235,7 +242,7 @@ 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
@@ -251,11 +258,11 @@ config INSIGHT
 
 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