From 8446a3f8d49f70d17e38cefd9990a9e79bf3e78a Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@mozilla.com>
Date: Tue, 4 Aug 2020 16:07:08 -0700
Subject: [PATCH] Remove support for clang/llvm 8.0 (#151)

* Remove --no-threads from wasi-sdk.cmake.

It was added to work around this bug:

https://bugs.llvm.org/show_bug.cgi?id=41508

which was fixed in LLVM 9.0.

* Remove LLVM 8.0 workarounds.
---
 Makefile       | 4 ++--
 wasi-sdk.cmake | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 832af13..89c3b40 100644
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,7 @@ build/llvm.BUILT:
 		install-llvm-ranlib \
 		install-llvm-strip \
 		install-llvm-dwarfdump \
-		$(if $(patsubst 8.%,,$(CLANG_VERSION)),install-clang-resource-headers,install-clang-headers) \
+		install-clang-resource-headers \
 		install-ar \
 		install-ranlib \
 		install-strip \
@@ -166,7 +166,7 @@ LIBCXXABI_CMAKE_FLAGS = \
     -DLIBCXXABI_HAS_EXTERNAL_THREAD_API:BOOL=OFF \
     -DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF \
     -DLIBCXXABI_HAS_WIN32_THREAD_API:BOOL=OFF \
-    $(if $(patsubst 8.%,,$(CLANG_VERSION)),-DLIBCXXABI_ENABLE_PIC:BOOL=OFF,) \
+    -DLIBCXXABI_ENABLE_PIC:BOOL=OFF \
     -DCXX_SUPPORTS_CXX11=ON \
     -DLLVM_COMPILER_CHECKED=ON \
     -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
diff --git a/wasi-sdk.cmake b/wasi-sdk.cmake
index e8d41ee..18c9901 100644
--- a/wasi-sdk.cmake
+++ b/wasi-sdk.cmake
@@ -22,7 +22,6 @@ set(CMAKE_C_COMPILER_TARGET ${triple} CACHE STRING "wasi-sdk build")
 set(CMAKE_CXX_COMPILER_TARGET ${triple} CACHE STRING "wasi-sdk build")
 set(CMAKE_C_FLAGS "-v" CACHE STRING "wasi-sdk build")
 set(CMAKE_CXX_FLAGS "-v -std=c++11" CACHE STRING "wasi-sdk build")
-set(CMAKE_EXE_LINKER_FLAGS "-Wl,--no-threads" CACHE STRING "wasi-sdk build")
 
 set(CMAKE_SYSROOT ${WASI_SDK_PREFIX}/share/wasi-sysroot CACHE STRING "wasi-sdk build")
 set(CMAKE_STAGING_PREFIX ${WASI_SDK_PREFIX}/share/wasi-sysroot CACHE STRING "wasi-sdk build")