Author: Tomas Matheson Date: 2024-05-01T18:01:14+01:00 New Revision: 6c369cf937b7d9acb98a1fc46b1340cef7703e12
URL: https://github.com/llvm/llvm-project/commit/6c369cf937b7d9acb98a1fc46b1340cef7703e12 DIFF: https://github.com/llvm/llvm-project/commit/6c369cf937b7d9acb98a1fc46b1340cef7703e12.diff LOG: [AArch64] Changes missing from cfca97742723 (#90314) Added: Modified: clang/lib/Basic/CMakeLists.txt clang/lib/CodeGen/CMakeLists.txt clang/lib/Driver/CMakeLists.txt clang/tools/driver/CMakeLists.txt llvm/include/module.install.modulemap llvm/include/module.modulemap Removed: ################################################################################ diff --git a/clang/lib/Basic/CMakeLists.txt b/clang/lib/Basic/CMakeLists.txt index 2e218ba7c84cca..824d4a0e2eee57 100644 --- a/clang/lib/Basic/CMakeLists.txt +++ b/clang/lib/Basic/CMakeLists.txt @@ -130,6 +130,9 @@ add_clang_library(clangBasic DEPENDS omp_gen ClangDriverOptions + # These generated headers are included transitively. + ARMTargetParserTableGen + AArch64TargetParserTableGen ) target_link_libraries(clangBasic diff --git a/clang/lib/CodeGen/CMakeLists.txt b/clang/lib/CodeGen/CMakeLists.txt index 52216d93a302bb..7a933d0ed0d0d7 100644 --- a/clang/lib/CodeGen/CMakeLists.txt +++ b/clang/lib/CodeGen/CMakeLists.txt @@ -143,6 +143,9 @@ add_clang_library(clangCodeGen DEPENDS intrinsics_gen ClangDriverOptions + # These generated headers are included transitively. + ARMTargetParserTableGen + AArch64TargetParserTableGen LINK_LIBS clangAST diff --git a/clang/lib/Driver/CMakeLists.txt b/clang/lib/Driver/CMakeLists.txt index 58427e3f83c420..32a4378ab499fa 100644 --- a/clang/lib/Driver/CMakeLists.txt +++ b/clang/lib/Driver/CMakeLists.txt @@ -90,6 +90,9 @@ add_clang_library(clangDriver DEPENDS ClangDriverOptions + # These generated headers are included transitively. + ARMTargetParserTableGen + AArch64TargetParserTableGen LINK_LIBS clangBasic diff --git a/clang/tools/driver/CMakeLists.txt b/clang/tools/driver/CMakeLists.txt index d70b92b0984e52..290bf2a42536dd 100644 --- a/clang/tools/driver/CMakeLists.txt +++ b/clang/tools/driver/CMakeLists.txt @@ -31,6 +31,9 @@ add_clang_tool(clang DEPENDS intrinsics_gen + # These generated headers are included transitively. + ARMTargetParserTableGen + AArch64TargetParserTableGen ${support_plugins} GENERATE_DRIVER ) diff --git a/llvm/include/module.install.modulemap b/llvm/include/module.install.modulemap index f7302830f561de..b917cddc78034c 100644 --- a/llvm/include/module.install.modulemap +++ b/llvm/include/module.install.modulemap @@ -31,5 +31,7 @@ module LLVM_Extern_Utils_DataTypes { } module LLVM_Extern_TargetParser_Gen { + textual header "llvm/TargetParser/ARMTargetParserDef.inc" + textual header "llvm/TargetParser/AArch64TargetParserDef.inc" textual header "llvm/TargetParser/RISCVTargetParserDef.inc" } diff --git a/llvm/include/module.modulemap b/llvm/include/module.modulemap index e60e03a282ac6e..b00da6d7cd28c7 100644 --- a/llvm/include/module.modulemap +++ b/llvm/include/module.modulemap @@ -345,6 +345,11 @@ extern module LLVM_Extern_Utils_DataTypes "module.extern.modulemap" // Build the module with the tablegen-generated files needed by the // TargetParser module before building the TargetParser module itself. module TargetParserGen { + module AArch64TargetParserDef { + header "llvm/TargetParser/AArch64TargetParser.h" + extern module LLVM_Extern_TargetParser_Gen "module.extern.modulemap" + export * + } module RISCVTargetParserDef { header "llvm/TargetParser/RISCVTargetParser.h" extern module LLVM_Extern_TargetParser_Gen "module.extern.modulemap" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
