choice
        prompt "C library"
        default BR2_TOOLCHAIN_UCLIBC
-       default BR2_TOOLCHAIN_BUILDROOT_GLIBC if BR2_aarch64 || BR2_aarch64_be \
-               || BR2_powerpc64
+       default BR2_TOOLCHAIN_BUILDROOT_GLIBC if BR2_powerpc64
 
 config BR2_TOOLCHAIN_BUILDROOT_UCLIBC
        bool "uClibc-ng"
        select BR2_TOOLCHAIN_USES_UCLIBC
-       depends on BR2_arcle   || BR2_arceb  || BR2_arm    || BR2_armeb    || \
+       depends on BR2_aarch64 || BR2_aarch64_be || BR2_arcle   || BR2_arceb  || \
+                  BR2_arm     || BR2_armeb    || \
                   BR2_bfin    || BR2_i386   || BR2_m68k   || BR2_microblaze || \
                   BR2_mips    || BR2_mipsel || BR2_mips64 || BR2_mips64el || \
                   BR2_or1k    || BR2_powerpc || BR2_sh2a   || BR2_sh4     || \