extra/llvm to 4.0.0-1

2025-01-27 23:44:04 +00:00 · 2017-04-21 00:21:20 +00:00 · 2017-04-21 00:21:20 +00:00 · b1d786bd82
commit b1d786bd82
parent de26409bf9
8 changed files with 446 additions and 292 deletions
--- a/extra/llvm/0001-AMDGPU-Fix-bug-31610.patch
+++ b/extra/llvm/0001-AMDGPU-Fix-bug-31610.patch
@ -0,0 +1,74 @@
+From bc72a21666a9efc78e71b0296313f6e1449649fa Mon Sep 17 00:00:00 2001
+From: Konstantin Zhuravlyov <kzhuravl_dev@outlook.com>
+Date: Wed, 22 Mar 2017 21:48:18 +0000
+Subject: [PATCH] [AMDGPU] Fix bug 31610
+
+Differential Revision: https://reviews.llvm.org/D31258
+
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@298551 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ lib/Target/AMDGPU/AMDGPURuntimeMetadata.h          | 8 ++++----
+ lib/Target/AMDGPU/MCTargetDesc/AMDGPURuntimeMD.cpp | 5 ++---
+ 2 files changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/lib/Target/AMDGPU/AMDGPURuntimeMetadata.h b/lib/Target/AMDGPU/AMDGPURuntimeMetadata.h
+index ed147ff4c43..36e7a0c42a9 100644
+--- a/lib/Target/AMDGPU/AMDGPURuntimeMetadata.h
+++ b/lib/Target/AMDGPU/AMDGPURuntimeMetadata.h
+@@ -40,8 +40,8 @@ namespace AMDGPU {
+ namespace RuntimeMD {
+ 
+   // Version and revision of runtime metadata
+-  const unsigned char MDVersion   = 2;
+-  const unsigned char MDRevision  = 0;
+  const uint32_t MDVersion   = 2;
+  const uint32_t MDRevision  = 0;
+ 
+   // Name of keys for runtime metadata.
+   namespace KeyName {
+@@ -215,7 +215,7 @@ namespace RuntimeMD {
+     struct Metadata {
+       std::string Name;
+       std::string Language;
+-      std::vector<uint8_t> LanguageVersion;
+      std::vector<uint32_t> LanguageVersion;
+       std::vector<uint32_t> ReqdWorkGroupSize;
+       std::vector<uint32_t> WorkGroupSizeHint;
+       std::string VecTypeHint;
+@@ -265,7 +265,7 @@ namespace RuntimeMD {
+   namespace Program {
+     // In-memory representation of program information.
+     struct Metadata {
+-      std::vector<uint8_t> MDVersionSeq;
+      std::vector<uint32_t> MDVersionSeq;
+       std::vector<std::string> PrintfInfo;
+       std::vector<Kernel::Metadata> Kernels;
+ 
+diff --git a/lib/Target/AMDGPU/MCTargetDesc/AMDGPURuntimeMD.cpp b/lib/Target/AMDGPU/MCTargetDesc/AMDGPURuntimeMD.cpp
+index 0e87d750f5d..7c96898297c 100644
+--- a/lib/Target/AMDGPU/MCTargetDesc/AMDGPURuntimeMD.cpp
+++ b/lib/Target/AMDGPU/MCTargetDesc/AMDGPURuntimeMD.cpp
+@@ -49,7 +49,6 @@ static cl::opt<bool>
+ CheckRuntimeMDParser("amdgpu-check-rtmd-parser", cl::Hidden,
+                      cl::desc("Check AMDGPU runtime metadata YAML parser"));
+ 
+-LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(uint8_t)
+ LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(uint32_t)
+ LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(std::string)
+ LLVM_YAML_IS_SEQUENCE_VECTOR(Kernel::Metadata)
+@@ -297,9 +296,9 @@ static Kernel::Metadata getRuntimeMDForKernel(const Function &F) {
+       auto Node = MD->getOperand(0);
+       if (Node->getNumOperands() > 1) {
+         Kernel.Language = "OpenCL C";
+-        uint16_t Major = mdconst::extract<ConstantInt>(Node->getOperand(0))
+        uint32_t Major = mdconst::extract<ConstantInt>(Node->getOperand(0))
+                          ->getZExtValue();
+-        uint16_t Minor = mdconst::extract<ConstantInt>(Node->getOperand(1))
+        uint32_t Minor = mdconst::extract<ConstantInt>(Node->getOperand(1))
+                          ->getZExtValue();
+         Kernel.LanguageVersion.push_back(Major);
+         Kernel.LanguageVersion.push_back(Minor);
+-- 
+2.12.2
+
--- a/extra/llvm/0001-CMake-Fix-pthread-handling-for-out-of-tree-builds.patch
+++ b/extra/llvm/0001-CMake-Fix-pthread-handling-for-out-of-tree-builds.patch
@ -0,0 +1,193 @@
+From a61fc423f3c043314efd4c0cdb1367de2077ac36 Mon Sep 17 00:00:00 2001
+From: Eric Fiselier <eric@efcs.ca>
+Date: Fri, 10 Feb 2017 01:59:20 +0000
+Subject: [PATCH] [CMake] Fix pthread handling for out-of-tree builds
+
+LLVM defines `PTHREAD_LIB` which is used by AddLLVM.cmake and various projects
+to correctly link the threading library when needed. Unfortunately
+`PTHREAD_LIB` is defined by LLVM's `config-ix.cmake` file which isn't installed
+and therefore can't be used when configuring out-of-tree builds. This causes
+such builds to fail since `pthread` isn't being correctly linked.
+
+This patch attempts to fix that problem by renaming and exporting
+`LLVM_PTHREAD_LIB` as part of`LLVMConfig.cmake`. I renamed `PTHREAD_LIB`
+because It seemed likely to cause collisions with downstream users of
+`LLVMConfig.cmake`.
+
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@294690 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ cmake/config-ix.cmake                             | 2 +-
+ cmake/modules/AddLLVM.cmake                       | 6 +++---
+ cmake/modules/LLVMConfig.cmake.in                 | 4 ++++
+ examples/ParallelJIT/CMakeLists.txt               | 2 +-
+ lib/CodeGen/CMakeLists.txt                        | 2 +-
+ lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt | 2 +-
+ lib/Fuzzer/CMakeLists.txt                         | 4 ++--
+ lib/Support/CMakeLists.txt                        | 2 +-
+ unittests/ExecutionEngine/Orc/CMakeLists.txt      | 2 +-
+ unittests/Support/CMakeLists.txt                  | 2 +-
+ utils/unittest/CMakeLists.txt                     | 4 ++--
+ 11 files changed, 18 insertions(+), 14 deletions(-)
+
+diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
+index 50bcc508a80..6bd2b535500 100755
+--- a/cmake/config-ix.cmake
+++ b/cmake/config-ix.cmake
+@@ -115,7 +115,7 @@ if(HAVE_LIBPTHREAD)
+   set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+   set(THREADS_HAVE_PTHREAD_ARG Off)
+   find_package(Threads REQUIRED)
+-  set(PTHREAD_LIB ${CMAKE_THREAD_LIBS_INIT})
+  set(LLVM_PTHREAD_LIB ${CMAKE_THREAD_LIBS_INIT})
+ endif()
+ 
+ # Don't look for these libraries on Windows. Also don't look for them if we're
+diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake
+index b3c7746c480..cb4171c9bc8 100644
+--- a/cmake/modules/AddLLVM.cmake
+++ b/cmake/modules/AddLLVM.cmake
+@@ -718,11 +718,11 @@ macro(add_llvm_executable name)
+   if(NOT ARG_IGNORE_EXTERNALIZE_DEBUGINFO)
+     llvm_externalize_debuginfo(${name})
+   endif()
+-  if (PTHREAD_LIB)
+  if (LLVM_PTHREAD_LIB)
+     # libpthreads overrides some standard library symbols, so main
+     # executable must be linked with it in order to provide consistent
+     # API for all shared libaries loaded by this executable.
+-    target_link_libraries(${name} ${PTHREAD_LIB})
+    target_link_libraries(${name} ${LLVM_PTHREAD_LIB})
+   endif()
+ endmacro(add_llvm_executable name)
+ 
+@@ -1027,7 +1027,7 @@ function(add_unittest test_suite test_name)
+   # libpthreads overrides some standard library symbols, so main
+   # executable must be linked with it in order to provide consistent
+   # API for all shared libaries loaded by this executable.
+-  target_link_libraries(${test_name} gtest_main gtest ${PTHREAD_LIB})
+  target_link_libraries(${test_name} gtest_main gtest ${LLVM_PTHREAD_LIB})
+ 
+   add_dependencies(${test_suite} ${test_name})
+   get_target_property(test_suite_folder ${test_suite} FOLDER)
+diff --git a/cmake/modules/LLVMConfig.cmake.in b/cmake/modules/LLVMConfig.cmake.in
+index 2aea2dcaa54..7a8eb367472 100644
+--- a/cmake/modules/LLVMConfig.cmake.in
+++ b/cmake/modules/LLVMConfig.cmake.in
+@@ -45,6 +45,10 @@ set(LLVM_ENABLE_PIC @LLVM_ENABLE_PIC@)
+ 
+ set(LLVM_BUILD_32_BITS @LLVM_BUILD_32_BITS@)
+ 
+if (NOT "@LLVM_PTHREAD_LIB@" STREQUAL "")
+  set(LLVM_PTHREAD_LIB "@LLVM_PTHREAD_LIB@")
+endif()
+
+ set(LLVM_ENABLE_PLUGINS @LLVM_ENABLE_PLUGINS@)
+ set(LLVM_EXPORT_SYMBOLS_FOR_PLUGINS @LLVM_EXPORT_SYMBOLS_FOR_PLUGINS@)
+ set(LLVM_PLUGIN_EXT @LLVM_PLUGIN_EXT@)
+diff --git a/examples/ParallelJIT/CMakeLists.txt b/examples/ParallelJIT/CMakeLists.txt
+index e85b470f503..deeee072b33 100644
+--- a/examples/ParallelJIT/CMakeLists.txt
+++ b/examples/ParallelJIT/CMakeLists.txt
+@@ -11,4 +11,4 @@ add_llvm_example(ParallelJIT
+   ParallelJIT.cpp
+   )
+ 
+-target_link_libraries(ParallelJIT ${PTHREAD_LIB})
+target_link_libraries(ParallelJIT ${LLVM_PTHREAD_LIB})
+diff --git a/lib/CodeGen/CMakeLists.txt b/lib/CodeGen/CMakeLists.txt
+index a1e5fd46610..a9a3d85f3c2 100644
+--- a/lib/CodeGen/CMakeLists.txt
+++ b/lib/CodeGen/CMakeLists.txt
+@@ -150,7 +150,7 @@ add_llvm_library(LLVMCodeGen
+   ${LLVM_MAIN_INCLUDE_DIR}/llvm/CodeGen
+   ${LLVM_MAIN_INCLUDE_DIR}/llvm/CodeGen/PBQP
+ 
+-  LINK_LIBS ${PTHREAD_LIB}
+  LINK_LIBS ${LLVM_PTHREAD_LIB}
+ 
+   DEPENDS
+   intrinsics_gen
+diff --git a/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt b/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt
+index 3b8c4b973e6..e6c33b2ecc2 100644
+--- a/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt
+++ b/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt
+@@ -4,7 +4,7 @@ if( HAVE_LIBDL )
+     set(LLVM_INTEL_JIT_LIBS ${CMAKE_DL_LIBS})
+ endif()
+ 
+-set(LLVM_INTEL_JIT_LIBS ${PTHREAD_LIB} ${LLVM_INTEL_JIT_LIBS})
+set(LLVM_INTEL_JIT_LIBS ${LLVM_PTHREAD_LIB} ${LLVM_INTEL_JIT_LIBS})
+ 
+ 
+ add_llvm_library(LLVMIntelJITEvents
+diff --git a/lib/Fuzzer/CMakeLists.txt b/lib/Fuzzer/CMakeLists.txt
+index 5ba126e69cc..f490b3681b9 100644
+--- a/lib/Fuzzer/CMakeLists.txt
+++ b/lib/Fuzzer/CMakeLists.txt
+@@ -34,12 +34,12 @@ if( LLVM_USE_SANITIZE_COVERAGE )
+   add_library(LLVMFuzzerNoMain STATIC
+     $<TARGET_OBJECTS:LLVMFuzzerNoMainObjects>
+     )
+-  target_link_libraries(LLVMFuzzerNoMain ${PTHREAD_LIB})
+  target_link_libraries(LLVMFuzzerNoMain ${LLVM_PTHREAD_LIB})
+   add_library(LLVMFuzzer STATIC
+     FuzzerMain.cpp
+     $<TARGET_OBJECTS:LLVMFuzzerNoMainObjects>
+     )
+-  target_link_libraries(LLVMFuzzer ${PTHREAD_LIB})
+  target_link_libraries(LLVMFuzzer ${LLVM_PTHREAD_LIB})
+ 
+   if( LLVM_INCLUDE_TESTS )
+     add_subdirectory(test)
+diff --git a/lib/Support/CMakeLists.txt b/lib/Support/CMakeLists.txt
+index 3301364cf2c..f7cfa760ba0 100644
+--- a/lib/Support/CMakeLists.txt
+++ b/lib/Support/CMakeLists.txt
+@@ -17,7 +17,7 @@ elseif( CMAKE_HOST_UNIX )
+   if( LLVM_ENABLE_THREADS AND HAVE_LIBATOMIC )
+     set(system_libs ${system_libs} atomic)
+   endif()
+-  set(system_libs ${system_libs} ${PTHREAD_LIB})
+  set(system_libs ${system_libs} ${LLVM_PTHREAD_LIB})
+   if ( LLVM_ENABLE_ZLIB AND HAVE_LIBZ )
+     set(system_libs ${system_libs} z)
+   endif()
+diff --git a/unittests/ExecutionEngine/Orc/CMakeLists.txt b/unittests/ExecutionEngine/Orc/CMakeLists.txt
+index 68f6d0c28d7..80c344e040a 100644
+--- a/unittests/ExecutionEngine/Orc/CMakeLists.txt
+++ b/unittests/ExecutionEngine/Orc/CMakeLists.txt
+@@ -21,4 +21,4 @@ add_llvm_unittest(OrcJITTests
+   RPCUtilsTest.cpp
+   )
+ 
+-target_link_libraries(OrcJITTests ${PTHREAD_LIB})
+target_link_libraries(OrcJITTests ${LLVM_PTHREAD_LIB})
+diff --git a/unittests/Support/CMakeLists.txt b/unittests/Support/CMakeLists.txt
+index 4c9bb5eea38..ea260792282 100644
+--- a/unittests/Support/CMakeLists.txt
+++ b/unittests/Support/CMakeLists.txt
+@@ -64,4 +64,4 @@ add_llvm_unittest(SupportTests
+   )
+ 
+ # ManagedStatic.cpp uses <pthread>.
+-target_link_libraries(SupportTests ${PTHREAD_LIB})
+target_link_libraries(SupportTests ${LLVM_PTHREAD_LIB})
+diff --git a/utils/unittest/CMakeLists.txt b/utils/unittest/CMakeLists.txt
+index a50733af9aa..b42ac834e3a 100644
+--- a/utils/unittest/CMakeLists.txt
+++ b/utils/unittest/CMakeLists.txt
+@@ -40,8 +40,8 @@ if (NOT LLVM_ENABLE_THREADS)
+   add_definitions( -DGTEST_HAS_PTHREAD=0 )
+ endif()
+ 
+-find_library(PTHREAD_LIBRARY_PATH pthread)
+-if (PTHREAD_LIBRARY_PATH)
+find_library(LLVM_PTHREAD_LIBRARY_PATH pthread)
+if (LLVM_PTHREAD_LIBRARY_PATH)
+   list(APPEND LIBS pthread)
+ endif()
+ 
+-- 
+2.12.2
+
--- a/extra/llvm/0002-CMake-Fix-pthread-handling-for-out-of-tree-builds.patch
+++ b/extra/llvm/0002-CMake-Fix-pthread-handling-for-out-of-tree-builds.patch
@ -0,0 +1,36 @@
+From f5f712dfcac6ee99381c5aca212950276f1743e8 Mon Sep 17 00:00:00 2001
+From: Eric Fiselier <eric@efcs.ca>
+Date: Fri, 10 Feb 2017 01:59:20 +0000
+Subject: [PATCH] [CMake] Fix pthread handling for out-of-tree builds
+
+LLVM defines `PTHREAD_LIB` which is used by AddLLVM.cmake and various projects
+to correctly link the threading library when needed. Unfortunately
+`PTHREAD_LIB` is defined by LLVM's `config-ix.cmake` file which isn't installed
+and therefore can't be used when configuring out-of-tree builds. This causes
+such builds to fail since `pthread` isn't being correctly linked.
+
+This patch attempts to fix that problem by renaming and exporting
+`LLVM_PTHREAD_LIB` as part of`LLVMConfig.cmake`. I renamed `PTHREAD_LIB`
+because It seemed likely to cause collisions with downstream users of
+`LLVMConfig.cmake`.
+
+
+git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@294690 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ include-fixer/plugin/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include-fixer/plugin/CMakeLists.txt b/include-fixer/plugin/CMakeLists.txt
+index 2799fd4a..df792ea1 100644
+--- a/include-fixer/plugin/CMakeLists.txt
+++ b/include-fixer/plugin/CMakeLists.txt
+@@ -9,5 +9,5 @@ add_clang_library(clangIncludeFixerPlugin
+   clangParse
+   clangSema
+   clangTooling
+-  ${PTHREAD_LIB}
+  ${LLVM_PTHREAD_LIB}
+   )
+-- 
+2.12.2
+
--- a/extra/llvm/0003-CMake-Fix-pthread-handling-for-out-of-tree-builds.patch
+++ b/extra/llvm/0003-CMake-Fix-pthread-handling-for-out-of-tree-builds.patch
@ -0,0 +1,78 @@
+From 548cd5eb4f45de4ec71b3421a98c9462aed75c91 Mon Sep 17 00:00:00 2001
+From: Eric Fiselier <eric@efcs.ca>
+Date: Fri, 10 Feb 2017 01:59:20 +0000
+Subject: [PATCH] [CMake] Fix pthread handling for out-of-tree builds
+
+LLVM defines `PTHREAD_LIB` which is used by AddLLVM.cmake and various projects
+to correctly link the threading library when needed. Unfortunately
+`PTHREAD_LIB` is defined by LLVM's `config-ix.cmake` file which isn't installed
+and therefore can't be used when configuring out-of-tree builds. This causes
+such builds to fail since `pthread` isn't being correctly linked.
+
+This patch attempts to fix that problem by renaming and exporting
+`LLVM_PTHREAD_LIB` as part of`LLVMConfig.cmake`. I renamed `PTHREAD_LIB`
+because It seemed likely to cause collisions with downstream users of
+`LLVMConfig.cmake`.
+
+
+git-svn-id: https://llvm.org/svn/llvm-project/lld/trunk@294690 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ COFF/CMakeLists.txt                   | 2 +-
+ ELF/CMakeLists.txt                    | 2 +-
+ lib/ReaderWriter/MachO/CMakeLists.txt | 2 +-
+ unittests/CoreTests/CMakeLists.txt    | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/COFF/CMakeLists.txt b/COFF/CMakeLists.txt
+index 0eebe9348..8f24e36c0 100644
+--- a/COFF/CMakeLists.txt
+++ b/COFF/CMakeLists.txt
+@@ -43,7 +43,7 @@ add_lld_library(lldCOFF
+ 
+   LINK_LIBS
+   lldCore
+-  ${PTHREAD_LIB}
+  ${LLVM_PTHREAD_LIB}
+ 
+   DEPENDS
+   COFFOptionsTableGen
+diff --git a/ELF/CMakeLists.txt b/ELF/CMakeLists.txt
+index 5652b9351..0d1e5b214 100644
+--- a/ELF/CMakeLists.txt
+++ b/ELF/CMakeLists.txt
+@@ -54,7 +54,7 @@ add_lld_library(lldELF
+   LINK_LIBS
+   lldConfig
+   lldCore
+-  ${PTHREAD_LIB}
+  ${LLVM_PTHREAD_LIB}
+ 
+   DEPENDS
+   ELFOptionsTableGen
+diff --git a/lib/ReaderWriter/MachO/CMakeLists.txt b/lib/ReaderWriter/MachO/CMakeLists.txt
+index 3b0698525..5a96d87f1 100644
+--- a/lib/ReaderWriter/MachO/CMakeLists.txt
+++ b/lib/ReaderWriter/MachO/CMakeLists.txt
+@@ -28,7 +28,7 @@ add_lld_library(lldMachO
+   LINK_LIBS
+     lldCore
+     lldYAML
+-    ${PTHREAD_LIB}
+    ${LLVM_PTHREAD_LIB}
+   )
+ 
+ include_directories(.)
+diff --git a/unittests/CoreTests/CMakeLists.txt b/unittests/CoreTests/CMakeLists.txt
+index 98405d5c7..72e7c443f 100644
+--- a/unittests/CoreTests/CMakeLists.txt
+++ b/unittests/CoreTests/CMakeLists.txt
+@@ -3,5 +3,5 @@ add_lld_unittest(CoreTests
+   )
+ 
+ target_link_libraries(CoreTests
+-  ${PTHREAD_LIB}
+  ${LLVM_PTHREAD_LIB}
+   )
+-- 
+2.12.2
+
--- a/extra/llvm/AMDGPU-Fix-an-interaction-between-WQM-and-polygon-stippling.patch
+++ b/extra/llvm/AMDGPU-Fix-an-interaction-between-WQM-and-polygon-stippling.patch
@ -1,140 +0,0 @@
-From 25e2616626caafb896517e18cd8aa724fba2b200 Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard@amd.com>
-Date: Tue, 29 Nov 2016 03:41:28 +0000
-Subject: [PATCH] Merging r280589:
-
------------------------------------------------------------------------
-r280589 | nhaehnle | 2016-09-03 05:26:32 -0700 (Sat, 03 Sep 2016) | 19 lines
-
-AMDGPU: Fix an interaction between WQM and polygon stippling
-
-Summary:
-This fixes a rare bug in polygon stippling with non-monolithic pixel shaders.
-
-The underlying problem is as follows: the prolog part contains the polygon
-stippling sequence, i.e. a kill. The main part then enables WQM based on the
-_reduced_ exec mask, effectively undoing most of the polygon stippling.
-
-Since we cannot know whether polygon stippling will be used, the main part
-of a non-monolithic shader must always return to exact mode to fix this
-problem.
-
-Reviewers: arsenm, tstellarAMD, mareko
-
-Subscribers: arsenm, llvm-commits, kzhuravl
-
-Differential Revision: https://reviews.llvm.org/D23131
-
------------------------------------------------------------------------
-
-git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_39@288105 91177308-0d34-0410-b5e6-96231b3b80d8
---
- lib/Target/AMDGPU/SIInstructions.td   |  1 +
- lib/Target/AMDGPU/SIWholeQuadMode.cpp |  7 -----
- test/CodeGen/AMDGPU/wqm.ll            | 49 ++++++++++++++++++++++++++++++++---
- 3 files changed, 46 insertions(+), 11 deletions(-)
-
-diff --git a/lib/Target/AMDGPU/SIInstructions.td b/lib/Target/AMDGPU/SIInstructions.td
-index 18b7d5d..dde5f2f 100644
--- a/lib/Target/AMDGPU/SIInstructions.td
-+++ b/lib/Target/AMDGPU/SIInstructions.td
-@@ -2029,6 +2029,7 @@ def SI_RETURN : PseudoInstSI <
-   let hasSideEffects = 1;
-   let SALU = 1;
-   let hasNoSchedulingInfo = 1;
-+  let DisableWQM = 1;
- }
- 
- let Uses = [EXEC], Defs = [EXEC, VCC, M0],
-diff --git a/lib/Target/AMDGPU/SIWholeQuadMode.cpp b/lib/Target/AMDGPU/SIWholeQuadMode.cpp
-index b200c15..1534d58 100644
--- a/lib/Target/AMDGPU/SIWholeQuadMode.cpp
-+++ b/lib/Target/AMDGPU/SIWholeQuadMode.cpp
-@@ -219,13 +219,6 @@ char SIWholeQuadMode::scanInstructions(MachineFunction &MF,
-       markInstruction(MI, Flags, Worklist);
-       GlobalFlags |= Flags;
-     }
-
-    if (WQMOutputs && MBB.succ_empty()) {
-      // This is a prolog shader. Make sure we go back to exact mode at the end.
-      Blocks[&MBB].OutNeeds = StateExact;
-      Worklist.push_back(&MBB);
-      GlobalFlags |= StateExact;
-    }
-   }
- 
-   return GlobalFlags;
-diff --git a/test/CodeGen/AMDGPU/wqm.ll b/test/CodeGen/AMDGPU/wqm.ll
-index 809a7ba..41e4264 100644
--- a/test/CodeGen/AMDGPU/wqm.ll
-+++ b/test/CodeGen/AMDGPU/wqm.ll
-@@ -17,17 +17,18 @@ main_body:
- ;CHECK-LABEL: {{^}}test2:
- ;CHECK-NEXT: ; %main_body
- ;CHECK-NEXT: s_wqm_b64 exec, exec
-;CHECK: image_sample
- ;CHECK-NOT: exec
-;CHECK: _load_dword v0,
-define amdgpu_ps float @test2(<8 x i32> inreg %rsrc, <4 x i32> inreg %sampler, float addrspace(1)* inreg %ptr, <4 x i32> %c) {
-+define amdgpu_ps void @test2(<8 x i32> inreg %rsrc, <4 x i32> inreg %sampler, float addrspace(1)* inreg %ptr, <4 x i32> %c) {
- main_body:
-   %c.1 = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> %c, <8 x i32> %rsrc, <4 x i32> %sampler, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0)
-   %c.2 = bitcast <4 x float> %c.1 to <4 x i32>
-   %c.3 = extractelement <4 x i32> %c.2, i32 0
-   %gep = getelementptr float, float addrspace(1)* %ptr, i32 %c.3
-   %data = load float, float addrspace(1)* %gep
-  ret float %data
-+
-+  call void @llvm.SI.export(i32 15, i32 1, i32 1, i32 0, i32 1, float %data, float undef, float undef, float undef)
-+
-+  ret void
- }
- 
- ; ... but disabled for stores (and, in this simple case, not re-enabled).
-@@ -414,6 +415,46 @@ entry:
-   ret void
- }
- 
-+; Must return to exact at the end of a non-void returning shader,
-+; otherwise the EXEC mask exported by the epilog will be wrong. This is true
-+; even if the shader has no kills, because a kill could have happened in a
-+; previous shader fragment.
-+;
-+; CHECK-LABEL: {{^}}test_nonvoid_return:
-+; CHECK: s_mov_b64 [[LIVE:s\[[0-9]+:[0-9]+\]]], exec
-+; CHECK: s_wqm_b64 exec, exec
-+;
-+; CHECK: s_and_b64 exec, exec, [[LIVE]]
-+; CHECK-NOT: exec
-+define amdgpu_ps <4 x float> @test_nonvoid_return() nounwind {
-+  %tex = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> undef, <8 x i32> undef, <4 x i32> undef, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0)
-+  %tex.i = bitcast <4 x float> %tex to <4 x i32>
-+  %dtex = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> %tex.i, <8 x i32> undef, <4 x i32> undef, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0)
-+  ret <4 x float> %dtex
-+}
-+
-+; CHECK-LABEL: {{^}}test_nonvoid_return_unreachable:
-+; CHECK: s_mov_b64 [[LIVE:s\[[0-9]+:[0-9]+\]]], exec
-+; CHECK: s_wqm_b64 exec, exec
-+;
-+; CHECK: s_and_b64 exec, exec, [[LIVE]]
-+; CHECK-NOT: exec
-+define amdgpu_ps <4 x float> @test_nonvoid_return_unreachable(i32 inreg %c) nounwind {
-+entry:
-+  %tex = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> undef, <8 x i32> undef, <4 x i32> undef, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0)
-+  %tex.i = bitcast <4 x float> %tex to <4 x i32>
-+  %dtex = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> %tex.i, <8 x i32> undef, <4 x i32> undef, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0)
-+
-+  %cc = icmp sgt i32 %c, 0
-+  br i1 %cc, label %if, label %else
-+
-+if:
-+  store volatile <4 x float> %dtex, <4 x float>* undef
-+  unreachable
-+
-+else:
-+  ret <4 x float> %dtex
-+}
- 
- declare void @llvm.amdgcn.image.store.v4i32(<4 x float>, <4 x i32>, <8 x i32>, i32, i1, i1, i1, i1) #1
- declare void @llvm.amdgcn.buffer.store.f32(float, <4 x i32>, i32, i32, i1, i1) #1
--- a/extra/llvm/PKGBUILD
+++ b/extra/llvm/PKGBUILD
@ -15,9 +15,9 @@
 buildarch=28
 highmem=1

-pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'lldb' 'clang' 'clang-tools-extra')
-pkgver=3.9.1
-pkgrel=2
+pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'lld' 'lldb' 'clang' 'clang-tools-extra')
+pkgver=4.0.0
+pkgrel=1
 _ocaml_ver=4.04.0
 arch=('i686' 'x86_64')
 url="http://llvm.org/"
@ -27,48 +27,49 @@ makedepends=('cmake' 'libffi' 'python2' "ocaml=$_ocaml_ver" 'python-sphinx'
 # Use gcc-multilib to build 32-bit compiler-rt libraries on x86_64 (FS#41911)
 makedepends_x86_64=('gcc-multilib')
 options=('staticlibs')
-source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.xz{,.sig}
-        http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.xz{,.sig}
-        http://llvm.org/releases/$pkgver/clang-tools-extra-$pkgver.src.tar.xz{,.sig}
-        http://llvm.org/releases/$pkgver/compiler-rt-$pkgver.src.tar.xz{,.sig}
-        http://llvm.org/releases/$pkgver/lldb-$pkgver.src.tar.xz{,.sig}
-        AMDGPU-Fix-an-interaction-between-WQM-and-polygon-stippling.patch
-        msan-prevent-initialization-failure-with-newer-glibc.patch
-        llvm-Config-llvm-config.h)
-sha256sums=('1fd90354b9cf19232e8f168faf2220e79be555df3aa743242700879e8fd329ee'
+source=(http://releases.llvm.org/$pkgver/llvm-$pkgver.src.tar.xz{,.sig}
+        http://releases.llvm.org/$pkgver/cfe-$pkgver.src.tar.xz{,.sig}
+        http://releases.llvm.org/$pkgver/clang-tools-extra-$pkgver.src.tar.xz{,.sig}
+        http://releases.llvm.org/$pkgver/compiler-rt-$pkgver.src.tar.xz{,.sig}
+        http://releases.llvm.org/$pkgver/lld-$pkgver.src.tar.xz{,.sig}
+        http://releases.llvm.org/$pkgver/lldb-$pkgver.src.tar.xz{,.sig}
+        0001-CMake-Fix-pthread-handling-for-out-of-tree-builds.patch
+        0002-CMake-Fix-pthread-handling-for-out-of-tree-builds.patch
+        0003-CMake-Fix-pthread-handling-for-out-of-tree-builds.patch
+        0001-AMDGPU-Fix-bug-31610.patch
+        llvm-config.h)
+sha256sums=('8d10511df96e73b8ff9e7abbfb4d4d432edbdbe965f1f4f07afaf370b8a533be'
            'SKIP'
-            'e6c4cebb96dee827fa0470af313dff265af391cb6da8d429842ef208c8f25e63'
+            'cea5f88ebddb30e296ca89130c83b9d46c2d833685e2912303c828054c4dc98a'
            'SKIP'
-            '29a5b65bdeff7767782d4427c7c64d54c3a8684bc6b217b74a70e575e4813635'
+            '41b7d37eb128fd362ab3431be5244cf50325bb3bb153895735c5bacede647c99'
            'SKIP'
-            'd30967b1a5fa51a2503474aacc913e69fd05ae862d37bf310088955bdb13ec99'
+            'd3f25b23bef24c305137e6b44f7e81c51bbec764c119e01512a9bd2330be3115'
            'SKIP'
-            '7e3311b2a1f80f4d3426e09f9459d079cab4d698258667e50a46dccbaaa460fc'
+            '33e06457b9ce0563c89b11ccc7ccabf9cff71b83571985a5bf8684c9150e7502'
            'SKIP'
-            'adadc41090ab0eb33fe4449a0ea3f02b15d03f186262dd89576848a2c66d0ce6'
-            '8e4f194c2283b91644a7fff43bc4e58c36b5507f2a4d90b72f275c0bd7511c20'
+            '2dbd8f05c662c1c9f11270fc9d0c63b419ddc988095e0ad107ed911cf882033d'
+            'SKIP'
+            'ead18f586f1ee902b01bebd1f7f9feec07be271fe3229d67808b8016fe99d512'
+            '6d4e7541a70981d8c5162d92bf5604eec3f61536cc1a3ebc9f118dc892ae879b'
+            'a33a0106909b04c2a551a817d7184462e62995abaa01e5940cd3e67d28f141d5'
+            'cddd04be4fd822e03ff16b7640618e424d475d3bf04494c0d38aa225b920f00e'
            '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48')
-validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D'
-              '11E521D646982372EB577A1F8F0871F202119294')
+validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D')

 prepare() {
  cd "$srcdir/llvm-$pkgver.src"

-  # At the present, clang must reside inside the LLVM source code tree to build
-  # See http://llvm.org/bugs/show_bug.cgi?id=4840
  mv "$srcdir/cfe-$pkgver.src" tools/clang
-
  mv "$srcdir/clang-tools-extra-$pkgver.src" tools/clang/tools/extra
-
  mv "$srcdir/compiler-rt-$pkgver.src" projects/compiler-rt
-
+  mv "$srcdir/lld-$pkgver.src" tools/lld
  mv "$srcdir/lldb-$pkgver.src" tools/lldb

-  # https://bugs.freedesktop.org/show_bug.cgi?id=99078
-  patch -Rp1 -i ../AMDGPU-Fix-an-interaction-between-WQM-and-polygon-stippling.patch
-
-  # https://reviews.llvm.org/D24736
-  patch -Np0 -d projects/compiler-rt <../msan-prevent-initialization-failure-with-newer-glibc.patch
+  patch -Np1 -i ../0001-CMake-Fix-pthread-handling-for-out-of-tree-builds.patch
+  patch -Np1 -i ../0001-AMDGPU-Fix-bug-31610.patch
+  patch -Np1 -d tools/clang/tools/extra <../0002-CMake-Fix-pthread-handling-for-out-of-tree-builds.patch
+  patch -Np1 -d tools/lld <../0003-CMake-Fix-pthread-handling-for-out-of-tree-builds.patch

  mkdir build
 }
@ -98,20 +99,19 @@ build() {
  make ocaml_doc

  # Disable automatic installation of components that go into subpackages
-  sed -i '/\(clang\|lldb\)\/cmake_install.cmake/d' tools/cmake_install.cmake
+  sed -i '/\(clang\|lld\|lldb\)\/cmake_install.cmake/d' tools/cmake_install.cmake
  sed -i '/extra\/cmake_install.cmake/d' tools/clang/tools/cmake_install.cmake
  sed -i '/compiler-rt\/cmake_install.cmake/d' projects/cmake_install.cmake
 }

 check() {
  cd "$srcdir/llvm-$pkgver.src/build"
-  make check
-  make check-clang
+  make check-{llvm,clang,clang-tools,lld}
 }

 package_llvm() {
  pkgdesc="Low Level Virtual Machine"
-  depends=("llvm-libs=$pkgver-$pkgrel" 'perl')
+  depends=('llvm-libs' 'perl')

  cd "$srcdir/llvm-$pkgver.src"

@ -121,21 +121,19 @@ package_llvm() {
  rm -r "$pkgdir"/usr/share/doc/$pkgname/html/{_sources,.buildinfo}

  # The runtime libraries go into llvm-libs
-  mv -f "$pkgdir"/usr/lib/lib{LLVM,LTO}*.so "$srcdir"
+  mv -f "$pkgdir"/usr/lib/lib{LLVM,LTO}*.so* "$srcdir"
  mv -f "$pkgdir"/usr/lib/LLVMgold.so "$srcdir"

  # OCaml bindings go to a separate package
  rm -rf "$srcdir"/ocaml.{lib,doc}
  mv "$pkgdir/usr/lib/ocaml" "$srcdir/ocaml.lib"
-  mv "$pkgdir/usr/docs/ocaml/html" "$srcdir/ocaml.doc"
-  rm -r "$pkgdir/usr/docs"
+  mv "$pkgdir/usr/share/doc/$pkgname/ocaml-html" "$srcdir/ocaml.doc"

  if [[ $CARCH == x86_64 ]]; then
    # Needed for multilib (https://bugs.archlinux.org/task/29951)
    # Header stub is taken from Fedora
    mv "$pkgdir/usr/include/llvm/Config/llvm-config"{,-64}.h
-    cp "$srcdir/llvm-Config-llvm-config.h" \
-      "$pkgdir/usr/include/llvm/Config/llvm-config.h"
+    cp "$srcdir/llvm-config.h" "$pkgdir/usr/include/llvm/Config/llvm-config.h"
  fi

  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
@ -147,7 +145,7 @@ package_llvm-libs() {

  install -d "$pkgdir/usr/lib"
  cp -P \
-    "$srcdir"/lib{LLVM,LTO}*.so \
+    "$srcdir"/lib{LLVM,LTO}*.so* \
    "$srcdir"/LLVMgold.so \
    "$pkgdir/usr/lib/"

@ -162,21 +160,36 @@ package_llvm-libs() {

 package_llvm-ocaml() {
  pkgdesc="OCaml bindings for LLVM"
-  depends=("llvm=$pkgver-$pkgrel" "ocaml=$_ocaml_ver" 'ocaml-ctypes')
+  depends=('llvm' "ocaml=$_ocaml_ver" 'ocaml-ctypes')

  cd "$srcdir/llvm-$pkgver.src"

-  install -d "$pkgdir"/{usr/lib,usr/share/doc}
+  install -d "$pkgdir"/{usr/lib,usr/share/doc/$pkgname}
  cp -a "$srcdir/ocaml.lib" "$pkgdir/usr/lib/ocaml"
-  cp -a "$srcdir/ocaml.doc" "$pkgdir/usr/share/doc/$pkgname"
+  cp -a "$srcdir/ocaml.doc" "$pkgdir/usr/share/doc/$pkgname/html"

  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }

+package_lld() {
+  pkgdesc="Linker from the LLVM project"
+  url="http://lld.llvm.org/"
+  depends=('llvm-libs')
+
+  cd "$srcdir/llvm-$pkgver.src"
+
+  make -C build/tools/lld DESTDIR="$pkgdir" install
+
+  # Remove documentation sources
+  rm -r "$pkgdir"/usr/share/doc/$pkgname/html/{_sources,.buildinfo}
+
+  install -Dm644 tools/$pkgname/LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
 package_lldb() {
  pkgdesc="Next generation, high-performance debugger"
  url="http://lldb.llvm.org/"
-  depends=('libxml2' 'python2' 'python2-six')
+  depends=('llvm-libs' 'libxml2' 'python2' 'python2-six')

  cd "$srcdir/llvm-$pkgver.src"

@ -184,7 +197,7 @@ package_lldb() {

  # https://bugs.archlinux.org/task/50759
  sed -i "/import_module('_lldb')/s/_lldb/lldb.&/" \
-  "$pkgdir/usr/lib/python2.7/site-packages/lldb/__init__.py"
+    "$pkgdir/usr/lib/python2.7/site-packages/lldb/__init__.py"

  # Remove bundled six library
  rm "$pkgdir/usr/lib/python2.7/site-packages/six.py"
@ -193,13 +206,13 @@ package_lldb() {
  python2 -m compileall "$pkgdir/usr/lib/python2.7/site-packages/lldb"
  python2 -O -m compileall "$pkgdir/usr/lib/python2.7/site-packages/lldb"

-  install -Dm644 tools/lldb/LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 tools/$pkgname/LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }

 package_clang() {
  pkgdesc="C language family frontend for LLVM"
  url="http://clang.llvm.org/"
-  depends=("llvm-libs=$pkgver-$pkgrel" 'gcc' 'libxml2')
+  depends=('llvm-libs' 'gcc' 'libxml2')
  optdepends=('openmp: OpenMP support in clang with -fopenmp'
              'python2: for scan-view and git-clang-format')
  provides=("clang-analyzer=$pkgver")
@ -233,19 +246,22 @@ package_clang() {
  python2 -m compileall "$pkgdir"
  python2 -O -m compileall "$pkgdir"

-  install -Dm644 tools/clang/LICENSE.TXT \
+  install -Dm644 tools/$pkgname/LICENSE.TXT \
    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }

 package_clang-tools-extra() {
  pkgdesc="Extra tools built using clang's tooling APIs"
  url="http://clang.llvm.org/"
-  depends=("clang=$pkgver-$pkgrel")
+  depends=('clang')

  cd "$srcdir/llvm-$pkgver.src"

  make -C build/tools/clang/tools/extra DESTDIR="$pkgdir" install

+  # Remove documentation sources
+  rm -r "$pkgdir"/usr/share/doc/clang-tools/html/{_sources,.buildinfo}
+
  # Use Python 2
  sed -i 's|/usr/bin/env python|&2|' \
    "$pkgdir"/usr/share/clang/{clang-tidy-diff,run-clang-tidy,run-find-all-symbols}.py
--- a/extra/llvm/llvm-Config-llvm-config.h
+++ b/extra/llvm/llvm-Config-llvm-config.h
--- a/extra/llvm/msan-prevent-initialization-failure-with-newer-glibc.patch
+++ b/extra/llvm/msan-prevent-initialization-failure-with-newer-glibc.patch
@ -1,103 +0,0 @@
-Index: lib/msan/msan_interceptors.cc
-===================================================================
--- lib/msan/msan_interceptors.cc	(revision 282231)
-+++ lib/msan/msan_interceptors.cc	(revision 282232)
-@@ -64,6 +64,23 @@
-   return in_interceptor_scope;
- }
- 
-+static uptr allocated_for_dlsym;
-+static const uptr kDlsymAllocPoolSize = 1024;
-+static uptr alloc_memory_for_dlsym[kDlsymAllocPoolSize];
-+
-+static bool IsInDlsymAllocPool(const void *ptr) {
-+  uptr off = (uptr)ptr - (uptr)alloc_memory_for_dlsym;
-+  return off < sizeof(alloc_memory_for_dlsym);
-+}
-+
-+static void *AllocateFromLocalPool(uptr size_in_bytes) {
-+  uptr size_in_words = RoundUpTo(size_in_bytes, kWordSize) / kWordSize;
-+  void *mem = (void *)&alloc_memory_for_dlsym[allocated_for_dlsym];
-+  allocated_for_dlsym += size_in_words;
-+  CHECK_LT(allocated_for_dlsym, kDlsymAllocPoolSize);
-+  return mem;
-+}
-+
- #define ENSURE_MSAN_INITED() do { \
-   CHECK(!msan_init_is_running); \
-   if (!msan_inited) { \
-@@ -227,7 +244,7 @@
- 
- INTERCEPTOR(void, free, void *ptr) {
-   GET_MALLOC_STACK_TRACE;
-  if (!ptr) return;
-+  if (!ptr || UNLIKELY(IsInDlsymAllocPool(ptr))) return;
-   MsanDeallocate(&stack, ptr);
- }
- 
-@@ -234,7 +251,7 @@
- #if !SANITIZER_FREEBSD
- INTERCEPTOR(void, cfree, void *ptr) {
-   GET_MALLOC_STACK_TRACE;
-  if (!ptr) return;
-+  if (!ptr || UNLIKELY(IsInDlsymAllocPool(ptr))) return;
-   MsanDeallocate(&stack, ptr);
- }
- #define MSAN_MAYBE_INTERCEPT_CFREE INTERCEPT_FUNCTION(cfree)
-@@ -907,27 +924,29 @@
- 
- INTERCEPTOR(void *, calloc, SIZE_T nmemb, SIZE_T size) {
-   GET_MALLOC_STACK_TRACE;
-  if (UNLIKELY(!msan_inited)) {
-+  if (UNLIKELY(!msan_inited))
-     // Hack: dlsym calls calloc before REAL(calloc) is retrieved from dlsym.
-    const SIZE_T kCallocPoolSize = 1024;
-    static uptr calloc_memory_for_dlsym[kCallocPoolSize];
-    static SIZE_T allocated;
-    SIZE_T size_in_words = ((nmemb * size) + kWordSize - 1) / kWordSize;
-    void *mem = (void*)&calloc_memory_for_dlsym[allocated];
-    allocated += size_in_words;
-    CHECK(allocated < kCallocPoolSize);
-    return mem;
-  }
-+    return AllocateFromLocalPool(nmemb * size);
-   return MsanCalloc(&stack, nmemb, size);
- }
- 
- INTERCEPTOR(void *, realloc, void *ptr, SIZE_T size) {
-   GET_MALLOC_STACK_TRACE;
-+  if (UNLIKELY(IsInDlsymAllocPool(ptr))) {
-+    uptr offset = (uptr)ptr - (uptr)alloc_memory_for_dlsym;
-+    uptr copy_size = Min(size, kDlsymAllocPoolSize - offset);
-+    void *new_ptr = AllocateFromLocalPool(size);
-+    internal_memcpy(new_ptr, ptr, copy_size);
-+    return new_ptr;
-+  }
-   return MsanReallocate(&stack, ptr, size, sizeof(u64), false);
- }
- 
- INTERCEPTOR(void *, malloc, SIZE_T size) {
-   GET_MALLOC_STACK_TRACE;
-+  if (UNLIKELY(!msan_inited))
-+    // Hack: dlsym calls malloc before REAL(malloc) is retrieved from dlsym.
-+    return AllocateFromLocalPool(size);
-   return MsanReallocate(&stack, nullptr, size, sizeof(u64), false);
- }
- 
-Index: lib/asan/asan_malloc_linux.cc
-===================================================================
--- lib/asan/asan_malloc_linux.cc	(revision 282231)
-+++ lib/asan/asan_malloc_linux.cc	(revision 282232)
-@@ -78,7 +78,11 @@
-   if (UNLIKELY(IsInDlsymAllocPool(ptr))) {
-     uptr offset = (uptr)ptr - (uptr)alloc_memory_for_dlsym;
-     uptr copy_size = Min(size, kDlsymAllocPoolSize - offset);
-    void *new_ptr = asan_malloc(size, &stack);
-+    void *new_ptr;
-+    if (UNLIKELY(!asan_inited))
-+      new_ptr = AllocateFromLocalPool(size);
-+    else
-+      new_ptr = asan_malloc(size, &stack);
-     internal_memcpy(new_ptr, ptr, copy_size);
-     return new_ptr;
-   }