From 61fa9afe4c5b014181ce41a35c84fb0f3be975db Mon Sep 17 00:00:00 2001 From: Haowei Wu Date: Wed, 7 Apr 2021 15:50:12 -0700 Subject: [ifs] Prepare llvm-ifs for elfabi/ifs merging. This diff changes llvm-ifs to use unified IFS file format and perform other renaming changes in preparation for the merging between elfabi/ifs. Differential Revision: https://reviews.llvm.org/D99810 --- clang/lib/Frontend/InterfaceStubFunctionsConsumer.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'clang/lib/Frontend/InterfaceStubFunctionsConsumer.cpp') diff --git a/clang/lib/Frontend/InterfaceStubFunctionsConsumer.cpp b/clang/lib/Frontend/InterfaceStubFunctionsConsumer.cpp index b7c1e69..d58f5bb 100644 --- a/clang/lib/Frontend/InterfaceStubFunctionsConsumer.cpp +++ b/clang/lib/Frontend/InterfaceStubFunctionsConsumer.cpp @@ -290,11 +290,8 @@ public: const ASTContext &context, StringRef Format, raw_ostream &OS) -> void { OS << "--- !" << Format << "\n"; - OS << "IfsVersion: 2.0\n"; - OS << "Triple: " << T.str() << "\n"; - OS << "ObjectFileFormat: " - << "ELF" - << "\n"; // TODO: For now, just ELF. + OS << "IfsVersion: 3.0\n"; + OS << "Target: " << T.str() << "\n"; OS << "Symbols:\n"; for (const auto &E : Symbols) { const MangledSymbol &Symbol = E.second; @@ -330,7 +327,7 @@ public: OS.flush(); }; - assert(Format == "experimental-ifs-v2" && "Unexpected IFS Format."); + assert(Format == "ifs-v1" && "Unexpected IFS Format."); writeIfsV1(Instance.getTarget().getTriple(), Symbols, context, Format, *OS); } }; @@ -339,6 +336,5 @@ public: std::unique_ptr GenerateInterfaceStubsAction::CreateASTConsumer(CompilerInstance &CI, StringRef InFile) { - return std::make_unique( - CI, InFile, "experimental-ifs-v2"); + return std::make_unique(CI, InFile, "ifs-v1"); } -- cgit v1.1