aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2016-01-27 21:10:16 +0000
committerDimitry Andric <dim@FreeBSD.org>2016-01-27 21:10:16 +0000
commit807551b099338b7cc4f66ee567aae20a529dd27e (patch)
treea17d5d3b79498bf78c9fd486acfebf38aaf101bb
parentfc411a9eb44c912f867b49a08d4ea98be89681d9 (diff)
downloadsrc-807551b099338b7cc4f66ee567aae20a529dd27e.tar.gz
src-807551b099338b7cc4f66ee567aae20a529dd27e.zip
Vendor import of compiler-rt release_38 branch r258968:vendor/compiler-rt/compiler-rt-release_38-r258968
Notes
Notes: svn path=/vendor/compiler-rt/dist/; revision=294943 svn path=/vendor/compiler-rt/compiler-rt-release_38-r258968/; revision=294944; tag=vendor/compiler-rt/compiler-rt-release_38-r258968
-rw-r--r--cmake/Modules/AddCompilerRT.cmake4
-rw-r--r--cmake/Modules/CompilerRTDarwinUtils.cmake4
-rw-r--r--cmake/Modules/CompilerRTUtils.cmake2
-rw-r--r--cmake/config-ix.cmake24
4 files changed, 17 insertions, 17 deletions
diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake
index 6f401b1fa0c4..3c5845f2a2c1 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 8be28d9a8aa9..895ecdc31cfd 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 cf690f4a33c5..ad9e70c0587a 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 057642b05bdd..264085e65e65 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()