Author: Adrian Prantl Date: 2021-06-16T14:40:37-07:00 New Revision: f9aba9a5afe09788eceb9879aa5c3ad345e0f1e9
URL: https://github.com/llvm/llvm-project/commit/f9aba9a5afe09788eceb9879aa5c3ad345e0f1e9 DIFF: https://github.com/llvm/llvm-project/commit/f9aba9a5afe09788eceb9879aa5c3ad345e0f1e9.diff LOG: 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. Added: Modified: lldb/include/lldb/Utility/Timer.h llvm/include/llvm/Config/config.h.cmake llvm/include/llvm/Config/llvm-config.h.cmake llvm/include/llvm/Support/Signposts.h llvm/lib/Support/Signposts.cpp Removed: ################################################################################ diff --git a/lldb/include/lldb/Utility/Timer.h b/lldb/include/lldb/Utility/Timer.h index 4696a80319a98..c70c180494266 100644 --- a/lldb/include/lldb/Utility/Timer.h +++ b/lldb/include/lldb/Utility/Timer.h @@ -9,7 +9,6 @@ #ifndef LLDB_UTILITY_TIMER_H #define LLDB_UTILITY_TIMER_H -#include "llvm/Config/config.h" #include "llvm/ADT/ScopeExit.h" #include "llvm/Support/Chrono.h" #include "llvm/Support/Signposts.h" diff --git a/llvm/include/llvm/Config/config.h.cmake b/llvm/include/llvm/Config/config.h.cmake index c7db4a21cb135..8d58ec9d665b3 100644 --- a/llvm/include/llvm/Config/config.h.cmake +++ b/llvm/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/llvm/include/llvm/Config/llvm-config.h.cmake b/llvm/include/llvm/Config/llvm-config.h.cmake index 9916635489e4f..4e7e2e9e39d9f 100644 --- a/llvm/include/llvm/Config/llvm-config.h.cmake +++ b/llvm/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/llvm/include/llvm/Support/Signposts.h b/llvm/include/llvm/Support/Signposts.h index 6a656fb2e899f..bc6abba0a0e11 100644 --- a/llvm/include/llvm/Support/Signposts.h +++ b/llvm/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/llvm/lib/Support/Signposts.cpp b/llvm/lib/Support/Signposts.cpp index efa283c0ade51..49a0b16baa026 100644 --- a/llvm/lib/Support/Signposts.cpp +++ b/llvm/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; _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
