[Modules] Fix modular build.

[vsapsai]

Add a new file to the module map and remove 2 missing files (migrated from .def to .td).

[llvmbot]

@llvm/pr-subscribers-clang

Author: Volodymyr Sapsai (vsapsai)

Changes

Add a new file to the module map and remove 2 missing files (migrated from .def to .td).

---

Full diff: https://github.com/llvm/llvm-project/pull/122034.diff

2 Files Affected:

• (modified) clang/include/module.modulemap (-2)
• (modified) llvm/include/module.modulemap (+1)

diff --git a/clang/include/module.modulemap b/clang/include/module.modulemap
index 5bb9f6b7a91f67..f00dede7fd526c 100644
--- a/clang/include/module.modulemap
+++ b/clang/include/module.modulemap
@@ -62,8 +62,6 @@ module Clang_Basic {
   textual header "clang/Basic/BuiltinsVE.def"
   textual header "clang/Basic/BuiltinsVEVL.gen.def"
   textual header "clang/Basic/BuiltinsWebAssembly.def"
-  textual header "clang/Basic/BuiltinsX86.def"
-  textual header "clang/Basic/BuiltinsX86_64.def"
   textual header "clang/Basic/BuiltinsXCore.def"
   textual header "clang/Basic/CFProtectionOptions.def"
   textual header "clang/Basic/CodeGenOptions.def"
diff --git a/llvm/include/module.modulemap b/llvm/include/module.modulemap
index 6beb0e03e222d5..46277e128d9898 100644
--- a/llvm/include/module.modulemap
+++ b/llvm/include/module.modulemap
@@ -96,6 +96,7 @@ module LLVM_BinaryFormat {
     textual header "llvm/BinaryFormat/ELFRelocs/PowerPC64.def"
     textual header "llvm/BinaryFormat/ELFRelocs/PowerPC.def"
     textual header "llvm/BinaryFormat/ELFRelocs/RISCV.def"
+    textual header "llvm/BinaryFormat/ELFRelocs/RISCV_nonstandard.def"
     textual header "llvm/BinaryFormat/ELFRelocs/Sparc.def"
     textual header "llvm/BinaryFormat/ELFRelocs/SystemZ.def"
     textual header "llvm/BinaryFormat/ELFRelocs/VE.def"

[vsapsai]

Test failure "LLVM.tools/llvm-gsymutil/ARM_AArch64/macho-merged-funcs-dwarf.yaml" is unrelated to this change.