[llvm-branch-commits] [cfe-branch] r196597 - Merging r196538:

[Bill Wendling]

Author: void
Date: Fri Dec  6 13:12:59 2013
New Revision: 196597

URL: http://llvm.org/viewvc/llvm-project?rev=196597&view=rev
Log:
Merging r196538:
------------------------------------------------------------------------
r196538 | joerg | 2013-12-05 13:27:58 -0800 (Thu, 05 Dec 2013) | 2 lines

For NetBSD, use arm1176jzf-s as default CPU for ARMv6.

------------------------------------------------------------------------

Modified:
    cfe/branches/release_34/   (props changed)
    cfe/branches/release_34/lib/Driver/ToolChain.cpp
    cfe/branches/release_34/lib/Driver/Tools.cpp
    cfe/branches/release_34/test/Analysis/MismatchedDeallocator-checker-test.mm   (props changed)
    cfe/branches/release_34/test/Analysis/NewDelete-checker-test.cpp   (props changed)
    cfe/branches/release_34/test/SemaCXX/warn-unreachable.cpp   (props changed)

Propchange: cfe/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  6 13:12:59 2013
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:195126,195128,195135-195136,195146,195149,195154,195158,195163,195168,195174,195249,195268,195283,195303,195326,195329,195367,195384,195409,195420,195422,195501,195547,195556,195558,195587,195620,195635,195669,195687,195693,195710,195713,195716,195756,195760,195768,195777,195789,195792,195804,195827,195843-195844,195877,195887-195888,195897,195903,195905-195906,195932,195936-195943,195970,195983,196045,196048,196050,196058,196114-196115,196153,196206,196215,196370,196387,196423,196454,196459,196532
+/cfe/trunk:195126,195128,195135-195136,195146,195149,195154,195158,195163,195168,195174,195249,195268,195283,195303,195326,195329,195367,195384,195409,195420,195422,195501,195547,195556,195558,195587,195620,195635,195669,195687,195693,195710,195713,195716,195756,195760,195768,195777,195789,195792,195804,195827,195843-195844,195877,195887-195888,195897,195903,195905-195906,195932,195936-195943,195970,195983,196045,196048,196050,196058,196114-196115,196153,196206,196215,196370,196387,196423,196454,196459,196532,196538
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_34/lib/Driver/ToolChain.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_34/lib/Driver/ToolChain.cpp?rev=196597&r1=196596&r2=196597&view=diff
==============================================================================
--- cfe/branches/release_34/lib/Driver/ToolChain.cpp (original)
+++ cfe/branches/release_34/lib/Driver/ToolChain.cpp Fri Dec  6 13:12:59 2013
@@ -183,6 +183,11 @@ static const char *getARMTargetCPU(const
     MArch = Triple.getArchName();
   }
 
+  if (Triple.getOS() == llvm::Triple::NetBSD) {
+    if (MArch == "armv6")
+      return "arm1176jzf-s";
+  }
+
   const char *result = llvm::StringSwitch<const char *>(MArch)
     .Cases("armv2", "armv2a","arm2")
     .Case("armv3", "arm6")

Modified: cfe/branches/release_34/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_34/lib/Driver/Tools.cpp?rev=196597&r1=196596&r2=196597&view=diff
==============================================================================
--- cfe/branches/release_34/lib/Driver/Tools.cpp (original)
+++ cfe/branches/release_34/lib/Driver/Tools.cpp Fri Dec  6 13:12:59 2013
@@ -499,6 +499,11 @@ static std::string getARMTargetCPU(const
     MArch = Triple.getArchName();
   }
 
+  if (Triple.getOS() == llvm::Triple::NetBSD) {
+    if (MArch == "armv6")
+      return "arm1176jzf-s";
+  }
+
   // Handle -march=native.
   std::string NativeMArch;
   if (MArch == "native") {

Propchange: cfe/branches/release_34/test/Analysis/MismatchedDeallocator-checker-test.mm
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  6 13:12:59 2013
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite/test/Analysis/alloc-match-dealloc.mm:134693-134817
-/cfe/trunk/test/Analysis/MismatchedDeallocator-checker-test.mm:195983,196114,196387,196532
+/cfe/trunk/test/Analysis/MismatchedDeallocator-checker-test.mm:195983,196114,196387,196532,196538
 /cfe/trunk/test/SemaTemplate/test/Analysis/alloc-match-dealloc.mm:126920
 /cfe/trunk/test/test/Analysis/alloc-match-dealloc.mm:170344

Propchange: cfe/branches/release_34/test/Analysis/NewDelete-checker-test.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  6 13:12:59 2013
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite/test/Analysis/NewDelete-checker-test.mm:134693-134817
-/cfe/trunk/test/Analysis/NewDelete-checker-test.cpp:195983,196114,196387,196532
+/cfe/trunk/test/Analysis/NewDelete-checker-test.cpp:195983,196114,196387,196532,196538
 /cfe/trunk/test/SemaTemplate/test/Analysis/NewDelete-checker-test.mm:126920
 /cfe/trunk/test/test/Analysis/NewDelete-checker-test.mm:170344

Propchange: cfe/branches/release_34/test/SemaCXX/warn-unreachable.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  6 13:12:59 2013
@@ -1,2 +1,2 @@
 /cfe/branches/type-system-rewrite/test/SemaCXX/warn-unreachable.cpp:134693-134817
-/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,195983,196114,196387,196532
+/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,195983,196114,196387,196532,196538