diff options
| -rw-r--r-- | mk/vars.mk | 6 | ||||
| -rw-r--r-- | target/config/Config.in.arm.choice | 4 | ||||
| -rw-r--r-- | target/config/Config.in.cpu | 21 | ||||
| -rw-r--r-- | target/config/Config.in.libc.default | 8 | ||||
| -rw-r--r-- | target/config/Config.in.x86.choice | 4 |
5 files changed, 25 insertions, 18 deletions
diff --git a/mk/vars.mk b/mk/vars.mk index 3de97c104..355a6b12d 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -9,7 +9,11 @@ INSTALL_SCRIPT= install -m0755 MAKEFLAGS= $(EXTRA_MAKEFLAGS) BUILD_USER= $(shell id -un) BUILD_GROUP= $(shell id -gn) -ADK_SUFFIX:= _${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC} +ifeq ($(ADK_TARGET_ABI),) +ADK_SUFFIX:= _${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC}_${ADK_TARGET_CPU_ARCH} +else +ADK_SUFFIX:= _${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC}_${ADK_TARGET_CPU_ARCH}_${ADK_TARGET_ABI} +endif # some global dirs BASE_DIR:= $(ADK_TOPDIR) diff --git a/target/config/Config.in.arm.choice b/target/config/Config.in.arm.choice index 6cdfdba2a..6011fd7a1 100644 --- a/target/config/Config.in.arm.choice +++ b/target/config/Config.in.arm.choice @@ -1,8 +1,8 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -choice ADK_TARGET_ARM_CPU_MODEL -prompt "CPU model" +choice ADK_TARGET_ARM_CPU_ARCH +prompt "CPU architecture" depends on ADK_TARGET_TOOLCHAIN && ADK_LINUX_ARM default ADK_CPU_ARMV7 diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index 103fa1d98..3e47b5a58 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -106,16 +106,19 @@ config ADK_CPU_ARMV8 config ADK_TARGET_CPU_ARCH string + default "aarch64" if ADK_LINUX_AARCH64 && ADK_little default "alpha" if ADK_LINUX_ALPHA - default "x86_64" if ADK_CPU_X86_64 - default "x86_64" if ADK_CPU_AMDFAM10 - default "i686" if ADK_CPU_ATHLON + default "armv5te" if ADK_LINUX_ARM && ADK_little && ADK_armv5te + default "armv6" if ADK_LINUX_ARM && ADK_little && ADK_armv6 + default "armv7a" if ADK_LINUX_ARM && ADK_little && ADK_armv7a + default "arm" if ADK_LINUX_ARM && ADK_little default "i486" if ADK_CPU_I486 default "i586" if ADK_CPU_I586 default "i686" if ADK_CPU_I686 default "i586" if ADK_CPU_GEODE default "i686" if ADK_CPU_PENTIUM_M default "i686" if ADK_CPU_ATOM + default "i686" if ADK_CPU_ATHLON default "m68k" if ADK_LINUX_M68K default "microblaze" if ADK_LINUX_MICROBLAZE && ADK_big default "microblazeel" if ADK_LINUX_MICROBLAZE && ADK_little @@ -123,12 +126,12 @@ config ADK_TARGET_CPU_ARCH default "mips64el" if ADK_LINUX_MIPS64 && ADK_little default "mips" if ADK_LINUX_MIPS && ADK_big default "mipsel" if ADK_LINUX_MIPS && ADK_little - default "aarch64" if ADK_LINUX_AARCH64 && ADK_little - default "arm" if ADK_LINUX_ARM && ADK_little - default "sparc" if ADK_LINUX_SPARC - default "sparc64" if ADK_LINUX_SPARC64 - default "sh4" if ADK_LINUX_SH && ADK_little - default "sh4eb" if ADK_LINUX_SH && ADK_big default "ppc" if ADK_CPU_PPC default "ppc64" if ADK_CPU_PPC64 + default "sh4" if ADK_LINUX_SH && ADK_little + default "sh4eb" if ADK_LINUX_SH && ADK_big + default "sparc" if ADK_LINUX_SPARC + default "sparc64" if ADK_LINUX_SPARC64 + default "x86_64" if ADK_CPU_X86_64 + default "x86_64" if ADK_CPU_AMDFAM10 default "xtensa" if ADK_LINUX_XTENSA diff --git a/target/config/Config.in.libc.default b/target/config/Config.in.libc.default index 52acc0319..bda82ae68 100644 --- a/target/config/Config.in.libc.default +++ b/target/config/Config.in.libc.default @@ -40,15 +40,15 @@ config ADK_TARGET_SUFFIX default "gnu32" if ADK_TARGET_LIB_GLIBC && ADK_32 && ADK_LINUX_64 default "gnux32" if ADK_TARGET_LIB_GLIBC && ADK_x32 && ADK_LINUX_64 default "gnu" if ADK_TARGET_LIB_GLIBC - default "uclibcgnueabihf" if (ADK_TARGET_LIB_UCLIBC || ADK_TARGET_LIB_UCLIBC_NG) && ADK_eabihf - default "uclibcgnueabi" if (ADK_TARGET_LIB_UCLIBC || ADK_TARGET_LIB_UCLIBC_NG) && ADK_eabi + default "uclibceabihf" if (ADK_TARGET_LIB_UCLIBC || ADK_TARGET_LIB_UCLIBC_NG) && ADK_eabihf + default "uclibceabi" if (ADK_TARGET_LIB_UCLIBC || ADK_TARGET_LIB_UCLIBC_NG) && ADK_eabi default "uclibcabi64" if (ADK_TARGET_LIB_UCLIBC || ADK_TARGET_LIB_UCLIBC_NG) && ADK_n64 default "uclibcabin32" if (ADK_TARGET_LIB_UCLIBC || ADK_TARGET_LIB_UCLIBC_NG) && ADK_n32 default "uclibcabi32" if (ADK_TARGET_LIB_UCLIBC || ADK_TARGET_LIB_UCLIBC_NG) && ADK_o32 default "uclibc32" if (ADK_TARGET_LIB_UCLIBC || ADK_TARGET_LIB_UCLIBC_NG) && ADK_32 && ADK_LINUX_64 default "uclibc" if ADK_TARGET_LIB_UCLIBC || ADK_TARGET_LIB_UCLIBC_NG - default "muslgnueabihf" if ADK_TARGET_LIB_MUSL && ADK_eabihf - default "muslgnueabi" if ADK_TARGET_LIB_MUSL && ADK_eabi + default "musleabihf" if ADK_TARGET_LIB_MUSL && ADK_eabihf + default "musleabi" if ADK_TARGET_LIB_MUSL && ADK_eabi default "muslabi64" if ADK_TARGET_LIB_MUSL && ADK_n64 default "muslabin32" if ADK_TARGET_LIB_MUSL && ADK_n32 default "muslabi32" if ADK_TARGET_LIB_MUSL && ADK_o32 diff --git a/target/config/Config.in.x86.choice b/target/config/Config.in.x86.choice index ee1d5815b..5c5b7f47c 100644 --- a/target/config/Config.in.x86.choice +++ b/target/config/Config.in.x86.choice @@ -1,8 +1,8 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -choice ADK_TARGET_X86_CPU_MODEL -prompt "CPU model" +choice ADK_TARGET_X86_CPU_ARCH +prompt "CPU architecture" depends on (ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_GENERIC_PC || ADK_TARGET_SYSTEM_VBOX_X86 || ADK_TARGET_TOOLCHAIN) && ADK_LINUX_X86 default ADK_CPU_I686 |