diff options
| author | Michal Gorny <mgorny@gentoo.org> | 2017-08-27 20:37:06 +0000 |
|---|---|---|
| committer | Michal Gorny <mgorny@gentoo.org> | 2017-08-27 20:37:06 +0000 |
| commit | cc44d7c1f1d3e45e338faf2ecc4fb43c58dda330 (patch) | |
| tree | 521e9eb77919a11073f2599fa1870977091b2b4f /lib/builtins/CMakeLists.txt | |
| parent | 7cbce19925c4686ac96ff7e4ae38b42642dcdc3e (diff) | |
Revert r311842 - [cmake] Remove i686 target that is duplicate to i386
The required change in clang is being reverted because of the Android
build bot failure.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@311859 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/builtins/CMakeLists.txt')
| -rw-r--r-- | lib/builtins/CMakeLists.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt index 650e9f918..6b25c96ce 100644 --- a/lib/builtins/CMakeLists.txt +++ b/lib/builtins/CMakeLists.txt @@ -271,6 +271,9 @@ if (NOT MSVC) i386/chkstk.S i386/chkstk2.S) endif() + + set(i686_SOURCES + ${i386_SOURCES}) else () # MSVC # Use C versions of functions when building on MSVC # MSVC's assembler takes Intel syntax, not AT&T syntax. @@ -282,6 +285,7 @@ else () # MSVC ${GENERIC_SOURCES}) set(x86_64h_SOURCES ${x86_64_SOURCES}) set(i386_SOURCES ${GENERIC_SOURCES}) + set(i686_SOURCES ${i386_SOURCES}) endif () # if (NOT MSVC) set(arm_SOURCES @@ -489,7 +493,9 @@ else () # NOTE: some architectures (e.g. i386) have multiple names. Ensure that # we catch them all. set(_arch ${arch})
- if("${arch}" STREQUAL "armv6m") + if("${arch}" STREQUAL "i686")
+ set(_arch "i386|i686") + elseif("${arch}" STREQUAL "armv6m") set(_arch "arm|armv6m") elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") set(_arch "arm") |