3 files changed, 9 insertions, 26 deletions
diff --git a/libclc/r600/lib/synchronization/barrier.cl b/libclc/r600/lib/synchronization/barrier.cl
new file mode 100644
index 00000000000..98200e7eda9
--- /dev/null
+++ b/libclc/r600/lib/synchronization/barrier.cl
@@ -0,0 +1,9 @@
+#include <clc/clc.h>
+
+_CLC_DEF void __clc_r600_barrier(void) __asm("llvm.r600.group.barrier");
+
+_CLC_DEF void barrier(uint flags)
+{
+  // We should call mem_fence here, but that is not implemented for r600 yet
+  __clc_r600_barrier();
+}
diff --git a/libclc/r600/lib/synchronization/barrier_impl.39.ll b/libclc/r600/lib/synchronization/barrier_impl.39.ll
deleted file mode 100644
index 3bd3167697a..00000000000
--- a/libclc/r600/lib/synchronization/barrier_impl.39.ll
+++ /dev/null
@@ -1,13 +0,0 @@
-declare void @llvm.r600.group.barrier() #0
-
-target datalayout = "e-p:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64"
-
-define void @barrier(i32 %flags) #1 {
-entry:
-  ; We should call mem_fence here, but that is not implemented for r600 yet
-  tail call void @llvm.r600.group.barrier()
-  ret void
-}
-
-attributes #0 = { nounwind convergent }
-attributes #1 = { nounwind convergent alwaysinline }
diff --git a/libclc/r600/lib/synchronization/barrier_impl.ll b/libclc/r600/lib/synchronization/barrier_impl.ll
deleted file mode 100644
index f1cbc9aed86..00000000000
--- a/libclc/r600/lib/synchronization/barrier_impl.ll
+++ /dev/null
@@ -1,13 +0,0 @@
-declare void @llvm.r600.group.barrier() #0
-
-target datalayout = "e-p:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64-S32-A5"
-
-define void @barrier(i32 %flags) #1 {
-entry:
-  ; We should call mem_fence here, but that is not implemented for r600 yet
-  tail call void @llvm.r600.group.barrier()
-  ret void
-}
-
-attributes #0 = { nounwind convergent }
-attributes #1 = { nounwind convergent alwaysinline }