compiler-rt-netbsd: Rebase to SVN r. 340168

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Aug 21 23:29:10 2018 +0200
Changeset:	0a659bc7d058447b873224490e2d204ee311dad8

Modified Files:
	compiler-rt-netbsd/Makefile
	compiler-rt-netbsd/distinfo
	compiler-rt-netbsd/patches/patch-CMakeLists.txt
	compiler-rt-netbsd/patches/patch-cmake_Modules_CompilerRTUtils.cmake
	compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake

Log Message:
compiler-rt-netbsd: Rebase to SVN r. 340168

Partially abandon local patches for builtins.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0a659bc7d058447b873224490e2d204ee311dad8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 compiler-rt-netbsd/Makefile                        |  2 +-
 compiler-rt-netbsd/distinfo                        |  6 +++---
 compiler-rt-netbsd/patches/patch-CMakeLists.txt    | 17 +++--------------
 .../patch-cmake_Modules_CompilerRTUtils.cmake      | 16 ----------------
 .../patches/patch-cmake_config-ix.cmake            | 22 +++++-----------------
 5 files changed, 12 insertions(+), 51 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index b529c3cddb..fe7a6c4b9b 100644
--- a/compiler-rt-netbsd/Makefile
+++ b/compiler-rt-netbsd/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	lang devel
 
 SVN_REPOSITORIES=		compiler-rt
 SVN_REPO.compiler-rt=		http://llvm.org/svn/llvm-project/compiler-rt/trunk
-SVN_REVISION.compiler-rt=	334704
+SVN_REVISION.compiler-rt=	340168
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://compiler-rt.llvm.org/
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index bdac77f2ce..95d0f44480 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -1,9 +1,9 @@
 $NetBSD: distinfo,v 1.35 2015/09/11 01:21:57 tnn Exp $
 
-SHA1 (patch-CMakeLists.txt) = 0fdcf55dbe69cabd031528735420215fa7c671e7
-SHA1 (patch-cmake_Modules_CompilerRTUtils.cmake) = 4867cf598d1b080c7077aaf021cf64effe0c1e54
+SHA1 (patch-CMakeLists.txt) = d266456097955589919b5163f6fe5f1cfd95eecd
+SHA1 (patch-cmake_Modules_CompilerRTUtils.cmake) = da39a3ee5e6b4b0d3255bfef95601890afd80709
 SHA1 (patch-cmake_Modules_HandleCompilerRT.cmake) = 2456af23f62cc919aba7358b8af25ef86cc64dc1
-SHA1 (patch-cmake_config-ix.cmake) = 3962a19ae0c07c194e8dbc56ebfc4b2c5e5ff41b
+SHA1 (patch-cmake_config-ix.cmake) = fc637abe72ed27d5baba1308087bb0372f8fbbe2
 SHA1 (patch-lib_asan_asan__posix.cc) = 0f596061c078eaab0b5b4b183550aa7820677f46
 SHA1 (patch-lib_fuzzer_FuzzerLoop.cpp) = 01456bfacb94c06e008eefc660781d3c7bb1c2e7
 SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = e2e0e397eaf148df329f2c25ca9185f57989d082
diff --git a/compiler-rt-netbsd/patches/patch-CMakeLists.txt b/compiler-rt-netbsd/patches/patch-CMakeLists.txt
index af64e77e12..563646bbc2 100644
--- a/compiler-rt-netbsd/patches/patch-CMakeLists.txt
+++ b/compiler-rt-netbsd/patches/patch-CMakeLists.txt
@@ -1,19 +1,8 @@
 $NetBSD$
 
---- CMakeLists.txt.orig	2018-06-01 09:39:33.000000000 +0000
+--- CMakeLists.txt.orig	2018-08-21 21:25:22.900816085 +0000
 +++ CMakeLists.txt
-@@ -313,9 +313,7 @@ append_list_if(COMPILER_RT_HAS_WD4800_FL
- # Set common link flags.
- append_list_if(COMPILER_RT_HAS_NODEFAULTLIBS_FLAG -nodefaultlibs SANITIZER_COMMON_LINK_FLAGS)
- 
--if (COMPILER_RT_RUNTIME_LIBRARY STREQUAL "builtins")
--  list(APPEND SANITIZER_COMMON_LINK_LIBS ${COMPILER_RT_BUILTINS_LIBRARY})
--else()
-+if (NOT COMPILER_RT_RUNTIME_LIBRARY STREQUAL "builtins")
-   if (ANDROID)
-     append_list_if(COMPILER_RT_HAS_GCC_LIB gcc SANITIZER_COMMON_LINK_LIBS)
-   else()
-@@ -330,6 +328,10 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuch
+@@ -338,6 +338,10 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuch
    list(APPEND SANITIZER_COMMON_LINK_LIBS zircon)
  endif()
  
@@ -24,7 +13,7 @@ $NetBSD$
  if (SANITIZER_CXX_ABI_LIBNAME STREQUAL "libc++")
    if (SANITIZER_CXX_ABI_INTREE)
      if (NOT LIBCXXABI_ENABLE_STATIC_UNWINDER AND (TARGET unwind_shared OR HAVE_LIBUNWIND))
-@@ -370,7 +372,7 @@ foreach(path IN ITEMS ${LLVM_MAIN_SRC_DI
+@@ -380,7 +384,7 @@ foreach(path IN ITEMS ${LLVM_MAIN_SRC_DI
                        ${LLVM_MAIN_SRC_DIR}/../libcxx
                        ${LLVM_EXTERNAL_LIBCXX_SOURCE_DIR})
    if(IS_DIRECTORY ${path})
diff --git a/compiler-rt-netbsd/patches/patch-cmake_Modules_CompilerRTUtils.cmake b/compiler-rt-netbsd/patches/patch-cmake_Modules_CompilerRTUtils.cmake
index 21f76bdbe9..e69de29bb2 100644
--- a/compiler-rt-netbsd/patches/patch-cmake_Modules_CompilerRTUtils.cmake
+++ b/compiler-rt-netbsd/patches/patch-cmake_Modules_CompilerRTUtils.cmake
@@ -1,16 +0,0 @@
-$NetBSD$
-
---- cmake/Modules/CompilerRTUtils.cmake.orig	2018-06-01 09:39:33.000000000 +0000
-+++ cmake/Modules/CompilerRTUtils.cmake
-@@ -140,6 +140,11 @@ macro(test_target_arch arch def)
- 
-   set(TARGET_${arch}_CFLAGS ${ARGN})
-   set(TARGET_${arch}_LINK_FLAGS ${ARGN})
-+  if (COMPILER_RT_RUNTIME_LIBRARY STREQUAL "builtins")
-+    include(HandleCompilerRT)
-+    find_compiler_rt_library(builtins COMPILER_RT_BUILTINS_LIBRARY_${arch} ${ARGN})
-+    list(APPEND TARGET_${arch}_LINK_FLAGS ${COMPILER_RT_BUILTINS_LIBRARY_${arch}})
-+  endif()
-   set(argstring "")
-   foreach(arg ${ARGN})
-     set(argstring "${argstring} ${arg}")
diff --git a/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake b/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
index daa69ce5ae..da17ce30e0 100644
--- a/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
+++ b/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
@@ -1,29 +1,17 @@
 $NetBSD$
 
---- cmake/config-ix.cmake.orig	2018-06-01 09:39:33.000000000 +0000
+--- cmake/config-ix.cmake.orig	2018-08-21 21:25:36.351211184 +0000
 +++ cmake/config-ix.cmake
-@@ -13,10 +13,7 @@ function(check_linker_flag flag out_var)
- endfunction()
- 
- check_library_exists(c fopen "" COMPILER_RT_HAS_LIBC)
--if (COMPILER_RT_RUNTIME_LIBRARY STREQUAL "builtins")
--  include(HandleCompilerRT)
--  find_compiler_rt_library(builtins COMPILER_RT_BUILTINS_LIBRARY)
--else()
-+if (NOT COMPILER_RT_RUNTIME_LIBRARY STREQUAL "builtins")
-   if (ANDROID)
-     check_library_exists(gcc __gcc_personality_v0 "" COMPILER_RT_HAS_GCC_LIB)
-   else()
-@@ -547,7 +544,7 @@ else()
+@@ -557,7 +557,7 @@ else()
  endif()
  
  if (PROFILE_SUPPORTED_ARCH AND NOT LLVM_USE_SANITIZER AND
--    OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows|Android|SunOS")
-+    OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows|Android|SunOS|NetBSD")
+-    OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows|Android|Fuchsia|SunOS")
++    OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows|Android|Fuchsia|SunOS|NetBSD")
    set(COMPILER_RT_HAS_PROFILE TRUE)
  else()
    set(COMPILER_RT_HAS_PROFILE FALSE)
-@@ -595,7 +592,7 @@ else()
+@@ -605,7 +605,7 @@ else()
  endif()
  
  if (COMPILER_RT_HAS_SANITIZER_COMMON AND SCUDO_SUPPORTED_ARCH AND