Index: clang/tools/clang-fuzzer/ExampleClangProtoFuzzer.cpp
===================================================================
--- clang/tools/clang-fuzzer/ExampleClangProtoFuzzer.cpp
+++ clang/tools/clang-fuzzer/ExampleClangProtoFuzzer.cpp
@@ -20,9 +20,24 @@
 
 #include "src/libfuzzer/libfuzzer_macro.h"
 
+#include "llvm/ADT/StringRef.h"
+
 using namespace clang_fuzzer;
 
+static std::vector<const char *> CLArgs;
+
+extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) {
+  CLArgs.push_back("-O2");
+  int I;
+  for (I = 1; I < *argc; I++)
+    if (llvm::StringRef((*argv)[I]).equals("-ignore_remaining_args=1"))
+      break;
+  for (I++; I < *argc; I++)
+    CLArgs.push_back((*argv)[I]);
+  return 0;
+}
+
 DEFINE_BINARY_PROTO_FUZZER(const Function& input) {
   auto S = FunctionToString(input);
-  HandleCXX(S, {"-O2"});
+  HandleCXX(S, CLArgs);
 }