From 1314630ec352029b9e2413060e1e1b7e48c58f80 Mon Sep 17 00:00:00 2001
From: Aaron Watry <awatry@gmail.com>
Date: Tue, 3 Mar 2015 21:25:08 +0000
Subject: [PATCH] Move mix from math to common

It has been part of the common functions since 1.0

Signed-off-by: Aaron Watry <awatry@gmail.com>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
llvm-svn: 231137
---
 libclc/generic/include/clc/clc.h                    | 2 +-
 libclc/generic/include/clc/common/mix.h             | 2 ++
 libclc/generic/include/clc/{math => common}/mix.inc | 0
 libclc/generic/include/clc/math/mix.h               | 2 --
 libclc/generic/lib/SOURCES                          | 2 +-
 libclc/generic/lib/{math => common}/mix.cl          | 0
 libclc/generic/lib/{math => common}/mix.inc         | 0
 7 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 libclc/generic/include/clc/common/mix.h
 rename libclc/generic/include/clc/{math => common}/mix.inc (100%)
 delete mode 100644 libclc/generic/include/clc/math/mix.h
 rename libclc/generic/lib/{math => common}/mix.cl (100%)
 rename libclc/generic/lib/{math => common}/mix.inc (100%)

diff --git a/libclc/generic/include/clc/clc.h b/libclc/generic/include/clc/clc.h
index 92ef769dde58..ae611a516846 100644
--- a/libclc/generic/include/clc/clc.h
+++ b/libclc/generic/include/clc/clc.h
@@ -55,7 +55,6 @@
 #include <clc/math/log1p.h>
 #include <clc/math/log2.h>
 #include <clc/math/mad.h>
-#include <clc/math/mix.h>
 #include <clc/math/nextafter.h>
 #include <clc/math/pow.h>
 #include <clc/math/pown.h>
@@ -110,6 +109,7 @@
 /* 6.11.4 Common Functions */
 #include <clc/common/degrees.h>
 #include <clc/common/radians.h>
+#include <clc/common/mix.h>
 #include <clc/common/sign.h>
 #include <clc/common/smoothstep.h>
 #include <clc/common/step.h>
diff --git a/libclc/generic/include/clc/common/mix.h b/libclc/generic/include/clc/common/mix.h
new file mode 100644
index 000000000000..262861c687b5
--- /dev/null
+++ b/libclc/generic/include/clc/common/mix.h
@@ -0,0 +1,2 @@
+#define __CLC_BODY <clc/common/mix.inc>
+#include <clc/math/gentype.inc>
diff --git a/libclc/generic/include/clc/math/mix.inc b/libclc/generic/include/clc/common/mix.inc
similarity index 100%
rename from libclc/generic/include/clc/math/mix.inc
rename to libclc/generic/include/clc/common/mix.inc
diff --git a/libclc/generic/include/clc/math/mix.h b/libclc/generic/include/clc/math/mix.h
deleted file mode 100644
index c3c95c1f0c4b..000000000000
--- a/libclc/generic/include/clc/math/mix.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define __CLC_BODY <clc/math/mix.inc>
-#include <clc/math/gentype.inc>
diff --git a/libclc/generic/lib/SOURCES b/libclc/generic/lib/SOURCES
index f0488ef9e67e..8411b8f0273e 100644
--- a/libclc/generic/lib/SOURCES
+++ b/libclc/generic/lib/SOURCES
@@ -28,6 +28,7 @@ cl_khr_local_int32_extended_atomics/atom_or.cl
 cl_khr_local_int32_extended_atomics/atom_xor.cl
 convert.cl
 common/degrees.cl
+common/mix.cl
 common/radians.cl
 common/sign.cl
 common/smoothstep.cl
@@ -71,7 +72,6 @@ math/hypot.cl
 math/log10.cl
 math/log1p.cl
 math/mad.cl
-math/mix.cl
 math/tables.cl
 math/clc_nextafter.cl
 math/nextafter.cl
diff --git a/libclc/generic/lib/math/mix.cl b/libclc/generic/lib/common/mix.cl
similarity index 100%
rename from libclc/generic/lib/math/mix.cl
rename to libclc/generic/lib/common/mix.cl
diff --git a/libclc/generic/lib/math/mix.inc b/libclc/generic/lib/common/mix.inc
similarity index 100%
rename from libclc/generic/lib/math/mix.inc
rename to libclc/generic/lib/common/mix.inc