summaryrefslogtreecommitdiff
path: root/scripts/build
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/build')
-rw-r--r--scripts/build/arch/arm.sh44
1 files changed, 23 insertions, 21 deletions
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
}