@@ -598,14 +598,14 @@ cc_binary(
598
598
name = "llvm-min-tblgen" ,
599
599
srcs = [
600
600
"utils/TableGen/Attributes.cpp" ,
601
- "utils/TableGen/CodeGenIntrinsics.cpp" ,
602
- "utils/TableGen/CodeGenIntrinsics.h" ,
601
+ "utils/TableGen/Basic/CodeGenIntrinsics.cpp" ,
602
+ "utils/TableGen/Basic/CodeGenIntrinsics.h" ,
603
+ "utils/TableGen/Basic/SDNodeProperties.cpp" ,
604
+ "utils/TableGen/Basic/SDNodeProperties.h" ,
605
+ "utils/TableGen/Basic/SequenceToOffsetTable.h" ,
603
606
"utils/TableGen/DirectiveEmitter.cpp" ,
604
607
"utils/TableGen/IntrinsicEmitter.cpp" ,
605
608
"utils/TableGen/RISCVTargetDefEmitter.cpp" ,
606
- "utils/TableGen/SDNodeProperties.cpp" ,
607
- "utils/TableGen/SDNodeProperties.h" ,
608
- "utils/TableGen/SequenceToOffsetTable.h" ,
609
609
"utils/TableGen/TableGen.cpp" ,
610
610
"utils/TableGen/VTEmitter.cpp" ,
611
611
],
@@ -621,16 +621,16 @@ cc_binary(
621
621
cc_library (
622
622
name = "TableGenGlobalISel" ,
623
623
srcs = [
624
- "utils/TableGen/GlobalISel/CodeExpander.cpp" ,
624
+ "utils/TableGen/Common/ GlobalISel/CodeExpander.cpp" ,
625
625
],
626
626
hdrs = glob ([
627
627
# We have to include these headers here as well as in the `hdrs` below
628
628
# to allow the `.cpp` files to use file-relative-inclusion to find
629
629
# them, even though consumers of this library use inclusion relative to
630
630
# `utils/TableGen` with the `strip_includes_prefix` of this library.
631
631
# This mixture appears to be incompatible with header modules.
632
- "utils/TableGen/GlobalISel/CodeExpander.h" ,
633
- "utils/TableGen/GlobalISel/CodeExpansions.h" ,
632
+ "utils/TableGen/Common/ GlobalISel/CodeExpander.h" ,
633
+ "utils/TableGen/Common/ GlobalISel/CodeExpansions.h" ,
634
634
]),
635
635
copts = llvm_copts ,
636
636
features = ["-header_modules" ],
@@ -654,18 +654,23 @@ cc_binary(
654
654
[
655
655
"utils/TableGen/*.cpp" ,
656
656
"utils/TableGen/*.h" ,
657
- "utils/TableGen/GlobalISel/*.cpp" ,
658
- "utils/TableGen/GlobalISel/*.h" ,
657
+ "utils/TableGen/Basic/*.cpp" ,
658
+ "utils/TableGen/Basic/*.h" ,
659
+ "utils/TableGen/Common/*.cpp" ,
660
+ "utils/TableGen/Common/*.h" ,
661
+ "utils/TableGen/Common/GlobalISel/*.cpp" ,
662
+ "utils/TableGen/Common/GlobalISel/*.h" ,
659
663
660
664
# Some tablegen sources include headers from MC, so these have to be
661
665
# listed here. MC uses headers produced by tablegen, so it cannot be a
662
666
# regular dependency.
663
667
"include/llvm/MC/*.h" ,
664
668
"include/llvm/TargetParser/SubtargetFeature.h" ,
665
669
],
666
- exclude = ["utils/TableGen/GlobalISel/CodeExpander.cpp" ],
670
+ exclude = ["utils/TableGen/Common/ GlobalISel/CodeExpander.cpp" ],
667
671
),
668
672
copts = llvm_copts ,
673
+ includes = ["utils/TableGen" ],
669
674
stamp = 0 ,
670
675
deps = [
671
676
":CodeGenTypes" ,
0 commit comments