2 files changed, 4 insertions, 2 deletions
diff --git a/lib/Driver/HostInfo.cpp b/lib/Driver/HostInfo.cpp
index 98b64f1..d8e086d 100644
--- a/lib/Driver/HostInfo.cpp
+++ b/lib/Driver/HostInfo.cpp
@@ -164,7 +164,7 @@ class TCEHostInfo : public HostInfo {
 
 public:
   TCEHostInfo(const Driver &D, const llvm::Triple &Triple);
-  ~TCEHostInfo() {};
+  ~TCEHostInfo() {}
 
   virtual bool useDriverDriver() const;
 
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index de9bdcc..bc52100 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -929,7 +929,9 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
 
   // Special case debug options to only pass -g to clang. This is
   // wrong.
-  if (Args.hasArg(options::OPT_g_Group))
+  Args.ClaimAllArgs(options::OPT_g_Group);
+  Arg *Garg = Args.getLastArg(options::OPT_g_Group);
+  if (Garg && Garg != Args.getLastArg(options::OPT_g0))
     CmdArgs.push_back("-g");
 
   Args.AddLastArg(CmdArgs, options::OPT_nostdinc);