[llvm] r226937 - lit: Make MCJIT's supported arch check case insensitive

[Reid Kleckner]

Author: rnk
Date: Fri Jan 23 15:11:40 2015
New Revision: 226937

URL: http://llvm.org/viewvc/llvm-project?rev=226937&view=rev
Log:
lit: Make MCJIT's supported arch check case insensitive

Should make the tests run when using CMake on systems where 'uname -p'
reports "amd64", such as FreeBSD.

Should fix PR21559.

Modified:
    llvm/trunk/cmake/modules/AddLLVM.cmake
    llvm/trunk/test/ExecutionEngine/MCJIT/lit.local.cfg
    llvm/trunk/test/lit.site.cfg.in

Modified: llvm/trunk/cmake/modules/AddLLVM.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=226937&r1=226936&r2=226937&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/AddLLVM.cmake (original)
+++ llvm/trunk/cmake/modules/AddLLVM.cmake Fri Jan 23 15:11:40 2015
@@ -696,7 +696,6 @@ function(configure_lit_site_cfg input ou
     set(ENABLE_ASSERTIONS "0")
   endif()
 
-  set(HOST_OS ${CMAKE_SYSTEM_NAME})
   set(HOST_ARCH ${CMAKE_SYSTEM_PROCESSOR})
 
   set(HOST_CC "${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}")

Modified: llvm/trunk/test/ExecutionEngine/MCJIT/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/MCJIT/lit.local.cfg?rev=226937&r1=226936&r2=226937&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/MCJIT/lit.local.cfg (original)
+++ llvm/trunk/test/ExecutionEngine/MCJIT/lit.local.cfg Fri Jan 23 15:11:40 2015
@@ -8,8 +8,8 @@ else:
 
 # FIXME: autoconf and cmake produce different arch names. We should normalize
 # them before getting here.
-if root.host_arch not in ['i386', 'x86', 'x86_64', 'AMD64',
-                          'AArch64', 'ARM', 'Mips', 'PowerPC', 'ppc64', 'SystemZ']:
+if root.host_arch.lower() not in ['i386', 'x86', 'x86_64', 'amd64', 'aarch64',
+                                  'arm', 'mips', 'powerpc', 'ppc64', 'systemz']:
     config.unsupported = True
 
 if 'armv7' in root.host_arch:

Modified: llvm/trunk/test/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lit.site.cfg.in?rev=226937&r1=226936&r2=226937&view=diff
==============================================================================
--- llvm/trunk/test/lit.site.cfg.in (original)
+++ llvm/trunk/test/lit.site.cfg.in Fri Jan 23 15:11:40 2015
@@ -22,7 +22,6 @@ config.enable_shared = @ENABLE_SHARED@
 config.enable_assertions = @ENABLE_ASSERTIONS@
 config.targets_to_build = "@TARGETS_TO_BUILD@"
 config.llvm_bindings = "@LLVM_BINDINGS@".split(' ')
-config.host_os = "@HOST_OS@"
 config.host_arch = "@HOST_ARCH@"
 config.host_cc = "@HOST_CC@"
 config.host_cxx = "@HOST_CXX@"