Author: hans
Date: Wed Jan 27 12:44:49 2016
New Revision: 258963
URL: http://llvm.org/viewvc/llvm-project?rev=258963&view=rev
Log:
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
------------------------------------------------------------------------
Modified:
compiler-rt/branches/release_38/ (props changed)
compiler-rt/branches/release_38/cmake/Modules/AddCompilerRT.cmake
compiler-rt/branches/release_38/cmake/Modules/CompilerRTDarwinUtils.cmake
compiler-rt/branches/release_38/cmake/Modules/CompilerRTUtils.cmake
compiler-rt/branches/release_38/cmake/config-ix.cmake
Propchange: compiler-rt/branches/release_38/
------------------------------------------------------------------------------
svn:mergeinfo = /compiler-rt/trunk:258916
Modified: compiler-rt/branches/release_38/cmake/Modules/AddCompilerRT.cmake
URL:
http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_38/cmake/Modules/AddCompilerRT.cmake?rev=258963&r1=258962&r2=258963&view=diff
==============================================================================
--- compiler-rt/branches/release_38/cmake/Modules/AddCompilerRT.cmake (original)
+++ compiler-rt/branches/release_38/cmake/Modules/AddCompilerRT.cmake Wed Jan
27 12:44:49 2016
@@ -19,7 +19,7 @@ function(add_compiler_rt_object_librarie
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 ty
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})
Modified:
compiler-rt/branches/release_38/cmake/Modules/CompilerRTDarwinUtils.cmake
URL:
http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_38/cmake/Modules/CompilerRTDarwinUtils.cmake?rev=258963&r1=258962&r2=258963&view=diff
==============================================================================
--- compiler-rt/branches/release_38/cmake/Modules/CompilerRTDarwinUtils.cmake
(original)
+++ compiler-rt/branches/release_38/cmake/Modules/CompilerRTDarwinUtils.cmake
Wed Jan 27 12:44:49 2016
@@ -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}
Modified: compiler-rt/branches/release_38/cmake/Modules/CompilerRTUtils.cmake
URL:
http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_38/cmake/Modules/CompilerRTUtils.cmake?rev=258963&r1=258962&r2=258963&view=diff
==============================================================================
--- compiler-rt/branches/release_38/cmake/Modules/CompilerRTUtils.cmake
(original)
+++ compiler-rt/branches/release_38/cmake/Modules/CompilerRTUtils.cmake Wed Jan
27 12:44:49 2016
@@ -58,7 +58,7 @@ macro(append_have_file_definition filena
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)
Modified: compiler-rt/branches/release_38/cmake/config-ix.cmake
URL:
http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_38/cmake/config-ix.cmake?rev=258963&r1=258962&r2=258963&view=diff
==============================================================================
--- compiler-rt/branches/release_38/cmake/config-ix.cmake (original)
+++ compiler-rt/branches/release_38/cmake/config-ix.cmake Wed Jan 27 12:44:49
2016
@@ -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()
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
