[llvm-branch-commits] [cfe-branch] r196134 - Merging r196114:

[Bill Wendling]

Author: void
Date: Mon Dec  2 13:19:57 2013
New Revision: 196134

URL: http://llvm.org/viewvc/llvm-project?rev=196134&view=rev
Log:
Merging r196114:
------------------------------------------------------------------------
r196114 | joerg | 2013-12-02 08:09:34 -0800 (Mon, 02 Dec 2013) | 2 lines

NetBSD uses long derived size_t / ssize_t in all ARM ABIs.

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

Modified:
    cfe/branches/release_34/   (props changed)
    cfe/branches/release_34/lib/Basic/Targets.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 Mon Dec  2 13:19:57 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
+/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
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_34/lib/Basic/Targets.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_34/lib/Basic/Targets.cpp?rev=196134&r1=196133&r2=196134&view=diff
==============================================================================
--- cfe/branches/release_34/lib/Basic/Targets.cpp (original)
+++ cfe/branches/release_34/lib/Basic/Targets.cpp Mon Dec  2 13:19:57 2013
@@ -3706,15 +3706,17 @@ public:
       : TargetInfo(Triple), ABI("aapcs-linux"), CPU("arm1136j-s"),
         FPMath(FP_Default), IsAAPCS(true) {
     BigEndian = false;
-    SizeType = UnsignedInt;
-    PtrDiffType = SignedInt;
     switch (getTriple().getOS()) {
     case llvm::Triple::NetBSD:
+      SizeType = UnsignedLong;
+      PtrDiffType = SignedLong;
       WCharType = SignedInt;
       break;
     default:
       // AAPCS 7.1.1, ARM-Linux ABI 2.4: type of wchar_t is unsigned int.
       WCharType = UnsignedInt;
+      SizeType = UnsignedInt;
+      PtrDiffType = SignedInt;
       break;
     }
 

Propchange: cfe/branches/release_34/test/Analysis/MismatchedDeallocator-checker-test.mm
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec  2 13:19:57 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
+/cfe/trunk/test/Analysis/MismatchedDeallocator-checker-test.mm:195983,196114
 /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 Mon Dec  2 13:19:57 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
+/cfe/trunk/test/Analysis/NewDelete-checker-test.cpp:195983,196114
 /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 Mon Dec  2 13:19:57 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
+/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,195983,196114