commit 9bc8eff68bd684c21ec036645f56baeb31506ea7
author Andrew Hsieh <andrewhsieh@google.com> Wed Jul 10 10:27:32 2013 -0700
committer Andrew Hsieh <andrewhsieh@google.com> Wed Jul 10 10:27:32 2013 -0700
tree 5dc35166c7fddda0a5805d1174f2e634410c833d
parent 7506b7ae82bf68acae0263ed829de34e778391aa

Allow multiple -arm-enable-ehabi and -arm-enable-ehabi-descriptors

Clang adds -arm-enable-ehabi and -arm-enable-ehabi-descriptors
unconditionally for Android.  This may fail when user also specify
"-mllvm -arm-enable-ehabi" or "-mllvm -arm-enable-ehabi-descriptors"
in the command line.  Fix to allow multiple occurrences.

Change-Id: I3860b22abdd8481ebb3068d5d3156436e27c7a57

lib/CodeGen/AsmPrinter/ARMException.cpp

diff --git a/lib/CodeGen/AsmPrinter/ARMException.cpp b/lib/CodeGen/AsmPrinter/ARMException.cpp
index 9d2ed73..f6c9c2f 100644
--- a/lib/CodeGen/AsmPrinter/ARMException.cpp
+++ b/lib/CodeGen/AsmPrinter/ARMException.cpp
@@ -39,6 +39,7 @@
 
 cl::opt<bool>
 EnableARMEHABIDescriptors("arm-enable-ehabi-descriptors", cl::Hidden,
+  cl::ZeroOrMore,
   cl::desc("Generate ARM EHABI tables with unwinding descriptors"),
   cl::init(false));
 

lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp

diff --git a/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp b/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp
index 03e8d5f..b387c2a 100644
--- a/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp
+++ b/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp
@@ -18,6 +18,7 @@
 
 cl::opt<bool>
 EnableARMEHABI("arm-enable-ehabi", cl::Hidden,
+  cl::ZeroOrMore,
   cl::desc("Generate ARM EHABI tables"),
   cl::init(false));