Index: lib/Frontend/CompilerInvocation.cpp
--- lib/Frontend/CompilerInvocation.cpp.orig
+++ lib/Frontend/CompilerInvocation.cpp
@@ -1137,6 +1137,8 @@ static bool ParseCodeGenArgs(CodeGenOptions &Opts, Arg
     Opts.StackAlignment = StackAlignment;
   }
 
+  Opts.ReturnProtector = Args.hasArg(OPT_ret_protector);
+
   if (Arg *A = Args.getLastArg(OPT_mstack_probe_size)) {
     StringRef Val = A->getValue();
     unsigned StackProbeSize = Opts.StackProbeSize;