<div dir="ltr">Ouch. Yes, let's merge it to avoid confusion.</div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Jan 27, 2016 at 9:24 AM, Hans Wennborg <span dir="ltr"><<a href="mailto:hans@chromium.org" target="_blank">hans@chromium.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">+Alexey who owns the CMake build in compiler-rt.<br>
<br>
On Wed, Jan 27, 2016 at 1:41 AM, Daniel Sanders<br>
<<a href="mailto:Daniel.Sanders@imgtec.com">Daniel.Sanders@imgtec.com</a>> wrote:<br>
> Hi Hans,<br>
><br>
> This isn't associated with any bug but I think we ought to merge it. Is it ok to merge?<br>
><br>
>> -----Original Message-----<br>
>> From: llvm-commits [mailto:<a href="mailto:llvm-commits-bounces@lists.llvm.org">llvm-commits-bounces@lists.llvm.org</a>] On Behalf<br>
>> Of Daniel Sanders via llvm-commits<br>
>> Sent: 27 January 2016 09:28<br>
>> To: <a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
>> Subject: [compiler-rt] r258916 - [compiler-rt] list_union() is actually an<br>
>> intersect operation. Rename it.<br>
>><br>
>> Author: dsanders<br>
>> Date: Wed Jan 27 03:28:01 2016<br>
>> New Revision: 258916<br>
>><br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=258916&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=258916&view=rev</a><br>
>> Log:<br>
>> [compiler-rt] list_union() is actually an intersect operation. Rename it.<br>
>><br>
>> Summary:<br>
>> Given:<br>
>>   set(T1 a b c)<br>
>>   set(T2 b c d)<br>
>>   message("T1=${T1}")<br>
>>   message("T2=${T2}")<br>
>>   list_union(T3 T1 T2)<br>
>>   message("T3=${T3}")<br>
>> cmake emitted:<br>
>>   T1=a;b;c<br>
>>   T2=b;c;d<br>
>>   T3=b;c<br>
>><br>
>> Reviewers: beanz<br>
>><br>
>> Subscribers: llvm-commits<br>
>><br>
>> Differential Revision: <a href="http://reviews.llvm.org/D16580" rel="noreferrer" target="_blank">http://reviews.llvm.org/D16580</a><br>
>><br>
>> Modified:<br>
>>     compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake<br>
>>     compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake<br>
>>     compiler-rt/trunk/cmake/Modules/CompilerRTUtils.cmake<br>
>>     compiler-rt/trunk/cmake/config-ix.cmake<br>
>><br>
>> Modified: compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake<br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-</a><br>
>> rt/trunk/cmake/Modules/AddCompilerRT.cmake?rev=258916&r1=258915&r<br>
>> 2=258916&view=diff<br>
>> ==========================================================<br>
>> ====================<br>
>> --- compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake (original)<br>
>> +++ compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake Wed Jan 27<br>
>> 03:28:01 2016<br>
>> @@ -19,7 +19,7 @@ function(add_compiler_rt_object_librarie<br>
>>        set(libname "${name}.${os}")<br>
>>        set(libnames ${libnames} ${libname})<br>
>>        set(extra_cflags_${libname} ${DARWIN_${os}_CFLAGS})<br>
>> -      list_union(LIB_ARCHS_${libname} DARWIN_${os}_ARCHS LIB_ARCHS)<br>
>> +      list_intersect(LIB_ARCHS_${libname} DARWIN_${os}_ARCHS LIB_ARCHS)<br>
>>      endforeach()<br>
>>    else()<br>
>>      foreach(arch ${LIB_ARCHS})<br>
>> @@ -87,7 +87,7 @@ function(add_compiler_rt_runtime name ty<br>
>>          set(libname "${name}_${os}_dynamic")<br>
>>          set(extra_linkflags_${libname} ${DARWIN_${os}_LINKFLAGS}<br>
>> ${LIB_LINKFLAGS})<br>
>>        endif()<br>
>> -      list_union(LIB_ARCHS_${libname} DARWIN_${os}_ARCHS LIB_ARCHS)<br>
>> +      list_intersect(LIB_ARCHS_${libname} DARWIN_${os}_ARCHS LIB_ARCHS)<br>
>>        if(LIB_ARCHS_${libname})<br>
>>          list(APPEND libnames ${libname})<br>
>>          set(extra_cflags_${libname} ${DARWIN_${os}_CFLAGS} ${LIB_CFLAGS})<br>
>><br>
>> Modified: compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake<br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-</a><br>
>> rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake?rev=258916&r1=25<br>
>> 8915&r2=258916&view=diff<br>
>> ==========================================================<br>
>> ====================<br>
>> --- compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake<br>
>> (original)<br>
>> +++ compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake Wed<br>
>> Jan 27 03:28:01 2016<br>
>> @@ -91,7 +91,7 @@ endfunction()<br>
>>  # This function checks the host cpusubtype to see if it is post-haswell.<br>
>> Haswell<br>
>>  # and later machines can run x86_64h binaries. Haswell is cpusubtype 8.<br>
>>  function(darwin_filter_host_archs input output)<br>
>> -  list_union(tmp_var DARWIN_osx_ARCHS ${input})<br>
>> +  list_intersect(tmp_var DARWIN_osx_ARCHS ${input})<br>
>>    execute_process(<br>
>>      COMMAND sysctl hw.cpusubtype<br>
>>      OUTPUT_VARIABLE SUBTYPE)<br>
>> @@ -285,7 +285,7 @@ macro(darwin_add_builtin_libraries)<br>
>>                        ../profile/InstrProfilingPlatformDarwin<br>
>>                        ../profile/InstrProfilingWriter)<br>
>>    foreach (os ${ARGN})<br>
>> -    list_union(DARWIN_BUILTIN_ARCHS DARWIN_${os}_ARCHS<br>
>> BUILTIN_SUPPORTED_ARCH)<br>
>> +    list_intersect(DARWIN_BUILTIN_ARCHS DARWIN_${os}_ARCHS<br>
>> BUILTIN_SUPPORTED_ARCH)<br>
>>      foreach (arch ${DARWIN_BUILTIN_ARCHS})<br>
>>        darwin_find_excluded_builtins_list(${arch}_${os}_EXCLUDED_BUILTINS<br>
>>                                OS ${os}<br>
>><br>
>> Modified: compiler-rt/trunk/cmake/Modules/CompilerRTUtils.cmake<br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-</a><br>
>> rt/trunk/cmake/Modules/CompilerRTUtils.cmake?rev=258916&r1=258915&r<br>
>> 2=258916&view=diff<br>
>> ==========================================================<br>
>> ====================<br>
>> --- compiler-rt/trunk/cmake/Modules/CompilerRTUtils.cmake (original)<br>
>> +++ compiler-rt/trunk/cmake/Modules/CompilerRTUtils.cmake Wed Jan 27<br>
>> 03:28:01 2016<br>
>> @@ -58,7 +58,7 @@ macro(append_have_file_definition filena<br>
>>    list(APPEND ${list} "${varname}=${${varname}}")<br>
>>  endmacro()<br>
>><br>
>> -macro(list_union output input1 input2)<br>
>> +macro(list_intersect output input1 input2)<br>
>>    set(${output})<br>
>>    foreach(it ${${input1}})<br>
>>      list(FIND ${input2} ${it} index)<br>
>><br>
>> Modified: compiler-rt/trunk/cmake/config-ix.cmake<br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/config-" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/config-</a><br>
>> ix.cmake?rev=258916&r1=258915&r2=258916&view=diff<br>
>> ==========================================================<br>
>> ====================<br>
>> --- compiler-rt/trunk/cmake/config-ix.cmake (original)<br>
>> +++ compiler-rt/trunk/cmake/config-ix.cmake Wed Jan 27 03:28:01 2016<br>
>> @@ -488,42 +488,42 @@ if(APPLE)<br>
>>      endforeach()<br>
>>    endif()<br>
>><br>
>> -  # for list_union<br>
>> +  # for list_intersect<br>
>>    include(CompilerRTUtils)<br>
>><br>
>> -  list_union(BUILTIN_SUPPORTED_ARCH ALL_BUILTIN_SUPPORTED_ARCH<br>
>> toolchain_arches)<br>
>> +  list_intersect(BUILTIN_SUPPORTED_ARCH<br>
>> ALL_BUILTIN_SUPPORTED_ARCH toolchain_arches)<br>
>><br>
>> -  list_union(SANITIZER_COMMON_SUPPORTED_ARCH<br>
>> +  list_intersect(SANITIZER_COMMON_SUPPORTED_ARCH<br>
>>      ALL_SANITIZER_COMMON_SUPPORTED_ARCH<br>
>>      COMPILER_RT_SUPPORTED_ARCH<br>
>>      )<br>
>>    set(LSAN_COMMON_SUPPORTED_ARCH<br>
>> ${SANITIZER_COMMON_SUPPORTED_ARCH})<br>
>>    set(UBSAN_COMMON_SUPPORTED_ARCH<br>
>> ${SANITIZER_COMMON_SUPPORTED_ARCH})<br>
>> -  list_union(ASAN_SUPPORTED_ARCH<br>
>> +  list_intersect(ASAN_SUPPORTED_ARCH<br>
>>      ALL_ASAN_SUPPORTED_ARCH<br>
>>      SANITIZER_COMMON_SUPPORTED_ARCH)<br>
>> -  list_union(DFSAN_SUPPORTED_ARCH<br>
>> +  list_intersect(DFSAN_SUPPORTED_ARCH<br>
>>      ALL_DFSAN_SUPPORTED_ARCH<br>
>>      SANITIZER_COMMON_SUPPORTED_ARCH)<br>
>> -  list_union(LSAN_SUPPORTED_ARCH<br>
>> +  list_intersect(LSAN_SUPPORTED_ARCH<br>
>>      ALL_LSAN_SUPPORTED_ARCH<br>
>>      SANITIZER_COMMON_SUPPORTED_ARCH)<br>
>> -  list_union(MSAN_SUPPORTED_ARCH<br>
>> +  list_intersect(MSAN_SUPPORTED_ARCH<br>
>>      ALL_MSAN_SUPPORTED_ARCH<br>
>>      SANITIZER_COMMON_SUPPORTED_ARCH)<br>
>> -  list_union(PROFILE_SUPPORTED_ARCH<br>
>> +  list_intersect(PROFILE_SUPPORTED_ARCH<br>
>>      ALL_PROFILE_SUPPORTED_ARCH<br>
>>      SANITIZER_COMMON_SUPPORTED_ARCH)<br>
>> -  list_union(TSAN_SUPPORTED_ARCH<br>
>> +  list_intersect(TSAN_SUPPORTED_ARCH<br>
>>      ALL_TSAN_SUPPORTED_ARCH<br>
>>      SANITIZER_COMMON_SUPPORTED_ARCH)<br>
>> -  list_union(UBSAN_SUPPORTED_ARCH<br>
>> +  list_intersect(UBSAN_SUPPORTED_ARCH<br>
>>      ALL_UBSAN_SUPPORTED_ARCH<br>
>>      SANITIZER_COMMON_SUPPORTED_ARCH)<br>
>> -  list_union(SAFESTACK_SUPPORTED_ARCH<br>
>> +  list_intersect(SAFESTACK_SUPPORTED_ARCH<br>
>>      ALL_SAFESTACK_SUPPORTED_ARCH<br>
>>      SANITIZER_COMMON_SUPPORTED_ARCH)<br>
>> -  list_union(CFI_SUPPORTED_ARCH<br>
>> +  list_intersect(CFI_SUPPORTED_ARCH<br>
>>      ALL_CFI_SUPPORTED_ARCH<br>
>>      SANITIZER_COMMON_SUPPORTED_ARCH)<br>
>>  else()<br>
>><br>
>><br>
>> _______________________________________________<br>
>> llvm-commits mailing list<br>
>> <a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
>> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature"><div dir="ltr"><div>Alexey Samsonov, Mountain View, CA</div></div></div>
</div>