[llvm-branch-commits] [cfe-branch] r234893 - Merge r234629:

[Joerg Sonnenberger]

Author: joerg
Date: Tue Apr 14 09:39:34 2015
New Revision: 234893

URL: http://llvm.org/viewvc/llvm-project?rev=234893&view=rev
Log:
Merge r234629:
Create correct platform-specific target for NetBSD PPC64LE.

Modified:
    cfe/branches/release_36/   (props changed)
    cfe/branches/release_36/lib/Basic/Targets.cpp

Propchange: cfe/branches/release_36/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 14 09:39:34 2015
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:226008,226049,226136,226282,226382,226384,226624,226707,226754,226863,226877,227062,227088,227220,227251,227278,227295,227368,227393,227861,227979,228053,228464,228785,228792,229408,229719,230255,231245,231280,231986,232389,233819
+/cfe/trunk:226008,226049,226136,226282,226382,226384,226624,226707,226754,226863,226877,227062,227088,227220,227251,227278,227295,227368,227393,227861,227979,228053,228464,228785,228792,229408,229719,230255,231245,231280,231986,232389,233819,234629
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_36/lib/Basic/Targets.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_36/lib/Basic/Targets.cpp?rev=234893&r1=234892&r2=234893&view=diff
==============================================================================
--- cfe/branches/release_36/lib/Basic/Targets.cpp (original)
+++ cfe/branches/release_36/lib/Basic/Targets.cpp Tue Apr 14 09:39:34 2015
@@ -6673,6 +6673,8 @@ static TargetInfo *AllocateTarget(const
     switch (os) {
     case llvm::Triple::Linux:
       return new LinuxTargetInfo<PPC64TargetInfo>(Triple);
+    case llvm::Triple::NetBSD:
+      return new NetBSDTargetInfo<PPC64TargetInfo>(Triple);
     default:
       return new PPC64TargetInfo(Triple);
     }