From 011d8633eb11d31c801ae86bd1aecbe72953082a Mon Sep 17 00:00:00 2001 From: Geoffrey Martin-Noble Date: Mon, 11 Oct 2021 11:22:27 -0700 Subject: [PATCH] [Bazel] Update config for 070315d04c6b This updates the Bazel configuration for https://github.com/llvm/llvm-project/commit/070315d04c6b which moved `LLVM_SUPPORT_XCODE_SIGNPOSTS` from llvm-config.h.cmake to config.h.cmake. Also adds a comment for `HAVE_PROC_PID_RUSAGE`, that I spotted was missing. Differential Revision: https://reviews.llvm.org/D111569 --- .../llvm-project-overlay/llvm/include/llvm/Config/config.h | 5 +++++ .../llvm/include/llvm/Config/llvm-config.h | 3 --- utils/bazel/llvm_configs/config.h.cmake | 3 +++ utils/bazel/llvm_configs/llvm-config.h.cmake | 4 ---- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/config.h b/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/config.h index 03a2fa6591ee..3fead191388f 100644 --- a/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/config.h +++ b/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/config.h @@ -363,4 +363,9 @@ /* Define to the default GlobalISel coverage file prefix */ /* #undef LLVM_GISEL_COV_PREFIX */ +/* Whether Timers signpost passes in Xcode Instruments */ +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 0 + +/* HAVE_PROC_PID_RUSAGE defined in Bazel */ + #endif diff --git a/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h b/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h index 1f7b7bf40f6b..6b64c9a06005 100644 --- a/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h +++ b/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h @@ -108,7 +108,4 @@ /* Define if the xar_open() function is supported this platform. */ /* #undef HAVE_LIBXAR */ -/* Whether Timers signpost passes in Xcode Instruments */ -#define LLVM_SUPPORT_XCODE_SIGNPOSTS 0 - #endif diff --git a/utils/bazel/llvm_configs/config.h.cmake b/utils/bazel/llvm_configs/config.h.cmake index d7cd44b5db36..37a0d234844d 100644 --- a/utils/bazel/llvm_configs/config.h.cmake +++ b/utils/bazel/llvm_configs/config.h.cmake @@ -353,6 +353,9 @@ /* 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/utils/bazel/llvm_configs/llvm-config.h.cmake b/utils/bazel/llvm_configs/llvm-config.h.cmake index 82a979411209..169f59695e5e 100644 --- a/utils/bazel/llvm_configs/llvm-config.h.cmake +++ b/utils/bazel/llvm_configs/llvm-config.h.cmake @@ -100,8 +100,4 @@ /* 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 -- GitLab