From 623fdf15a675086fa3ae9dfa3c7866a7a3de0fff Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Thu, 2 Feb 2017 23:37:57 -0800
Subject: Add support for AArch64 in uClibc-ng

Signed-off-by: Alexey Neyman <stilor@att.net>

diff --git a/scripts/build/arch/arm.sh b/scripts/build/arch/arm.sh
index b728311..182548e 100644
--- a/scripts/build/arch/arm.sh
+++ b/scripts/build/arch/arm.sh
@@ -59,28 +59,30 @@ CT_DoArchTupleValues() {
 CT_DoArchUClibcConfig() {
     local cfg="${1}"
 
-    CT_DoArchUClibcSelectArch "${cfg}" "arm"
-
-    case "${CT_ARCH_ARM_MODE}" in
-        arm)
-            CT_KconfigDisableOption "COMPILE_IN_THUMB_MODE" "${cfg}"
-            ;;
-        thumb)
-            CT_KconfigEnableOption "COMPILE_IN_THUMB_MODE" "${cfg}"
-            ;;
-    esac
-
-    # FIXME: CONFIG_ARM_OABI does not exist in neither uClibc/uClibc-ng
-    # FIXME: CONFIG_ARM_EABI does not seem to affect anything in either of them, too
-    # (both check the compiler's built-in define, __ARM_EABI__ instead) except for
-    # a check for match between toolchain configuration and uClibc-ng in
-    # uClibc_arch_features.h
-    if [ "${CT_ARCH_ARM_EABI}" = "y" ]; then
-        CT_KconfigDisableOption "CONFIG_ARM_OABI" "${cfg}"
-        CT_KconfigEnableOption "CONFIG_ARM_EABI" "${cfg}"
+    if [ "${CT_ARCH_BITNESS}" = 64 ]; then
+        CT_DoArchUClibcSelectArch "${cfg}" "aarch64"
     else
-        CT_KconfigDisableOption "CONFIG_ARM_EABI" "${cfg}"
-        CT_KconfigEnableOption "CONFIG_ARM_OABI" "${cfg}"
+        CT_DoArchUClibcSelectArch "${cfg}" "arm"
+        case "${CT_ARCH_ARM_MODE}" in
+            arm)
+                CT_KconfigDisableOption "COMPILE_IN_THUMB_MODE" "${cfg}"
+                ;;
+            thumb)
+                CT_KconfigEnableOption "COMPILE_IN_THUMB_MODE" "${cfg}"
+                ;;
+        esac
+        # FIXME: CONFIG_ARM_OABI does not exist in neither uClibc/uClibc-ng
+        # FIXME: CONFIG_ARM_EABI does not seem to affect anything in either of them, too
+        # (both check the compiler's built-in define, __ARM_EABI__ instead) except for
+        # a check for match between toolchain configuration and uClibc-ng in
+        # uClibc_arch_features.h
+        if [ "${CT_ARCH_ARM_EABI}" = "y" ]; then
+            CT_KconfigDisableOption "CONFIG_ARM_OABI" "${cfg}"
+            CT_KconfigEnableOption "CONFIG_ARM_EABI" "${cfg}"
+        else
+            CT_KconfigDisableOption "CONFIG_ARM_EABI" "${cfg}"
+            CT_KconfigEnableOption "CONFIG_ARM_OABI" "${cfg}"
+        fi
     fi
 }
 
-- 
cgit v0.10.2-6-g49f6