Use LLVM args to handle -malign-double option

lib/Basic/Targets.cpp

 //===--- Targets.cpp - Implement -arch option and targets -----------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file implements construction of a TargetInfo object from a
@@ skipping 3502 matching lines @@
     case 'd':
     case 'S':
     case 'D':
       return Size <= 32;
     case 'A':
       return Size <= 64;
     }
 
     return X86TargetInfo::validateOperandSize(Constraint, Size);
   }
+
   // @LOCALMOD-START
-  bool handleTargetFeatures(std::vector<std::string> &Features,
-                            DiagnosticsEngine &Diags) override {
+  bool handleLLVMArgs(std::vector<std::string> &Args) override {
     HasAlignedDouble = false;
-    auto it = std::find(Features.begin(), Features.end(), "+align-double");
-    if (it != Features.end()) {
+    auto it = std::find(Args.begin(), Args.end(), "-malign-double");
+    if (it != Args.end()) {
       HasAlignedDouble = true;
-      Features.erase(it);
     }
-
     setDescriptionString();
-
-    return X86TargetInfo::handleTargetFeatures(Features, Diags);
+    return true;
   }
   // @LOCALMOD-END
 };
 
 class NetBSDI386TargetInfo : public NetBSDTargetInfo<X86_32TargetInfo> {
 public:
   NetBSDI386TargetInfo(const llvm::Triple &Triple)
       : NetBSDTargetInfo<X86_32TargetInfo>(Triple) {}
 
   unsigned getFloatEvalMethod() const override {
@@ skipping 3752 matching lines @@
   //
   // FIXME: If we are completely confident that we have the right set, we only
   // need to pass the minuses.
   Opts->Features.clear();
   for (llvm::StringMap<bool>::const_iterator it = Features.begin(),
          ie = Features.end(); it != ie; ++it)
     Opts->Features.push_back((it->second ? "+" : "-") + it->first().str());
   if (!Target->handleTargetFeatures(Opts->Features, Diags))
     return nullptr;
 
+  // @LOCALMOD-START
+  if (!Target->handleLLVMArgs(Opts->LLVMArgs))
+    return nullptr;
+  // @LOCALMOD-END
+
   return Target.release();
 }