From: Eric Beckmann <ecbeckmann@google.com>
Date: Wed, 26 Jul 2017 21:11:07 +0000 (+0000)
Subject: Revert "Set a different var for checking I686, because LLVM_NATIVE_ARCH is"
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea5f088f7890bd852189abf8f42a16f23a79ef73;p=llvm

Revert "Set a different var for checking I686, because LLVM_NATIVE_ARCH is"

This reverts commit 38a6db6397364ee91b04afea2cdcb1b5b4d252bf.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@309179 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
index 2d3b8663453..dc03e44b995 100644
--- a/cmake/config-ix.cmake
+++ b/cmake/config-ix.cmake
@@ -159,7 +159,7 @@ if( NOT PURE_WINDOWS AND NOT LLVM_USE_SANITIZER MATCHES "Memory.*")
   find_library(ICONV_LIBRARY_PATH NAMES iconv libiconv libiconv-2 c)
   set(LLVM_LIBXML2_ENABLED 0)
   set(LIBXML2_FOUND 0)
-  if((LLVM_ENABLE_LIBXML2) AND (CMAKE_SYSTEM_NAME MATCHES "Linux") AND (ICONV_LIBRARY_PATH) AND (NOT LLVM_ARCH_I686))
+  if((LLVM_ENABLE_LIBXML2) AND (CMAKE_SYSTEM_NAME MATCHES "Linux") AND (ICONV_LIBRARY_PATH) AND (NOT LLVM_NATIVE_ARCH MATCHES "i686"))
     find_package(LibXml2)
     if (LIBXML2_FOUND)
       set(LLVM_LIBXML2_ENABLED 1)
@@ -383,10 +383,6 @@ if( LLVM_NATIVE_ARCH STREQUAL "host" )
   string(REGEX MATCH "^[^-]*" LLVM_NATIVE_ARCH ${LLVM_HOST_TRIPLE})
 endif ()
 
-set(LLVM_ARCH_I686 0)
-if (LLVM_NATIVE_ARCH MATCHES "i686")
-  set(LLVM_ARCH_I686 1)
-
 if (LLVM_NATIVE_ARCH MATCHES "i[2-6]86")
   set(LLVM_NATIVE_ARCH X86)
 elseif (LLVM_NATIVE_ARCH STREQUAL "x86")