[llvm-branch-commits] [cfe-branch] r287093 - Merge r280672, per bug 30839:

[Ed Schouten via llvm-branch-commits]

Author: ed
Date: Wed Nov 16 04:18:17 2016
New Revision: 287093

URL: http://llvm.org/viewvc/llvm-project?rev=287093&view=rev
Log:
Merge r280672, per bug 30839:

  Add support for targeting armv6-unknown-cloudabi-eabihf.

  I'm in the progress of adding ARMv6 support to CloudABI. On the compiler
  side, everything seems to work properly with this tiny change applied.

Modified:
    cfe/branches/release_39/   (props changed)
    cfe/branches/release_39/lib/Basic/Targets.cpp
    cfe/branches/release_39/test/Preprocessor/init.c

Propchange: cfe/branches/release_39/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 16 04:18:17 2016
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:275880,275967,276102,276350,276361,276473,276653,276716,276887,276891,276900,276979,276983,277095,277138,277141,277221,277307,277522,277743,277783,277796-277797,277852,277866,277889,277900,278139,278156,278234-278235,278393,278395,278763,278786,278988,284110,284229,286103,286106,286129,286584,286944,286953,287025
+/cfe/trunk:275880,275967,276102,276350,276361,276473,276653,276716,276887,276891,276900,276979,276983,277095,277138,277141,277221,277307,277522,277743,277783,277796-277797,277852,277866,277889,277900,278139,278156,278234-278235,278393,278395,278763,278786,278988,280672,284110,284229,286103,286106,286129,286584,286944,286953,287025
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_39/lib/Basic/Targets.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_39/lib/Basic/Targets.cpp?rev=287093&r1=287092&r2=287093&view=diff
==============================================================================
--- cfe/branches/release_39/lib/Basic/Targets.cpp (original)
+++ cfe/branches/release_39/lib/Basic/Targets.cpp Wed Nov 16 04:18:17 2016
@@ -8170,6 +8170,8 @@ static TargetInfo *AllocateTarget(const
       return new DarwinARMTargetInfo(Triple, Opts);
 
     switch (os) {
+    case llvm::Triple::CloudABI:
+      return new CloudABITargetInfo<ARMleTargetInfo>(Triple, Opts);
     case llvm::Triple::Linux:
       return new LinuxTargetInfo<ARMleTargetInfo>(Triple, Opts);
     case llvm::Triple::FreeBSD:

Modified: cfe/branches/release_39/test/Preprocessor/init.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_39/test/Preprocessor/init.c?rev=287093&r1=287092&r2=287093&view=diff
==============================================================================
--- cfe/branches/release_39/test/Preprocessor/init.c (original)
+++ cfe/branches/release_39/test/Preprocessor/init.c Wed Nov 16 04:18:17 2016
@@ -1975,6 +1975,11 @@
 // ARMEABIHARDFP:#define __arm 1
 // ARMEABIHARDFP:#define __arm__ 1
 
+// RUN: %clang_cc1 -E -dM -ffreestanding -triple=armv6-unknown-cloudabi-eabihf < /dev/null | FileCheck -match-full-lines -check-prefix ARMV6-CLOUDABI %s
+//
+// ARMV6-CLOUDABI:#define __CloudABI__ 1
+// ARMV6-CLOUDABI:#define __arm__ 1
+
 // RUN: %clang_cc1 -E -dM -ffreestanding -triple=arm-netbsd-eabi < /dev/null | FileCheck -match-full-lines -check-prefix ARM-NETBSD %s
 //
 // ARM-NETBSD-NOT:#define _LP64