Driver/clang: -mattr strings were not comma separated.

 - Apologies for commits w/o test cases; they are coming.

llvm-svn: 67310

1 files changed, 4 insertions, 0 deletions

diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 70005906540..34538114a55 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -197,9 +197,13 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     std::string Attrs;
     for (unsigned i=0; i < NumFeatureOptions; ++i) {
       if (Args.hasArg(FeatureOptions[i].Pos)) {
+        if (!Attrs.empty())
+          Attrs += ',';
         Attrs += '+';
         Attrs += FeatureOptions[i].Name;
       } else if (Args.hasArg(FeatureOptions[i].Neg)) {
+        if (!Attrs.empty())
+          Attrs += ',';
         Attrs += '-';
         Attrs += FeatureOptions[i].Name;
       }