[clang][Driver][MCTargetOptions]Change clang driver to adopt new definition of createAsmBackend

[vmedic]

Summary

In order to pass the ABI info, MCTargetOptions parameter is added to createAsmBackend methods. This patch introduces necessary changes to clang driver to adopt this change.

[echristo]

Inline comment.

tools/driver/cc1as_main.cpp

358

I'd prefer not to do this, clang already has its own option handling. Ideas on how to avoid this?

[vmedic]

tools/driver/cc1as_main.cpp

358

Not right now, at least not a simple one. The FIXME comment that was removed said:"init MCTargetOptions from sanitizer flags here." So we should probably need to map clang options to MCTargetOptions.

[vmedic]

Could we do that in a separate patch? I would prefer to submit this one without initialization with old fixme comment and commit it in order to get the abi working. In the next patch we can initialize MCtargetOptions from AssemblerInvocation(adding the fields we need in the structure).

---

From: Eric Christopher [[e-mail]]
Sent: Friday, February 20, 2015 6:54 PM
To: [e-mail]; Vladimir Medic; Daniel Sanders
Cc: [e-mail]
Subject: Re: [PATCH] [clang][Driver][MCTargetOptions]Change clang driver to adopt new definition of createAsmBackend

[echristo]

It shouldn't be too hard to get the first part done at least with the
MCOptions part.

-eric

[vmedic]

MCTargetOptions instance is not initiated anymore using InitMCTargetOptionsFromFlags but newly defined method which uses AssemblerInvocation structure to populate fields from clang driver options.

tools/driver/cc1as_main.cpp

 #include "llvm/MC/MCStreamer.h"
 #include "llvm/MC/MCSubtargetInfo.h"
 #include "llvm/MC/MCTargetAsmParser.h"
-#include "llvm/MC/MCTargetOptions.h"
+#include "llvm/MC/MCTargetOptionsCommandFlags.h"
 #include "llvm/Option/Arg.h"
 #include "llvm/Option/ArgList.h"
 #include "llvm/Option/OptTable.h"

   /// are legal.
   std::string CPU;
 
+  /// If given, the name of the target ABI.
+  std::string ABI;
+
   /// The list of target specific features to enable or disable -- this should
   /// be a list of strings starting with '+' or '-'.
   std::vector<std::string> Features;

   // Target Options
   Opts.Triple = llvm::Triple::normalize(Args->getLastArgValue(OPT_triple));
   Opts.CPU = Args->getLastArgValue(OPT_target_cpu);
+  Opts.ABI = Args->getLastArgValue(OPT_target_abi);
   Opts.Features = Args->getAllArgValues(OPT_target_feature);
 
   // Use the default target triple if unspecified.

   return new formatted_raw_ostream(*Out, formatted_raw_ostream::DELETE_STREAM);
 }
 
+static inline MCTargetOptions InitFromAssemblerInvocation(
+                                  AssemblerInvocation &Opt) {
+  MCTargetOptions Options;
+
+  Options.MCRelaxAll = Opt.RelaxAll;
+  Options.DwarfVersion = Opt.DwarfVersion;
+  Options.ShowMCInst = Opt.ShowInst;
+  Options.ABIName = Opt.ABI;
+  return Options;
+}
 static bool ExecuteAssembler(AssemblerInvocation &Opts,
                              DiagnosticsEngine &Diags) {
   // Get the target specific parser.

   std::unique_ptr<MCInstrInfo> MCII(TheTarget->createMCInstrInfo());
   std::unique_ptr<MCSubtargetInfo> STI(
       TheTarget->createMCSubtargetInfo(Opts.Triple, Opts.CPU, FS));
+  MCTargetOptions Options = InitFromAssemblerInvocation(Opts);
 
   // FIXME: There is a bit of code duplication with addPassesToEmitFile.
   if (Opts.OutputType == AssemblerInvocation::FT_Asm) {

     MCAsmBackend *MAB = nullptr;
     if (Opts.ShowEncoding) {
       CE = TheTarget->createMCCodeEmitter(*MCII, *MRI, *STI, Ctx);
-      MAB = TheTarget->createMCAsmBackend(*MRI, Opts.Triple, Opts.CPU);
+      MAB = TheTarget->createMCAsmBackend(*MRI, Opts.Triple, Opts.CPU, Options);
     }
     Str.reset(TheTarget->createAsmStreamer(Ctx, *Out, /*asmverbose*/true,
                                            /*useDwarfDirectory*/ true,

            "Invalid file type!");
     MCCodeEmitter *CE = TheTarget->createMCCodeEmitter(*MCII, *MRI, *STI, Ctx);
     MCAsmBackend *MAB = TheTarget->createMCAsmBackend(*MRI, Opts.Triple,
-                                                      Opts.CPU);
+                                                      Opts.CPU, Options);
     Str.reset(TheTarget->createMCObjectStreamer(Opts.Triple, Ctx, *MAB, *Out,
                                                 CE, *STI, Opts.RelaxAll));
     Str.get()->InitSections(Opts.NoExecStack);

   std::unique_ptr<MCAsmParser> Parser(
       createMCAsmParser(SrcMgr, Ctx, *Str.get(), *MAI));
 
-  // FIXME: init MCTargetOptions from sanitizer flags here.
-  MCTargetOptions Options;
   std::unique_ptr<MCTargetAsmParser> TAP(
       TheTarget->createMCAsmParser(*STI, *Parser, *MCII, Options));
   if (!TAP)