Merge pull request #74 from wdng/release_60

Add the -Munixlogical option for Flang.

Author: sscalpone

include/clang/Driver/Options.td

@@ -2933,6 +2933,8 @@ def Mnomain: Flag<["-"], "Mnomain">, Group<pgi_fortran_Group>,
   HelpText<"Don't link in Fortran main">;
 def frelaxed_math : Flag<["-"], "frelaxed-math">, Group<pgi_fortran_Group>,
   HelpText<"Use relaxed Math intrinsic functions">;
+def Munixlogical: Flag<["-"], "Munixlogical">, Group<pgi_fortran_Group>,
+  HelpText<"Use unixlogical for all loigical operations">;
 
 // Flang internal debug options
 def Mx_EQ : Joined<["-"], "Mx,">, Group<pgi_fortran_Group>;

lib/Driver/ToolChains/Flang.cpp

@@ -297,6 +297,14 @@ void FlangFrontend::ConstructJob(Compilation &C, const JobAction &JA,
     CommonCmdArgs.push_back("8");
   }
 
+  // -Munixlogical, only add xbit to flang2.
+  for (auto Arg : Args.filtered(options::OPT_Munixlogical)) {
+    Arg->claim();
+    LowerCmdArgs.push_back("-x");
+    LowerCmdArgs.push_back("125");
+    LowerCmdArgs.push_back("0x8");
+  }
+
   // -g should produce DWARFv2
   for (auto Arg : Args.filtered(options::OPT_g_Flag)) {
     Arg->claim();