resurrect and copy the previous clang patch-ac to here

jperkin Mon Mar  7 16:27:47 UTC 2016
Do not use "-z discard-unused" linker flags on SunOS, it is only supported
by the very latest Oracle Solaris release.

4 files changed, 41 insertions, 7 deletions

diff --git a/lang/libLLVM/distinfo b/lang/libLLVM/distinfo
index be9ce8890da..b520c7499fb 100644
--- a/lang/libLLVM/distinfo
+++ b/lang/libLLVM/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.1 2016/03/08 21:06:50 tnn Exp $
+$NetBSD: distinfo,v 1.2 2016/03/11 06:50:42 tnn Exp $
 
 SHA1 (llvm-3.8.0.src.tar.xz) = 723ac918979255706434a05f5af34b71c49c9971
 RMD160 (llvm-3.8.0.src.tar.xz) = 3c657d061bc8e9de017b0cf1f1a7e63f215b0295
 SHA512 (llvm-3.8.0.src.tar.xz) = 2c76e79d803768ed20af6ca1801cf2518071bf9835c54580ea3eb6219a66cdcf8b4c575f192c15082cc18d2468b7611dacb57950b605813a2317125c2d33c138
 Size (llvm-3.8.0.src.tar.xz) = 16580932 bytes
 SHA1 (patch-CMakeLists.txt) = 770e0bc00a987430b6c6be7e4141f33e5be54a8f
-SHA1 (patch-cmake_modules_AddLLVM.cmake) = 66e1bddb986b23a87fa413e26119d676e396e658
+SHA1 (patch-cmake_modules_AddLLVM.cmake) = 88a8d4c8703c69c6e3503ca088bf61349d835c75
 SHA1 (patch-cmake_modules_CMakeLists.txt) = 8297c4b9ddd3ac05a06d8a4a8040be46b5b8b39f
 SHA1 (patch-cmake_modules_TableGen.cmake) = 53be811936dd5157e6eb08db8cd51a7265bc8c7f
 SHA1 (patch-include_llvm_Support_Host.h) = 55a9fab6ee49ec09a2fd644747a6dddd6b39f942
diff --git a/lang/libLLVM/patches/patch-cmake_modules_AddLLVM.cmake b/lang/libLLVM/patches/patch-cmake_modules_AddLLVM.cmake
index 2673f6d45bb..873c5dd0b5e 100644
--- a/lang/libLLVM/patches/patch-cmake_modules_AddLLVM.cmake
+++ b/lang/libLLVM/patches/patch-cmake_modules_AddLLVM.cmake
@@ -1,11 +1,25 @@
-$NetBSD: patch-cmake_modules_AddLLVM.cmake,v 1.1 2016/03/08 21:06:50 tnn Exp $
+$NetBSD: patch-cmake_modules_AddLLVM.cmake,v 1.2 2016/03/11 06:50:42 tnn Exp $
 
 Disable library install rules. Handled manually.
 Make sure llvm-config goes in libexec/libLLVM to avoid conflict.
+Don't use non-portable -z discard-unused on SunOS.
 
---- cmake/modules/AddLLVM.cmake.orig	2016-01-12 07:44:58.000000000 +0000
+--- cmake/modules/AddLLVM.cmake.orig	2016-02-12 17:52:29.000000000 +0000
 +++ cmake/modules/AddLLVM.cmake
-@@ -555,10 +555,12 @@ macro(add_llvm_library name)
+@@ -174,9 +174,9 @@ function(add_link_opts target_name)
+         # ld64's implementation of -dead_strip breaks tools that use plugins.
+         set_property(TARGET ${target_name} APPEND_STRING PROPERTY
+                      LINK_FLAGS " -Wl,-dead_strip")
+-      elseif(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+-        set_property(TARGET ${target_name} APPEND_STRING PROPERTY
+-                     LINK_FLAGS " -Wl,-z -Wl,discard-unused=sections")
++#      elseif(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
++#        set_property(TARGET ${target_name} APPEND_STRING PROPERTY
++#                     LINK_FLAGS " -Wl,-z -Wl,discard-unused=sections")
+       elseif(NOT WIN32 AND NOT LLVM_LINKER_IS_GOLD)
+         # Object files are compiled with -ffunction-data-sections.
+         # Versions of bfd ld < 2.23.1 have a bug in --gc-sections that breaks
+@@ -558,10 +558,12 @@ macro(add_llvm_library name)
          set(install_type ARCHIVE)
        endif()
  
@@ -18,7 +32,7 @@ Make sure llvm-config goes in libexec/libLLVM to avoid conflict.
  
        if (NOT CMAKE_CONFIGURATION_TYPES)
          add_custom_target(install-${name}
-@@ -699,7 +701,7 @@ macro(add_llvm_tool name)
+@@ -702,7 +704,7 @@ macro(add_llvm_tool name)
      if( LLVM_BUILD_TOOLS )
        install(TARGETS ${name}
                EXPORT LLVMExports
diff --git a/lang/llvm/distinfo b/lang/llvm/distinfo
index 6a5c833564d..ff9fea5b625 100644
--- a/lang/llvm/distinfo
+++ b/lang/llvm/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1 2016/03/10 15:01:52 tnn Exp $
+$NetBSD: distinfo,v 1.2 2016/03/11 06:50:42 tnn Exp $
 
 SHA1 (llvm-3.8.0.src.tar.xz) = 723ac918979255706434a05f5af34b71c49c9971
 RMD160 (llvm-3.8.0.src.tar.xz) = 3c657d061bc8e9de017b0cf1f1a7e63f215b0295
 SHA512 (llvm-3.8.0.src.tar.xz) = 2c76e79d803768ed20af6ca1801cf2518071bf9835c54580ea3eb6219a66cdcf8b4c575f192c15082cc18d2468b7611dacb57950b605813a2317125c2d33c138
 Size (llvm-3.8.0.src.tar.xz) = 16580932 bytes
+SHA1 (patch-cmake_modules_AddLLVM.cmake) = ec89e9469115b22feeb106e1c36b36af1f079576
 SHA1 (patch-include_llvm_Support_Host.h) = 55a9fab6ee49ec09a2fd644747a6dddd6b39f942
diff --git a/lang/llvm/patches/patch-cmake_modules_AddLLVM.cmake b/lang/llvm/patches/patch-cmake_modules_AddLLVM.cmake
new file mode 100644
index 00000000000..8784c9f5461
--- /dev/null
+++ b/lang/llvm/patches/patch-cmake_modules_AddLLVM.cmake
@@ -0,0 +1,19 @@
+$NetBSD: patch-cmake_modules_AddLLVM.cmake,v 1.1 2016/03/11 06:50:42 tnn Exp $
+
+Don't use non-portable -z discard-unused on SunOS.
+
+--- cmake/modules/AddLLVM.cmake.orig	2016-02-12 17:52:29.000000000 +0000
++++ cmake/modules/AddLLVM.cmake
+@@ -174,9 +174,9 @@ function(add_link_opts target_name)
+         # ld64's implementation of -dead_strip breaks tools that use plugins.
+         set_property(TARGET ${target_name} APPEND_STRING PROPERTY
+                      LINK_FLAGS " -Wl,-dead_strip")
+-      elseif(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+-        set_property(TARGET ${target_name} APPEND_STRING PROPERTY
+-                     LINK_FLAGS " -Wl,-z -Wl,discard-unused=sections")
++#      elseif(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
++#        set_property(TARGET ${target_name} APPEND_STRING PROPERTY
++#                     LINK_FLAGS " -Wl,-z -Wl,discard-unused=sections")
+       elseif(NOT WIN32 AND NOT LLVM_LINKER_IS_GOLD)
+         # Object files are compiled with -ffunction-data-sections.
+         # Versions of bfd ld < 2.23.1 have a bug in --gc-sections that breaks