[llvm] 0a832ba - [config] Remove LLVM_DEFAULT_TARGET_TRILE from config.h

[Reid Kleckner via llvm-commits]

Author: Reid Kleckner
Date: 2022-06-03T10:15:46-07:00
New Revision: 0a832ba5c2ef01e91e4e79b2681b95b7dab18ead

URL: https://github.com/llvm/llvm-project/commit/0a832ba5c2ef01e91e4e79b2681b95b7dab18ead
DIFF: https://github.com/llvm/llvm-project/commit/0a832ba5c2ef01e91e4e79b2681b95b7dab18ead.diff

LOG: [config] Remove LLVM_DEFAULT_TARGET_TRILE from config.h

It is redundant with llvm-config.h, which is always included by
config.h.

Port D12660 / d178f4fc895b432008fcd8a0a49a13d951fecfe4 from config.h to
llvm-config.h.

Update the gn build accordingly.

NFCI

Added: 
    

Modified: 
    llvm/include/llvm/Config/config.h.cmake
    llvm/include/llvm/Config/llvm-config.h.cmake
    llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/Config/config.h.cmake b/llvm/include/llvm/Config/config.h.cmake
index ab8add2e58232..307a2898bc20d 100644
--- a/llvm/include/llvm/Config/config.h.cmake
+++ b/llvm/include/llvm/Config/config.h.cmake
@@ -290,10 +290,6 @@
 /* Linker version detected at compile time. */
 #cmakedefine HOST_LINK_VERSION "${HOST_LINK_VERSION}"
 
-/* Target triple LLVM will generate code for by default */
-/* Doesn't use `cmakedefine` because it is allowed to be empty. */
-#define LLVM_DEFAULT_TARGET_TRIPLE "${LLVM_DEFAULT_TARGET_TRIPLE}"
-
 /* Define if overriding target triple is enabled */
 #cmakedefine LLVM_TARGET_TRIPLE_ENV "${LLVM_TARGET_TRIPLE_ENV}"
 

diff  --git a/llvm/include/llvm/Config/llvm-config.h.cmake b/llvm/include/llvm/Config/llvm-config.h.cmake
index 7d420bbc71645..875a47030d345 100644
--- a/llvm/include/llvm/Config/llvm-config.h.cmake
+++ b/llvm/include/llvm/Config/llvm-config.h.cmake
@@ -18,7 +18,8 @@
 #cmakedefine LLVM_ENABLE_DUMP
 
 /* Target triple LLVM will generate code for by default */
-#cmakedefine LLVM_DEFAULT_TARGET_TRIPLE "${LLVM_DEFAULT_TARGET_TRIPLE}"
+/* Doesn't use `cmakedefine` because it is allowed to be empty. */
+#define LLVM_DEFAULT_TARGET_TRIPLE "${LLVM_DEFAULT_TARGET_TRIPLE}"
 
 /* Define if threads enabled */
 #cmakedefine01 LLVM_ENABLE_THREADS

diff  --git a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
index c60044b03049c..b4b77edf3d1f6 100644
--- a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
@@ -133,10 +133,6 @@ write_cmake_config("config") {
     "LLVM_GISEL_COV_ENABLED=",
     "LLVM_GISEL_COV_PREFIX=",
 
-    # This is both in llvm-config.h and config.h; llvm-config.h doesn't
-    # define it if it's not set while config.h defines it to empty in that case.
-    "LLVM_DEFAULT_TARGET_TRIPLE=$llvm_target_triple",
-
     # FIXME: Set to 1 on mac once the 10.14 SDK is in common use.
     "LLVM_SUPPORT_XCODE_SIGNPOSTS=",
   ]