From 3ca61941c121ef6bf87f42f8418da614dd9f7ed5 Mon Sep 17 00:00:00 2001
From: serge-sans-paille <sguelton@redhat.com>
Date: Thu, 22 Sep 2022 10:41:21 +0200
Subject: [PATCH] Revert "[bolt] Fix (part of) dylib compatibility"

This reverts commit 34ad83d883cc4505412a7c3e1e3da74e5408aa82.
---
 bolt/lib/Target/AArch64/CMakeLists.txt     | 3 +--
 bolt/lib/Target/X86/CMakeLists.txt         | 4 ++--
 bolt/tools/llvm-bolt-fuzzer/CMakeLists.txt | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bolt/lib/Target/AArch64/CMakeLists.txt b/bolt/lib/Target/AArch64/CMakeLists.txt
index 29753969e85e..96c70168196e 100644
--- a/bolt/lib/Target/AArch64/CMakeLists.txt
+++ b/bolt/lib/Target/AArch64/CMakeLists.txt
@@ -1,4 +1,5 @@
 set(LLVM_LINK_COMPONENTS
+  BOLTCore
   MC
   Support
   AArch64Desc
@@ -11,8 +12,6 @@ add_llvm_library(LLVMBOLTTargetAArch64
   AArch64CommonTableGen
   )
 
-target_link_libraries(LLVMBOLTTargetAArch64 PRIVATE LLVMBOLTCore)
-
 include_directories(
   ${LLVM_MAIN_SRC_DIR}/lib/Target/AArch64
   ${LLVM_BINARY_DIR}/lib/Target/AArch64
diff --git a/bolt/lib/Target/X86/CMakeLists.txt b/bolt/lib/Target/X86/CMakeLists.txt
index 7be9f80006c6..47344fe33111 100644
--- a/bolt/lib/Target/X86/CMakeLists.txt
+++ b/bolt/lib/Target/X86/CMakeLists.txt
@@ -1,4 +1,6 @@
 set(LLVM_LINK_COMPONENTS
+  BOLTCore
+  BOLTUtils
   MC
   MCDisassembler
   Support
@@ -13,8 +15,6 @@ add_llvm_library(LLVMBOLTTargetX86
   X86CommonTableGen
   )
 
-target_link_libraries(LLVMBOLTTargetX86 PRIVATE LLVMBOLTCore LLVMBOLTUtils)
-
 include_directories(
   ${LLVM_MAIN_SRC_DIR}/lib/Target/X86
   ${LLVM_BINARY_DIR}/lib/Target/X86
diff --git a/bolt/tools/llvm-bolt-fuzzer/CMakeLists.txt b/bolt/tools/llvm-bolt-fuzzer/CMakeLists.txt
index 6fa9f25a4253..14031ca41925 100644
--- a/bolt/tools/llvm-bolt-fuzzer/CMakeLists.txt
+++ b/bolt/tools/llvm-bolt-fuzzer/CMakeLists.txt
@@ -1,4 +1,5 @@
 set(LLVM_LINK_COMPONENTS
+  BOLTRewrite
   ${LLVM_TARGETS_TO_BUILD}
   )