diff --git a/openmp/libomptarget/DeviceRTL/include/Types.h b/openmp/libomptarget/DeviceRTL/include/Types.h
--- a/openmp/libomptarget/DeviceRTL/include/Types.h
+++ b/openmp/libomptarget/DeviceRTL/include/Types.h
@@ -202,12 +202,12 @@
 // TODO: clang should use address space 5 for omp_thread_mem_alloc, but right
 //       now that's not the case.
 #define THREAD_LOCAL(NAME)                                                     \
-  NAME [[clang::loader_uninitialized, clang::address_space(5)]]
+  [[clang::address_space(5)]] NAME [[clang::loader_uninitialized]]
 
 // TODO: clang should use address space 4 for omp_const_mem_alloc, maybe it
 //       does?
 #define CONSTANT(NAME)                                                         \
-  NAME [[clang::loader_uninitialized, clang::address_space(4)]]
+  [[clang::address_space(4)]] NAME [[clang::loader_uninitialized]]
 
 // Attribute to keep alive certain definition for the bitcode library.
 #ifdef LIBOMPTARGET_BC_TARGET