diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td
index 2cba46c..23b351c 100644
--- a/include/clang/Driver/Options.td
+++ b/include/clang/Driver/Options.td
@@ -300,6 +300,7 @@
 def ffreestanding : Flag<"-ffreestanding">, Group<f_Group>;
 def fgnu_keywords : Flag<"-fgnu-keywords">, Group<f_Group>;
 def fgnu89_inline : Flag<"-fgnu89-inline">, Group<f_Group>;
+def fno_gnu89_inline : Flag<"-fno-gnu89-inline">, Group<f_Group>;
 def fgnu_runtime : Flag<"-fgnu-runtime">, Group<f_Group>;
 def fheinous_gnu_extensions : Flag<"-fheinous-gnu-extensions">;
 def filelist : Separate<"-filelist">, Flags<[LinkerInput]>;
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index fbc5109..6af9ba8 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -1712,7 +1712,9 @@
                                options::OPT_fno_gnu_keywords))
     A->render(Args, CmdArgs);
 
-  if (Arg *A = Args.getLastArg(options::OPT_fgnu89_inline))
+  if (Args.hasFlag(options::OPT_fgnu89_inline,
+                   options::OPT_fno_gnu89_inline,
+                   false))
     CmdArgs.push_back("-fgnu89-inline");
 
   // -fnext-runtime defaults to on Darwin and when rewriting Objective-C, and is