ccc/Driver: -r option doesn't take an argument.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@67581 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Driver/Options.def b/include/clang/Driver/Options.def
index a5f3ee5ea18532d5779ff6d1432d907807556176..7b527427e929a8db912f35439344d3d3c50da58e 100644 (file)
--- a/include/clang/Driver/Options.def
+++ b/include/clang/Driver/Options.def
@@ -517,7 +517,7 @@ OPTION("-pthread", pthread, Flag, INVALID, INVALID, "", 0)
 OPTION("-p", p, Flag, INVALID, INVALID, "", 0)
 OPTION("-read_only_relocs", read__only__relocs, Separate, INVALID, INVALID, "", 0)
 OPTION("-remap", remap, Flag, INVALID, INVALID, "", 0)
-OPTION("-r", r, JoinedOrSeparate, INVALID, INVALID, "", 0)
+OPTION("-r", r, Flag, INVALID, INVALID, "", 0)
 OPTION("-save-temps", save_temps, Flag, INVALID, INVALID, "d", 0)
 OPTION("-sectalign", sectalign, MultiArg, INVALID, INVALID, "", 3)
 OPTION("-sectcreate", sectcreate, MultiArg, INVALID, INVALID, "", 3)

diff --git a/tools/ccc/ccclib/Arguments.py b/tools/ccc/ccclib/Arguments.py
index d4d97217d55b57770bb6cc481c2318ffa83e2799..958dd38b659fa8a976cf39f0d816ebd8e149445a 100644 (file)
--- a/tools/ccc/ccclib/Arguments.py
+++ b/tools/ccc/ccclib/Arguments.py
@@ -714,7 +714,7 @@ class OptionParser:
 
         self.emitLLVMOption = self.addOption(FlagOption('-emit-llvm'))
         self.eOption = self.addOption(JoinedOrSeparateOption('-e'))
-        self.rOption = self.addOption(JoinedOrSeparateOption('-r'))
+        self.rOption = self.addOption(FlagOption('-r'))
 
         self.pgOption = self.addOption(FlagOption('-pg'))
         self.pOption = self.addOption(FlagOption('-p'))