summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Kramer <benny.kra@googlemail.com>2024-02-01 10:41:32 +0100
committerBenjamin Kramer <benny.kra@googlemail.com>2024-02-01 10:41:32 +0100
commit468b23935a56d2be75c1f86fea97e5620b230a93 (patch)
tree1602ffd6aea54996afcff09ef668690c96ffb842
parentd0dbd50cf0dc85834842380235f445e80516cb59 (diff)
[bazel] Merge TableGenGlobalISel into the tablegen target
These two are intertwined enough so it doesn't really make sense to have it standalone and hack around it by putting headers into both.
-rw-r--r--utils/bazel/llvm-project-overlay/llvm/BUILD.bazel30
1 files changed, 2 insertions, 28 deletions
diff --git a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
index 148ec7785a4b..326159cf3475 100644
--- a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
@@ -624,33 +624,6 @@ cc_binary(
)
cc_library(
- name = "TableGenGlobalISel",
- srcs = glob([
- "utils/TableGen/GlobalISel/*.cpp",
- ]) + [
- "utils/TableGen/CodeGenInstruction.h",
- "utils/TableGen/CodeGenIntrinsics.h",
- ],
- hdrs = glob([
- # We have to include these headers here as well as in the `hdrs` below
- # to allow the `.cpp` files to use file-relative-inclusion to find
- # them, even though consumers of this library use inclusion relative to
- # `utils/TableGen` with the `strip_includes_prefix` of this library.
- # This mixture appears to be incompatible with header modules.
- "utils/TableGen/GlobalISel/*.h",
- ]),
- copts = llvm_copts,
- features = ["-header_modules"],
- strip_include_prefix = "utils/TableGen",
- deps = [
- ":CodeGenTypes",
- ":Support",
- ":TableGen",
- ":config",
- ],
-)
-
-cc_library(
name = "llvm-tblgen-headers",
textual_hdrs = glob(["utils/TableGen/*.def"]),
)
@@ -661,6 +634,8 @@ cc_binary(
"utils/TableGen/*.cpp",
"utils/TableGen/*.inc",
"utils/TableGen/*.h",
+ "utils/TableGen/GlobalISel/*.cpp",
+ "utils/TableGen/GlobalISel/*.h",
# Some tablegen sources include headers from MC, so these have to be
# listed here. MC uses headers produced by tablegen, so it cannot be a
@@ -674,7 +649,6 @@ cc_binary(
":CodeGenTypes",
":Support",
":TableGen",
- ":TableGenGlobalISel",
":TargetParser",
":config",
":llvm-tblgen-headers",