summaryrefslogtreecommitdiffstats
path: root/compiler-rt/lib
diff options
context:
space:
mode:
Diffstat (limited to 'compiler-rt/lib')
-rw-r--r--compiler-rt/lib/CMakeLists.txt8
-rw-r--r--compiler-rt/lib/asan/CMakeLists.txt8
-rw-r--r--compiler-rt/lib/asan/tests/CMakeLists.txt5
-rw-r--r--compiler-rt/lib/interception/CMakeLists.txt8
-rw-r--r--compiler-rt/lib/msan/CMakeLists.txt2
-rw-r--r--compiler-rt/lib/msan/tests/CMakeLists.txt2
-rw-r--r--compiler-rt/lib/sanitizer_common/CMakeLists.txt8
-rw-r--r--compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt8
-rw-r--r--compiler-rt/lib/tsan/rtl/CMakeLists.txt4
-rw-r--r--compiler-rt/lib/tsan/tests/CMakeLists.txt2
-rw-r--r--compiler-rt/lib/ubsan/CMakeLists.txt8
11 files changed, 32 insertions, 31 deletions
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()
OpenPOWER on IntegriCloud