Index: lib/Basic/Targets.cpp
===================================================================
--- lib/Basic/Targets.cpp
+++ lib/Basic/Targets.cpp
@@ -2087,29 +2087,30 @@
     return true;
   }
 
-   void setSupportedOpenCLOpts() override {
-     auto &Opts = getSupportedOpenCLOpts();
-     Opts.cl_clang_storage_class_specifiers = 1;
-     Opts.cl_khr_gl_sharing = 1;
-     Opts.cl_khr_gl_event = 1;
-     Opts.cl_khr_d3d10_sharing = 1;
-     Opts.cl_khr_subgroups = 1;
-
-     if (hasFP64)
-       Opts.cl_khr_fp64 = 1;
-     if (GPU >= GK_NORTHERN_ISLANDS) {
-       Opts.cl_khr_byte_addressable_store = 1;
-       Opts.cl_khr_global_int32_base_atomics = 1;
-       Opts.cl_khr_global_int32_extended_atomics = 1;
-       Opts.cl_khr_local_int32_base_atomics = 1;
-       Opts.cl_khr_local_int32_extended_atomics = 1;
-     }
-     if (GPU >= GK_SOUTHERN_ISLANDS)
-       Opts.cl_khr_fp16 = 1;
-       Opts.cl_khr_int64_base_atomics = 1;
-       Opts.cl_khr_int64_extended_atomics = 1;
-       Opts.cl_khr_3d_image_writes = 1;
-       Opts.cl_khr_gl_msaa_sharing = 1;
+  void setSupportedOpenCLOpts() override {
+    auto &Opts = getSupportedOpenCLOpts();
+    Opts.cl_clang_storage_class_specifiers = 1;
+    Opts.cl_khr_gl_sharing = 1;
+    Opts.cl_khr_gl_event = 1;
+    Opts.cl_khr_d3d10_sharing = 1;
+    Opts.cl_khr_subgroups = 1;
+
+    if (hasFP64)
+      Opts.cl_khr_fp64 = 1;
+    if (GPU >= GK_EVERGREEN) {
+      Opts.cl_khr_byte_addressable_store = 1;
+      Opts.cl_khr_global_int32_base_atomics = 1;
+      Opts.cl_khr_global_int32_extended_atomics = 1;
+      Opts.cl_khr_local_int32_base_atomics = 1;
+      Opts.cl_khr_local_int32_extended_atomics = 1;
+    }
+    if (GPU >= GK_SOUTHERN_ISLANDS) {
+      Opts.cl_khr_fp16 = 1;
+      Opts.cl_khr_int64_base_atomics = 1;
+      Opts.cl_khr_int64_extended_atomics = 1;
+      Opts.cl_khr_3d_image_writes = 1;
+      Opts.cl_khr_gl_msaa_sharing = 1;
+    }
   }
 };
 
Index: test/Misc/amdgcn.languageOptsOpenCL.cl
===================================================================
--- /dev/null
+++ test/Misc/amdgcn.languageOptsOpenCL.cl
@@ -0,0 +1,22 @@
+// REQUIRES: amdgpu-registered-target
+// RUN: %clang_cc1 -x cl %s -verify -triple amdgcn-unknown-unknown -Werror
+// expected-no-diagnostics
+
+#pragma EXTENSION cl_clang_storage_class_specifiers: enabled
+#pragma EXTENSION cl_khr_gl_sharing: enabled
+#pragma EXTENSION cl_khr_gl_event: enabled
+#pragma EXTENSION cl_khr_subgroups: enabled
+
+
+#pragma EXTENSION cl_khr_fp64: enabled
+#pragma EXTENSION cl_khr_byte_addressable_storage: enabled
+#pragma EXTENSION cl_khr_global_int32_base_atomics: enabled
+#pragma EXTENSION cl_khr_global_int32_extended_atomics: enabled
+#pragma EXTENSION cl_khr_local_int32_base_atomics: enabled
+#pragma EXTENSION cl_khr_local_int32_extended_atomics: enabled
+
+#pragma EXTENSION cl_khr_fp16: enabled
+#pragma EXTENSION cl_khr_int64_base_atomics: enabled
+#pragma EXTENSION cl_khr_int64_extended_atomics: enabled
+#pragma EXTENSION cl_khr_3d_image_writes: enabled
+#pragma EXTENSION cl_gl_msaa_sharing: enabled
Index: test/Misc/r600.languageOptsOpenCL.cl
===================================================================
--- /dev/null
+++ test/Misc/r600.languageOptsOpenCL.cl
@@ -0,0 +1,16 @@
+// REQUIRES: amdgpu-registered-target
+// RUN: %clang_cc1 -x cl %s -verify -triple r600-unknown-unknown -target-cpu cayman -Werror
+// RUN: %clang_cc1 -x cl %s -verify -triple r600-unknown-unknown -target-cpu cypress -Werror
+// RUN: %clang_cc1 -x cl %s -verify -triple r600-unknown-unknown -target-cpu turks -Werror
+// expected-no-diagnostics
+
+#pragma OPENCL EXTENSION cl_clang_storage_class_specifiers: enable
+
+#ifdef cl_khr_fp64
+#pragma OPENCL EXTENSION cl_khr_fp64: enable
+#endif
+#pragma OPENCL EXTENSION cl_khr_byte_addressable_store: enable
+#pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics: enable
+#pragma OPENCL EXTENSION cl_khr_global_int32_extended_atomics: enable
+#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics: enable
+#pragma OPENCL EXTENSION cl_khr_local_int32_extended_atomics: enable