[llvm-branch-commits] [cfe-branch] r214748 - Merging r213999:

[Bill Wendling]

Author: void
Date: Mon Aug  4 13:36:16 2014
New Revision: 214748

URL: http://llvm.org/viewvc/llvm-project?rev=214748&view=rev
Log:
Merging r213999:
------------------------------------------------------------------------
r213999 | tstellar | 2014-07-25 18:05:20 -0700 (Fri, 25 Jul 2014) | 1 line

R600: Add processor type for Mullins
------------------------------------------------------------------------

Modified:
    cfe/branches/release_35/   (props changed)
    cfe/branches/release_35/lib/Basic/Targets.cpp
    cfe/branches/release_35/test/Driver/r600-mcpu.cl

Propchange: cfe/branches/release_35/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug  4 13:36:16 2014
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:213609,213611,213613,213741,213840,213902,213912,213993,213998,214008,214050,214119,214208,214222,214369,214390,214471
+/cfe/trunk:213609,213611,213613,213741,213840,213902,213912,213993,213998-213999,214008,214050,214119,214208,214222,214369,214390,214471
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_35/lib/Basic/Targets.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_35/lib/Basic/Targets.cpp?rev=214748&r1=214747&r2=214748&view=diff
==============================================================================
--- cfe/branches/release_35/lib/Basic/Targets.cpp (original)
+++ cfe/branches/release_35/lib/Basic/Targets.cpp Mon Aug  4 13:36:16 2014
@@ -1566,6 +1566,7 @@ public:
       .Case("kabini",   GK_SEA_ISLANDS)
       .Case("kaveri",   GK_SEA_ISLANDS)
       .Case("hawaii",   GK_SEA_ISLANDS)
+      .Case("mullins",  GK_SEA_ISLANDS)
       .Default(GK_NONE);
 
     if (GPU == GK_NONE) {

Modified: cfe/branches/release_35/test/Driver/r600-mcpu.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_35/test/Driver/r600-mcpu.cl?rev=214748&r1=214747&r2=214748&view=diff
==============================================================================
--- cfe/branches/release_35/test/Driver/r600-mcpu.cl (original)
+++ cfe/branches/release_35/test/Driver/r600-mcpu.cl Mon Aug  4 13:36:16 2014
@@ -34,6 +34,7 @@
 // RUN: %clang -### -target r600 -x cl -S -emit-llvm -mcpu=kabini %s -o - 2>&1 | FileCheck --check-prefix=KABINI-CHECK %s
 // RUN: %clang -### -target r600 -x cl -S -emit-llvm -mcpu=kaveri %s -o - 2>&1 | FileCheck --check-prefix=KAVERI-CHECK %s
 // RUN: %clang -### -target r600 -x cl -S -emit-llvm -mcpu=hawaii %s -o - 2>&1 | FileCheck --check-prefix=HAWAII-CHECK %s
+// RUN: %clang -### -target r600 -x cl -S -emit-llvm -mcpu=mullins %s -o - 2>&1 | FileCheck --check-prefix=MULLINS-CHECK %s
 
 // R600-CHECK:  "-target-cpu" "r600"
 // RS880-CHECK: "-target-cpu" "rs880"
@@ -58,3 +59,4 @@
 // KABINI-CHECK: "-target-cpu" "kabini"
 // KAVERI-CHECK: "-target-cpu" "kaveri"
 // HAWAII-CHECK: "-target-cpu" "hawaii"
+// MULLINS-CHECK: "-target-cpu" "mullins"