From 545655d036b7dc272b8ac7b3af14bdb7dd1b5d65 Mon Sep 17 00:00:00 2001
From: Edd Barrett <vext01@gmail.com>
Date: Thu, 4 May 2023 12:14:38 +0100
Subject: [PATCH 1/2] Make ykllvm build with -DBUILD_SHARED_LIBS=ON.

This is so that yk can link LLVM dynamically.

This fixes some linkage mistakes in some yk-specific code, and also in
lldb (fix taken from upstream).
---
 lldb/tools/lldb-instr/CMakeLists.txt       | 2 ++
 llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt | 1 +
 llvm/lib/Transforms/Yk/CMakeLists.txt      | 1 +
 3 files changed, 4 insertions(+)

diff --git a/lldb/tools/lldb-instr/CMakeLists.txt b/lldb/tools/lldb-instr/CMakeLists.txt
index a1bbd7e2b7c93..8da453b2894fd 100644
--- a/lldb/tools/lldb-instr/CMakeLists.txt
+++ b/lldb/tools/lldb-instr/CMakeLists.txt
@@ -11,4 +11,6 @@ add_lldb_tool(lldb-instr
     clangSerialization
     clangTooling
 
+  LINK_COMPONENTS
+    Support
   )
diff --git a/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt b/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt
index 410e120d0e1bd..e918727d554c5 100644
--- a/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt
+++ b/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt
@@ -33,6 +33,7 @@ add_llvm_component_library(LLVMAsmPrinter
   LINK_COMPONENTS
   Analysis
   BinaryFormat
+  BitWriter
   CodeGen
   Core
   DebugInfoCodeView
diff --git a/llvm/lib/Transforms/Yk/CMakeLists.txt b/llvm/lib/Transforms/Yk/CMakeLists.txt
index 075376a7bdd46..c4ac71ea8ddfd 100644
--- a/llvm/lib/Transforms/Yk/CMakeLists.txt
+++ b/llvm/lib/Transforms/Yk/CMakeLists.txt
@@ -10,6 +10,7 @@ add_llvm_component_library(LLVMYkPasses
   intrinsics_gen
 
   LINK_COMPONENTS
+  Analysis
   Core
   Support
 )

From 8f99d66cadcd9e4de48c5b2d6a6af623bb3669ec Mon Sep 17 00:00:00 2001
From: Edd Barrett <vext01@gmail.com>
Date: Thu, 4 May 2023 12:16:47 +0100
Subject: [PATCH 2/2] In CI, build with -DBUILD_SHARED_LIBS=ON.

---
 .buildbot.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.buildbot.sh b/.buildbot.sh
index 756d044d6b1d8..e5d135d30a6c5 100644
--- a/.buildbot.sh
+++ b/.buildbot.sh
@@ -14,6 +14,7 @@ cmake -DCMAKE_INSTALL_PREFIX=${INST_DIR} \
     -DLLVM_ENABLE_ASSERTIONS=On \
     -DLLVM_ENABLE_PROJECTS="lld;clang" \
     -DCLANG_DEFAULT_PIE_ON_LINUX=OFF \
+    -DBUILD_SHARED_LIBS=ON \
     -GNinja \
     ../llvm
 cmake --build .