diff options
| author | andrew <andrew@FreeBSD.org> | 2014-10-01 16:00:21 +0000 |
|---|---|---|
| committer | andrew <andrew@FreeBSD.org> | 2014-10-01 16:00:21 +0000 |
| commit | 732fbf8303d8a3b666e2cffb9a9e26859a430a58 (patch) | |
| tree | 9e47437df4deaac1fa77fda5a4348773f723a358 /share | |
| parent | cf38bd7e64434b27fce0803a47d5b78bab9b6ec3 (diff) | |
| download | FreeBSD-src-732fbf8303d8a3b666e2cffb9a9e26859a430a58.zip FreeBSD-src-732fbf8303d8a3b666e2cffb9a9e26859a430a58.tar.gz | |
Clean up detection of big-endian ARM. In all cases we follow the pattern
arm*eb*. Check we are building for arm and if MACHINE_ARCH follows this
pattern.
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.endian.mk | 7 | ||||
| -rw-r--r-- | share/mk/src.opts.mk | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/share/mk/bsd.endian.mk b/share/mk/bsd.endian.mk index 565d1aa..c82c37f 100644 --- a/share/mk/bsd.endian.mk +++ b/share/mk/bsd.endian.mk @@ -2,16 +2,13 @@ .if ${MACHINE_ARCH} == "amd64" || \ ${MACHINE_ARCH} == "i386" || \ - ${MACHINE_ARCH} == "arm" || \ - ${MACHINE_ARCH} == "armv6" || \ - ${MACHINE_ARCH} == "armv6hf" || \ + (${MACHINE} == "arm" && ${MACHINE_ARCH:Marm*eb*} == "") || \ ${MACHINE_ARCH:Mmips*el} != "" TARGET_ENDIANNESS= 1234 .elif ${MACHINE_ARCH} == "powerpc" || \ ${MACHINE_ARCH} == "powerpc64" || \ ${MACHINE_ARCH} == "sparc64" || \ - ${MACHINE_ARCH} == "armeb" || \ - ${MACHINE_ARCH} == "armv6eb" || \ + (${MACHINE} == "arm" && ${MACHINE_ARCH:Marm*eb*} != "") || \ ${MACHINE_ARCH:Mmips*} != "" TARGET_ENDIANNESS= 4321 .endif diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 7ecc530..a852d3d 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -193,7 +193,7 @@ __TT=${MACHINE} # Clang is only for x86, powerpc and little-endian arm right now, by default. .if ${__T} == "amd64" || ${__T} == "i386" || ${__T:Mpowerpc*} __DEFAULT_YES_OPTIONS+=CLANG CLANG_FULL CLANG_BOOTSTRAP -.elif ${__T} == "arm" || ${__T} == "armv6" || ${__T} == "armv6hf" +.elif ${__TT} == "arm" && ${__T:Marm*eb*} == "" __DEFAULT_YES_OPTIONS+=CLANG CLANG_BOOTSTRAP # GCC is unable to build the full clang on arm, disable it by default. __DEFAULT_NO_OPTIONS+=CLANG_FULL @@ -201,8 +201,8 @@ __DEFAULT_NO_OPTIONS+=CLANG_FULL __DEFAULT_NO_OPTIONS+=CLANG CLANG_FULL CLANG_BOOTSTRAP .endif # Clang the default system compiler only on little-endian arm and x86. -.if ${__T} == "amd64" || ${__T} == "arm" || ${__T} == "armv6" || \ - ${__T} == "armv6hf" || ${__T} == "i386" +.if ${__T} == "amd64" || (${__TT} == "arm" && ${__T:Marm*eb*} == "") || \ + ${__T} == "i386" __DEFAULT_YES_OPTIONS+=CLANG_IS_CC __DEFAULT_NO_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX .else |
