From be89f7fc665bf1a7bee8500dd6245d2b86d7de10 Mon Sep 17 00:00:00 2001
From: Adrian Prantl <aprantl@apple.com>
Date: Wed, 16 Jun 2021 14:26:02 -0700
Subject: [PATCH] Move the definition of LLVM_SUPPORT_XCODE_SIGNPOSTS into
 llvm-config.h

since it is now used by a public header file (Signposts.h).
This fixes the standalone LLDB build.
---
 include/llvm/Config/config.h.cmake      | 3 ---
 include/llvm/Config/llvm-config.h.cmake | 4 ++++
 include/llvm/Support/Signposts.h        | 2 +-
 lib/Support/Signposts.cpp               | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/include/llvm/Config/config.h.cmake b/include/llvm/Config/config.h.cmake
index c7db4a21cb1..8d58ec9d665 100644
--- a/include/llvm/Config/config.h.cmake
+++ b/include/llvm/Config/config.h.cmake
@@ -350,9 +350,6 @@
 /* Define to the default GlobalISel coverage file prefix */
 #cmakedefine LLVM_GISEL_COV_PREFIX "${LLVM_GISEL_COV_PREFIX}"
 
-/* Whether Timers signpost passes in Xcode Instruments */
-#cmakedefine01 LLVM_SUPPORT_XCODE_SIGNPOSTS
-
 #cmakedefine HAVE_PROC_PID_RUSAGE 1
 
 #endif
diff --git a/include/llvm/Config/llvm-config.h.cmake b/include/llvm/Config/llvm-config.h.cmake
index 9916635489e..4e7e2e9e39d 100644
--- a/include/llvm/Config/llvm-config.h.cmake
+++ b/include/llvm/Config/llvm-config.h.cmake
@@ -97,4 +97,8 @@
 /* Define if the xar_open() function is supported on this platform. */
 #cmakedefine LLVM_HAVE_LIBXAR ${LLVM_HAVE_LIBXAR}
 
+/* Whether Timers signpost passes in Xcode Instruments */
+#cmakedefine01 LLVM_SUPPORT_XCODE_SIGNPOSTS
+
+
 #endif
diff --git a/include/llvm/Support/Signposts.h b/include/llvm/Support/Signposts.h
index 6a656fb2e89..bc6abba0a0e 100644
--- a/include/llvm/Support/Signposts.h
+++ b/include/llvm/Support/Signposts.h
@@ -18,7 +18,7 @@
 #define LLVM_SUPPORT_SIGNPOSTS_H
 
 #include "llvm/ADT/StringRef.h"
-#include "llvm/Config/config.h"
+#include "llvm/Config/llvm-config.h"
 #include <memory>
 
 #if LLVM_SUPPORT_XCODE_SIGNPOSTS
diff --git a/lib/Support/Signposts.cpp b/lib/Support/Signposts.cpp
index efa283c0ade..49a0b16baa0 100644
--- a/lib/Support/Signposts.cpp
+++ b/lib/Support/Signposts.cpp
@@ -13,7 +13,7 @@
 #if LLVM_SUPPORT_XCODE_SIGNPOSTS
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/Support/Mutex.h"
-#endif // if LLVM_SUPPORT_XCODE_SIGNPOSTS
+#endif
 
 using namespace llvm;