diff options
| -rw-r--r-- | compiler-rt/CMakeLists.txt | 28 | ||||
| -rw-r--r-- | compiler-rt/lib/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | compiler-rt/lib/asan/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | compiler-rt/lib/asan/tests/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | compiler-rt/lib/interception/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | compiler-rt/lib/msan/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | compiler-rt/lib/msan/tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | compiler-rt/lib/tsan/rtl/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | compiler-rt/lib/tsan/tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | compiler-rt/lib/ubsan/CMakeLists.txt | 8 |
12 files changed, 46 insertions, 45 deletions
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index 0c9f2a624b8..6d452311b65 100644 --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -30,21 +30,21 @@ set(COMPILER_RT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) # Detect whether the current target platform is 32-bit or 64-bit, and setup # the correct commandline flags needed to attempt to target 32-bit and 64-bit. if(CMAKE_SIZEOF_VOID_P EQUAL 4 OR LLVM_BUILD_32_BITS) - set(TARGET_X86_64_CFLAGS "-m64") - set(TARGET_I386_CFLAGS "") + set(TARGET_x86_64_CFLAGS "-m64") + set(TARGET_i386_CFLAGS "") else() if(NOT CMAKE_SIZEOF_VOID_P EQUAL 8) message(FATAL_ERROR "Please use a sane architecture with 4 or 8 byte pointers.") endif() - set(TARGET_X86_64_CFLAGS "") - set(TARGET_I386_CFLAGS "-m32") + set(TARGET_x86_64_CFLAGS "") + set(TARGET_i386_CFLAGS "-m32") endif() function(get_target_flags_for_arch arch out_var) if(${arch} STREQUAL "x86_64") - set(${out_var} ${TARGET_X86_64_CFLAGS} PARENT_SCOPE) + set(${out_var} ${TARGET_x86_64_CFLAGS} PARENT_SCOPE) elseif(${arch} STREQUAL "i386") - set(${out_var} ${TARGET_I386_CFLAGS} PARENT_SCOPE) + set(${out_var} ${TARGET_i386_CFLAGS} PARENT_SCOPE) else() message(FATAL_ERROR "Unsupported architecture: ${arch}") endif() @@ -56,15 +56,15 @@ endfunction() # abilities. set(SIMPLE_SOURCE64 ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/simple64.c) file(WRITE ${SIMPLE_SOURCE64} "#include <stdlib.h>\nint main() {}") -try_compile(CAN_TARGET_X86_64 ${CMAKE_BINARY_DIR} ${SIMPLE_SOURCE64} - COMPILE_DEFINITIONS "${TARGET_X86_64_CFLAGS}" - CMAKE_FLAGS "-DCMAKE_EXE_LINKER_FLAGS:STRING=${TARGET_X86_64_CFLAGS}") +try_compile(CAN_TARGET_x86_64 ${CMAKE_BINARY_DIR} ${SIMPLE_SOURCE64} + COMPILE_DEFINITIONS "${TARGET_x86_64_CFLAGS}" + CMAKE_FLAGS "-DCMAKE_EXE_LINKER_FLAGS:STRING=${TARGET_x86_64_CFLAGS}") set(SIMPLE_SOURCE32 ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/simple32.c) file(WRITE ${SIMPLE_SOURCE32} "#include <stdlib.h>\nint main() {}") -try_compile(CAN_TARGET_I386 ${CMAKE_BINARY_DIR} ${SIMPLE_SOURCE32} - COMPILE_DEFINITIONS "${TARGET_I386_CFLAGS}" - CMAKE_FLAGS "-DCMAKE_EXE_LINKER_FLAGS:STRING=${TARGET_I386_CFLAGS}") +try_compile(CAN_TARGET_i386 ${CMAKE_BINARY_DIR} ${SIMPLE_SOURCE32} + COMPILE_DEFINITIONS "${TARGET_i386_CFLAGS}" + CMAKE_FLAGS "-DCMAKE_EXE_LINKER_FLAGS:STRING=${TARGET_i386_CFLAGS}") # We only support running instrumented tests when we're not cross compiling # and target a unix-like system. On Android we define the rules for building @@ -78,9 +78,9 @@ endif() function(filter_available_targets out_var) set(archs) foreach(arch ${ARGN}) - if(${arch} STREQUAL "x86_64" AND CAN_TARGET_X86_64) + if(${arch} STREQUAL "x86_64" AND CAN_TARGET_x86_64) list(APPEND archs ${arch}) - elseif (${arch} STREQUAL "i386" AND CAN_TARGET_I386) + elseif (${arch} STREQUAL "i386" AND CAN_TARGET_i386) list(APPEND archs ${arch}) endif() endforeach() diff --git a/compiler-rt/lib/CMakeLists.txt b/compiler-rt/lib/CMakeLists.txt index e77190473aa..50c533b94b8 100644 --- a/compiler-rt/lib/CMakeLists.txt +++ b/compiler-rt/lib/CMakeLists.txt @@ -150,7 +150,7 @@ set(GENERIC_SOURCES umodti3.c ) -if(CAN_TARGET_X86_64) +if(CAN_TARGET_x86_64) add_library(clang_rt.x86_64 STATIC x86_64/floatdidf.c x86_64/floatdisf.c @@ -160,10 +160,10 @@ if(CAN_TARGET_X86_64) x86_64/floatundixf.S ${GENERIC_SOURCES} ) - set_target_properties(clang_rt.x86_64 PROPERTIES COMPILE_FLAGS "-std=c99 ${TARGET_X86_64_CFLAGS}") + set_target_properties(clang_rt.x86_64 PROPERTIES COMPILE_FLAGS "-std=c99 ${TARGET_x86_64_CFLAGS}") add_clang_compiler_rt_libraries(clang_rt.x86_64) endif() -if(CAN_TARGET_I386) +if(CAN_TARGET_i386) add_library(clang_rt.i386 STATIC i386/ashldi3.S i386/ashrdi3.S @@ -181,6 +181,6 @@ if(CAN_TARGET_I386) i386/umoddi3.S ${GENERIC_SOURCES} ) - set_target_properties(clang_rt.i386 PROPERTIES COMPILE_FLAGS "-std=c99 ${TARGET_I386_CFLAGS}") + set_target_properties(clang_rt.i386 PROPERTIES COMPILE_FLAGS "-std=c99 ${TARGET_i386_CFLAGS}") add_clang_compiler_rt_libraries(clang_rt.i386) endif() diff --git a/compiler-rt/lib/asan/CMakeLists.txt b/compiler-rt/lib/asan/CMakeLists.txt index 2a27da9dc61..810019042e8 100644 --- a/compiler-rt/lib/asan/CMakeLists.txt +++ b/compiler-rt/lib/asan/CMakeLists.txt @@ -78,25 +78,25 @@ elseif(ANDROID) list(APPEND ASAN_RUNTIME_LIBRARIES clang_rt.asan-arm-android) else() # Otherwise, build separate libraries for each target. - if(CAN_TARGET_X86_64) + if(CAN_TARGET_x86_64) add_library(clang_rt.asan-x86_64 STATIC ${ASAN_SOURCES} $<TARGET_OBJECTS:RTInterception.x86_64> $<TARGET_OBJECTS:RTSanitizerCommon.x86_64> ) set_target_compile_flags(clang_rt.asan-x86_64 - ${ASAN_CFLAGS} ${TARGET_X86_64_CFLAGS} + ${ASAN_CFLAGS} ${TARGET_x86_64_CFLAGS} ) list(APPEND ASAN_RUNTIME_LIBRARIES clang_rt.asan-x86_64) endif() - if(CAN_TARGET_I386) + if(CAN_TARGET_i386) add_library(clang_rt.asan-i386 STATIC ${ASAN_SOURCES} $<TARGET_OBJECTS:RTInterception.i386> $<TARGET_OBJECTS:RTSanitizerCommon.i386> ) set_target_compile_flags(clang_rt.asan-i386 - ${ASAN_CFLAGS} ${TARGET_I386_CFLAGS} + ${ASAN_CFLAGS} ${TARGET_i386_CFLAGS} ) list(APPEND ASAN_RUNTIME_LIBRARIES clang_rt.asan-i386) endif() diff --git a/compiler-rt/lib/asan/tests/CMakeLists.txt b/compiler-rt/lib/asan/tests/CMakeLists.txt index 0cfb767f64a..c0324902ac3 100644 --- a/compiler-rt/lib/asan/tests/CMakeLists.txt +++ b/compiler-rt/lib/asan/tests/CMakeLists.txt @@ -65,6 +65,7 @@ else() # passing -fsanitize=address flag. list(APPEND ASAN_LINK_FLAGS -fsanitize=address) endif() + # Unit tests on Mac depend on Foundation. if(APPLE) list(APPEND ASAN_LINK_FLAGS -framework Foundation) @@ -154,10 +155,10 @@ macro(add_asan_tests_for_arch arch) endmacro() if(COMPILER_RT_CAN_EXECUTE_TESTS) - if(CAN_TARGET_X86_64) + if(CAN_TARGET_x86_64) add_asan_tests_for_arch(x86_64) endif() - if(CAN_TARGET_I386) + if(CAN_TARGET_i386) add_asan_tests_for_arch(i386) endif() endif() diff --git a/compiler-rt/lib/interception/CMakeLists.txt b/compiler-rt/lib/interception/CMakeLists.txt index 2ebb9becef6..1e25214a995 100644 --- a/compiler-rt/lib/interception/CMakeLists.txt +++ b/compiler-rt/lib/interception/CMakeLists.txt @@ -29,15 +29,15 @@ if(APPLE) OSX_ARCHITECTURES "${INTERCEPTION_TARGETS}") else() # Otherwise, build separate libraries for each target. - if(CAN_TARGET_X86_64) + if(CAN_TARGET_x86_64) add_library(RTInterception.x86_64 OBJECT ${INTERCEPTION_SOURCES}) set_target_compile_flags(RTInterception.x86_64 - ${INTERCEPTION_CFLAGS} ${TARGET_X86_64_CFLAGS}) + ${INTERCEPTION_CFLAGS} ${TARGET_x86_64_CFLAGS}) endif() - if(CAN_TARGET_I386) + if(CAN_TARGET_i386) add_library(RTInterception.i386 OBJECT ${INTERCEPTION_SOURCES}) set_target_compile_flags(RTInterception.i386 - ${INTERCEPTION_CFLAGS} ${TARGET_I386_CFLAGS}) + ${INTERCEPTION_CFLAGS} ${TARGET_i386_CFLAGS}) endif() if(ANDROID) add_library(RTInterception.arm.android OBJECT ${INTERCEPTION_SOURCES}) diff --git a/compiler-rt/lib/msan/CMakeLists.txt b/compiler-rt/lib/msan/CMakeLists.txt index bb020c915f0..bb8dbccbeba 100644 --- a/compiler-rt/lib/msan/CMakeLists.txt +++ b/compiler-rt/lib/msan/CMakeLists.txt @@ -24,7 +24,7 @@ add_library(clang_rt.msan-x86_64 STATIC $<TARGET_OBJECTS:RTSanitizerCommon.x86_64> ) set_target_compile_flags(clang_rt.msan-x86_64 - ${MSAN_RTL_CFLAGS} ${TARGET_X86_64_CFLAGS} + ${MSAN_RTL_CFLAGS} ${TARGET_x86_64_CFLAGS} ) list(APPEND MSAN_RUNTIME_LIBRARIES clang_rt.msan-x86_64) diff --git a/compiler-rt/lib/msan/tests/CMakeLists.txt b/compiler-rt/lib/msan/tests/CMakeLists.txt index 9da3916e7bd..d5fb8aed70a 100644 --- a/compiler-rt/lib/msan/tests/CMakeLists.txt +++ b/compiler-rt/lib/msan/tests/CMakeLists.txt @@ -149,7 +149,7 @@ macro(add_msan_tests_for_arch arch) endmacro() if(COMPILER_RT_CAN_EXECUTE_TESTS AND EXISTS ${MSAN_LIBCXX_PATH}/) - if(CAN_TARGET_X86_64) + if(CAN_TARGET_x86_64) add_msan_tests_for_arch(x86_64) endif() diff --git a/compiler-rt/lib/sanitizer_common/CMakeLists.txt b/compiler-rt/lib/sanitizer_common/CMakeLists.txt index 5ebe5a4ef2e..d7b18694249 100644 --- a/compiler-rt/lib/sanitizer_common/CMakeLists.txt +++ b/compiler-rt/lib/sanitizer_common/CMakeLists.txt @@ -60,16 +60,16 @@ if(APPLE) list(APPEND SANITIZER_RUNTIME_LIBRARIES RTSanitizerCommon.osx) else() # Otherwise, build separate libraries for each target. - if(CAN_TARGET_X86_64) + if(CAN_TARGET_x86_64) add_library(RTSanitizerCommon.x86_64 OBJECT ${SANITIZER_SOURCES}) set_target_compile_flags(RTSanitizerCommon.x86_64 - ${SANITIZER_CFLAGS} ${TARGET_X86_64_CFLAGS}) + ${SANITIZER_CFLAGS} ${TARGET_x86_64_CFLAGS}) list(APPEND SANITIZER_RUNTIME_LIBRARIES RTSanitizerCommon.x86_64) endif() - if(CAN_TARGET_I386) + if(CAN_TARGET_i386) add_library(RTSanitizerCommon.i386 OBJECT ${SANITIZER_SOURCES}) set_target_compile_flags(RTSanitizerCommon.i386 - ${SANITIZER_CFLAGS} ${TARGET_I386_CFLAGS}) + ${SANITIZER_CFLAGS} ${TARGET_i386_CFLAGS}) list(APPEND SANITIZER_RUNTIME_LIBRARIES RTSanitizerCommon.i386) endif() if(ANDROID) diff --git a/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt b/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt index 4768cdbc2f9..e0a27611232 100644 --- a/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt +++ b/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt @@ -84,19 +84,19 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS) add_sanitizer_common_lib("RTSanitizerCommon.test.osx" $<TARGET_OBJECTS:RTSanitizerCommon.osx>) else() - if(CAN_TARGET_X86_64) + if(CAN_TARGET_x86_64) add_sanitizer_common_lib("RTSanitizerCommon.test.x86_64" $<TARGET_OBJECTS:RTSanitizerCommon.x86_64>) endif() - if(CAN_TARGET_I386) + if(CAN_TARGET_i386) add_sanitizer_common_lib("RTSanitizerCommon.test.i386" $<TARGET_OBJECTS:RTSanitizerCommon.i386>) endif() endif() - if(CAN_TARGET_X86_64) + if(CAN_TARGET_x86_64) add_sanitizer_tests_for_arch(x86_64) endif() - if(CAN_TARGET_I386) + if(CAN_TARGET_i386) add_sanitizer_tests_for_arch(i386) endif() diff --git a/compiler-rt/lib/tsan/rtl/CMakeLists.txt b/compiler-rt/lib/tsan/rtl/CMakeLists.txt index fe87eda9b43..d91e2e43ca4 100644 --- a/compiler-rt/lib/tsan/rtl/CMakeLists.txt +++ b/compiler-rt/lib/tsan/rtl/CMakeLists.txt @@ -33,7 +33,7 @@ endif() set(TSAN_RUNTIME_LIBRARIES) # TSan is currently supported on 64-bit Linux only. -if(CAN_TARGET_X86_64 AND UNIX AND NOT APPLE) +if(CAN_TARGET_x86_64 AND UNIX AND NOT APPLE) set(TSAN_ASM_SOURCES tsan_rtl_amd64.S) # Pass ASM file directly to the C++ compiler. set_source_files_properties(${TSAN_ASM_SOURCES} PROPERTIES @@ -46,7 +46,7 @@ if(CAN_TARGET_X86_64 AND UNIX AND NOT APPLE) $<TARGET_OBJECTS:RTSanitizerCommon.x86_64> ) set_target_compile_flags(clang_rt.tsan-x86_64 - ${TSAN_CFLAGS} ${TARGET_X86_64_CFLAGS} + ${TSAN_CFLAGS} ${TARGET_x86_64_CFLAGS} ) list(APPEND TSAN_RUNTIME_LIBRARIES clang_rt.tsan-x86_64) endif() diff --git a/compiler-rt/lib/tsan/tests/CMakeLists.txt b/compiler-rt/lib/tsan/tests/CMakeLists.txt index d452f60c14f..0fcc6b2b1c8 100644 --- a/compiler-rt/lib/tsan/tests/CMakeLists.txt +++ b/compiler-rt/lib/tsan/tests/CMakeLists.txt @@ -6,7 +6,7 @@ set_target_properties(TsanUnitTests PROPERTIES function(add_tsan_unittest testname) # Build unit tests only on 64-bit Linux. if(UNIX AND NOT APPLE - AND CAN_TARGET_X86_64 + AND CAN_TARGET_x86_64 AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT LLVM_BUILD_32_BITS) add_unittest(TsanUnitTests ${testname} ${ARGN}) diff --git a/compiler-rt/lib/ubsan/CMakeLists.txt b/compiler-rt/lib/ubsan/CMakeLists.txt index b16983da43e..7d5bf01cfd4 100644 --- a/compiler-rt/lib/ubsan/CMakeLists.txt +++ b/compiler-rt/lib/ubsan/CMakeLists.txt @@ -27,23 +27,23 @@ if(APPLE) list(APPEND UBSAN_RUNTIME_LIBRARIES clang_rt.ubsan_osx) else() # Build separate libraries for each target. - if(CAN_TARGET_X86_64) + if(CAN_TARGET_x86_64) add_library(clang_rt.ubsan-x86_64 STATIC ${UBSAN_SOURCES} $<TARGET_OBJECTS:RTSanitizerCommon.x86_64> ) set_target_compile_flags(clang_rt.ubsan-x86_64 - ${UBSAN_CFLAGS} ${TARGET_X86_64_CFLAGS} + ${UBSAN_CFLAGS} ${TARGET_x86_64_CFLAGS} ) list(APPEND UBSAN_RUNTIME_LIBRARIES clang_rt.ubsan-x86_64) endif() - if(CAN_TARGET_I386) + if(CAN_TARGET_i386) add_library(clang_rt.ubsan-i386 STATIC ${UBSAN_SOURCES} $<TARGET_OBJECTS:RTSanitizerCommon.i386> ) set_target_compile_flags(clang_rt.ubsan-i386 - ${UBSAN_CFLAGS} ${TARGET_I386_CFLAGS} + ${UBSAN_CFLAGS} ${TARGET_i386_CFLAGS} ) list(APPEND UBSAN_RUNTIME_LIBRARIES clang_rt.ubsan-i386) endif() |
