Merge pull request #1106 from stilor/x86-default-to-i686

Warn if architecture is empty on x86/32bit
This commit is contained in:
Alexey Neyman 2018-12-03 16:22:16 -08:00 committed by GitHub
commit dc9fa6ad64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions

View File

@ -268,7 +268,9 @@ config ARCH_ARCH
target CPU. target CPU.
Leave blank if you don't know, or if your target architecture does not Leave blank if you don't know, or if your target architecture does not
offer this option. offer this option. Must be specified for 32-bit x86 that uses some
C library (glibc, uClibc-ng, ...) - the default, "i386" is not supported
by these libraries.
config ARCH_ABI config ARCH_ABI
string string

View File

@ -10,7 +10,11 @@ CT_DoArchTupleValues() {
arch="${CT_ARCH_ARCH}" arch="${CT_ARCH_ARCH}"
[ -z "${arch}" ] && arch="${CT_ARCH_TUNE}" [ -z "${arch}" ] && arch="${CT_ARCH_TUNE}"
case "${arch}" in case "${arch}" in
"") CT_TARGET_ARCH=i386;; "")
CT_DoLog WARN "Architecture level is not specified for 32-bit x86; defaulting to i386."
CT_DoLog WARN "This may not be supported by the C library."
CT_TARGET_ARCH=i386
;;
i386|i486|i586|i686) CT_TARGET_ARCH="${arch}";; i386|i486|i586|i686) CT_TARGET_ARCH="${arch}";;
winchip*) CT_TARGET_ARCH=i486;; winchip*) CT_TARGET_ARCH=i486;;
pentium|pentium-mmx|c3*) CT_TARGET_ARCH=i586;; pentium|pentium-mmx|c3*) CT_TARGET_ARCH=i586;;