maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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.

llvm-svn: 226937
This commit is contained in:
Reid Kleckner 2015-01-23 21:11:40 +00:00
parent 479ee6135d
commit 5f5036a073
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
llvm/cmake/modules/AddLLVM.cmake
View File

@ -696,7 +696,6 @@ function(configure_lit_site_cfg input output)
set(ENABLE_ASSERTIONS "0") set(ENABLE_ASSERTIONS "0")
endif() endif()
set(HOST_OS ${CMAKE_SYSTEM_NAME})
set(HOST_ARCH ${CMAKE_SYSTEM_PROCESSOR}) set(HOST_ARCH ${CMAKE_SYSTEM_PROCESSOR})
set(HOST_CC "${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}") set(HOST_CC "${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}")

4
llvm/test/ExecutionEngine/MCJIT/lit.local.cfg
View File

@ -8,8 +8,8 @@ else:
# FIXME: autoconf and cmake produce different arch names. We should normalize # FIXME: autoconf and cmake produce different arch names. We should normalize
# them before getting here. # them before getting here.
if root.host_arch not in ['i386', 'x86', 'x86_64', 'AMD64', if root.host_arch.lower() not in ['i386', 'x86', 'x86_64', 'amd64', 'aarch64',
'AArch64', 'ARM', 'Mips', 'PowerPC', 'ppc64', 'SystemZ']: 'arm', 'mips', 'powerpc', 'ppc64', 'systemz']:
config.unsupported = True config.unsupported = True
if 'armv7' in root.host_arch: if 'armv7' in root.host_arch:

1
llvm/test/lit.site.cfg.in
View File

@ -22,7 +22,6 @@ config.enable_shared = @ENABLE_SHARED@
config.enable_assertions = @ENABLE_ASSERTIONS@ config.enable_assertions = @ENABLE_ASSERTIONS@
config.targets_to_build = "@TARGETS_TO_BUILD@" config.targets_to_build = "@TARGETS_TO_BUILD@"
config.llvm_bindings = "@LLVM_BINDINGS@".split(' ') config.llvm_bindings = "@LLVM_BINDINGS@".split(' ')
config.host_os = "@HOST_OS@"
config.host_arch = "@HOST_ARCH@" config.host_arch = "@HOST_ARCH@"
config.host_cc = "@HOST_CC@" config.host_cc = "@HOST_CC@"
config.host_cxx = "@HOST_CXX@" config.host_cxx = "@HOST_CXX@"