diff options
author | Hans Wennborg <hans@hanshq.net> | 2016-01-27 18:44:49 +0000 |
---|---|---|
committer | Hans Wennborg <hans@hanshq.net> | 2016-01-27 18:44:49 +0000 |
commit | 628d5b3f3caa4103d537a3dff4912823bd5e833e (patch) | |
tree | 4846fd1053225c0d2c2dc564a9807abc28793078 | |
parent | 9b2362970b27464357c5ad861c77725f9e19655b (diff) | |
download | compiler-rt-628d5b3f3caa4103d537a3dff4912823bd5e833e.tar.gz |
Merging r258916:
------------------------------------------------------------------------
r258916 | dsanders | 2016-01-27 01:28:01 -0800 (Wed, 27 Jan 2016) | 20 lines
[compiler-rt] list_union() is actually an intersect operation. Rename it.
Summary:
Given:
set(T1 a b c)
set(T2 b c d)
message("T1=${T1}")
message("T2=${T2}")
list_union(T3 T1 T2)
message("T3=${T3}")
cmake emitted:
T1=a;b;c
T2=b;c;d
T3=b;c
Reviewers: beanz
Subscribers: llvm-commits
Differential Revision: http://reviews.llvm.org/D16580
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/branches/release_38@258963 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | cmake/Modules/AddCompilerRT.cmake | 4 | ||||
-rw-r--r-- | cmake/Modules/CompilerRTDarwinUtils.cmake | 4 | ||||
-rw-r--r-- | cmake/Modules/CompilerRTUtils.cmake | 2 | ||||
-rw-r--r-- | cmake/config-ix.cmake | 24 |
4 files changed, 17 insertions, 17 deletions
diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake index 6f401b1fa..3c5845f2a 100644 --- a/cmake/Modules/AddCompilerRT.cmake +++ b/cmake/Modules/AddCompilerRT.cmake @@ -19,7 +19,7 @@ function(add_compiler_rt_object_libraries name) set(libname "${name}.${os}") set(libnames ${libnames} ${libname}) set(extra_cflags_${libname} ${DARWIN_${os}_CFLAGS}) - list_union(LIB_ARCHS_${libname} DARWIN_${os}_ARCHS LIB_ARCHS) + list_intersect(LIB_ARCHS_${libname} DARWIN_${os}_ARCHS LIB_ARCHS) endforeach() else() foreach(arch ${LIB_ARCHS}) @@ -87,7 +87,7 @@ function(add_compiler_rt_runtime name type) set(libname "${name}_${os}_dynamic") set(extra_linkflags_${libname} ${DARWIN_${os}_LINKFLAGS} ${LIB_LINKFLAGS}) endif() - list_union(LIB_ARCHS_${libname} DARWIN_${os}_ARCHS LIB_ARCHS) + list_intersect(LIB_ARCHS_${libname} DARWIN_${os}_ARCHS LIB_ARCHS) if(LIB_ARCHS_${libname}) list(APPEND libnames ${libname}) set(extra_cflags_${libname} ${DARWIN_${os}_CFLAGS} ${LIB_CFLAGS}) diff --git a/cmake/Modules/CompilerRTDarwinUtils.cmake b/cmake/Modules/CompilerRTDarwinUtils.cmake index 8be28d9a8..895ecdc31 100644 --- a/cmake/Modules/CompilerRTDarwinUtils.cmake +++ b/cmake/Modules/CompilerRTDarwinUtils.cmake @@ -91,7 +91,7 @@ endfunction() # This function checks the host cpusubtype to see if it is post-haswell. Haswell # and later machines can run x86_64h binaries. Haswell is cpusubtype 8. function(darwin_filter_host_archs input output) - list_union(tmp_var DARWIN_osx_ARCHS ${input}) + list_intersect(tmp_var DARWIN_osx_ARCHS ${input}) execute_process( COMMAND sysctl hw.cpusubtype OUTPUT_VARIABLE SUBTYPE) @@ -285,7 +285,7 @@ macro(darwin_add_builtin_libraries) ../profile/InstrProfilingPlatformDarwin ../profile/InstrProfilingWriter) foreach (os ${ARGN}) - list_union(DARWIN_BUILTIN_ARCHS DARWIN_${os}_ARCHS BUILTIN_SUPPORTED_ARCH) + list_intersect(DARWIN_BUILTIN_ARCHS DARWIN_${os}_ARCHS BUILTIN_SUPPORTED_ARCH) foreach (arch ${DARWIN_BUILTIN_ARCHS}) darwin_find_excluded_builtins_list(${arch}_${os}_EXCLUDED_BUILTINS OS ${os} diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake index cf690f4a3..ad9e70c05 100644 --- a/cmake/Modules/CompilerRTUtils.cmake +++ b/cmake/Modules/CompilerRTUtils.cmake @@ -58,7 +58,7 @@ macro(append_have_file_definition filename varname list) list(APPEND ${list} "${varname}=${${varname}}") endmacro() -macro(list_union output input1 input2) +macro(list_intersect output input1 input2) set(${output}) foreach(it ${${input1}}) list(FIND ${input2} ${it} index) diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index 057642b05..264085e65 100644 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -488,42 +488,42 @@ if(APPLE) endforeach() endif() - # for list_union + # for list_intersect include(CompilerRTUtils) - list_union(BUILTIN_SUPPORTED_ARCH ALL_BUILTIN_SUPPORTED_ARCH toolchain_arches) + list_intersect(BUILTIN_SUPPORTED_ARCH ALL_BUILTIN_SUPPORTED_ARCH toolchain_arches) - list_union(SANITIZER_COMMON_SUPPORTED_ARCH + list_intersect(SANITIZER_COMMON_SUPPORTED_ARCH ALL_SANITIZER_COMMON_SUPPORTED_ARCH COMPILER_RT_SUPPORTED_ARCH ) set(LSAN_COMMON_SUPPORTED_ARCH ${SANITIZER_COMMON_SUPPORTED_ARCH}) set(UBSAN_COMMON_SUPPORTED_ARCH ${SANITIZER_COMMON_SUPPORTED_ARCH}) - list_union(ASAN_SUPPORTED_ARCH + list_intersect(ASAN_SUPPORTED_ARCH ALL_ASAN_SUPPORTED_ARCH SANITIZER_COMMON_SUPPORTED_ARCH) - list_union(DFSAN_SUPPORTED_ARCH + list_intersect(DFSAN_SUPPORTED_ARCH ALL_DFSAN_SUPPORTED_ARCH SANITIZER_COMMON_SUPPORTED_ARCH) - list_union(LSAN_SUPPORTED_ARCH + list_intersect(LSAN_SUPPORTED_ARCH ALL_LSAN_SUPPORTED_ARCH SANITIZER_COMMON_SUPPORTED_ARCH) - list_union(MSAN_SUPPORTED_ARCH + list_intersect(MSAN_SUPPORTED_ARCH ALL_MSAN_SUPPORTED_ARCH SANITIZER_COMMON_SUPPORTED_ARCH) - list_union(PROFILE_SUPPORTED_ARCH + list_intersect(PROFILE_SUPPORTED_ARCH ALL_PROFILE_SUPPORTED_ARCH SANITIZER_COMMON_SUPPORTED_ARCH) - list_union(TSAN_SUPPORTED_ARCH + list_intersect(TSAN_SUPPORTED_ARCH ALL_TSAN_SUPPORTED_ARCH SANITIZER_COMMON_SUPPORTED_ARCH) - list_union(UBSAN_SUPPORTED_ARCH + list_intersect(UBSAN_SUPPORTED_ARCH ALL_UBSAN_SUPPORTED_ARCH SANITIZER_COMMON_SUPPORTED_ARCH) - list_union(SAFESTACK_SUPPORTED_ARCH + list_intersect(SAFESTACK_SUPPORTED_ARCH ALL_SAFESTACK_SUPPORTED_ARCH SANITIZER_COMMON_SUPPORTED_ARCH) - list_union(CFI_SUPPORTED_ARCH + list_intersect(CFI_SUPPORTED_ARCH ALL_CFI_SUPPORTED_ARCH SANITIZER_COMMON_SUPPORTED_ARCH) else() |