commit 0e2c34f92f00628d48968dfea096d36381f494cb
author Stephen Hines <srhines@google.com> Mon Mar 23 12:09:02 2015 -0700
committer Stephen Hines <srhines@google.com> Tue Mar 31 17:07:53 2015 -0700
tree 03a142fc9174f13e1e3120853592c56778f14fe5
parent f6595cb19f570efe109abe570c726ebd7afd3973

Update aosp/master clang for rebase to r230699.

Change-Id: I6a546ab3d4ae37119eebb735e102cca4f80ab520

lib/Sema/DeclSpec.cpp

diff --git a/lib/Sema/DeclSpec.cpp b/lib/Sema/DeclSpec.cpp
index 7b2e7ff..7bf3e51 100644
--- a/lib/Sema/DeclSpec.cpp
+++ b/lib/Sema/DeclSpec.cpp
@@ -508,14 +508,14 @@
     case SCS_private_extern:
     case SCS_static:
         if (S.getLangOpts().OpenCLVersion < 120) {
-          DiagID   = diag::err_not_opencl_storage_class_specifier;
+          DiagID   = diag::err_opencl_unknown_type_specifier;
           PrevSpec = getSpecifierName(SC);
           return true;
         }
         break;
     case SCS_auto:
     case SCS_register:
-      DiagID   = diag::err_not_opencl_storage_class_specifier;
+      DiagID   = diag::err_opencl_unknown_type_specifier;
       PrevSpec = getSpecifierName(SC);
       return true;
     default: