Move clcmacro.h to avoid cluttering user namespace v2

v2: - use quotes instead of <>
    - add include to r600/lib/math/nextafter.c changed

Reviewed-by: Tom Stellard <tom@stellard.net>
Reviewed-by: Aaron Watry <awatry@gmail.com>
llvm-svn: 211576

10 files changed, 8 insertions, 3 deletions

diff --git a/libclc/generic/include/clc/clc.h b/libclc/generic/include/clc/clc.h
index a975c0d33f2..c7c8dfbe178 100644
--- a/libclc/generic/include/clc/clc.h
+++ b/libclc/generic/include/clc/clc.h
@@ -11,9 +11,6 @@
 /* Function Attributes */
 #include <clc/clcfunc.h>
 
-/* Pattern Macro Definitions */
-#include <clc/clcmacro.h>
-
 /* 6.1 Supported Data Types */
 #include <clc/clctypes.h>
 
diff --git a/libclc/generic/include/clc/clcmacro.h b/libclc/generic/lib/clcmacro.h
index 730073ae1f9..730073ae1f9 100644
--- a/libclc/generic/include/clc/clcmacro.h
+++ b/libclc/generic/lib/clcmacro.h
diff --git a/libclc/generic/lib/common/sign.cl b/libclc/generic/lib/common/sign.cl
index 070abd55db6..25832e0b4f8 100644
--- a/libclc/generic/lib/common/sign.cl
+++ b/libclc/generic/lib/common/sign.cl
@@ -1,4 +1,5 @@
 #include <clc/clc.h>
+#include "../clcmacro.h"
 
 #define SIGN(TYPE, F) \
 _CLC_DEF _CLC_OVERLOAD TYPE sign(TYPE x) { \
diff --git a/libclc/generic/lib/integer/add_sat.cl b/libclc/generic/lib/integer/add_sat.cl
index 7eb4e3974ef..d4df66db3ed 100644
--- a/libclc/generic/lib/integer/add_sat.cl
+++ b/libclc/generic/lib/integer/add_sat.cl
@@ -1,4 +1,5 @@
 #include <clc/clc.h>
+#include "../clcmacro.h"
 
 // From add_sat.ll
 _CLC_DECL char   __clc_add_sat_s8(char, char);
diff --git a/libclc/generic/lib/integer/clz.cl b/libclc/generic/lib/integer/clz.cl
index 83ef2dd800c..17e3fe01474 100644
--- a/libclc/generic/lib/integer/clz.cl
+++ b/libclc/generic/lib/integer/clz.cl
@@ -1,4 +1,5 @@
 #include <clc/clc.h>
+#include "../clcmacro.h"
 
 // From clz.ll
 _CLC_DECL char   __clc_clz_s8(char);
diff --git a/libclc/generic/lib/integer/sub_sat.cl b/libclc/generic/lib/integer/sub_sat.cl
index 9555b6d7179..6b42cc86a74 100644
--- a/libclc/generic/lib/integer/sub_sat.cl
+++ b/libclc/generic/lib/integer/sub_sat.cl
@@ -1,4 +1,5 @@
 #include <clc/clc.h>
+#include "../clcmacro.h"
 
 // From sub_sat.ll
 _CLC_DECL char   __clc_sub_sat_s8(char, char);
diff --git a/libclc/generic/lib/math/clc_nextafter.cl b/libclc/generic/lib/math/clc_nextafter.cl
index 92b990d1383..e53837d179f 100644
--- a/libclc/generic/lib/math/clc_nextafter.cl
+++ b/libclc/generic/lib/math/clc_nextafter.cl
@@ -1,4 +1,5 @@
 #include <clc/clc.h>
+#include "../clcmacro.h"
 
 // This file provides OpenCL C implementations of nextafter for targets that
 // don't support the clang builtin.
diff --git a/libclc/generic/lib/math/nextafter.cl b/libclc/generic/lib/math/nextafter.cl
index 1a7f1699bdc..cbe54cd4e26 100644
--- a/libclc/generic/lib/math/nextafter.cl
+++ b/libclc/generic/lib/math/nextafter.cl
@@ -1,4 +1,5 @@
 #include <clc/clc.h>
+#include "../clcmacro.h"
 
 _CLC_DEFINE_BINARY_BUILTIN(float, nextafter, __builtin_nextafterf, float, float)
 
diff --git a/libclc/generic/lib/math/pown.cl b/libclc/generic/lib/math/pown.cl
index 46b354b5eaa..f3b27d4ccab 100644
--- a/libclc/generic/lib/math/pown.cl
+++ b/libclc/generic/lib/math/pown.cl
@@ -1,4 +1,5 @@
 #include <clc/clc.h>
+#include "../clcmacro.h"
 
 _CLC_BINARY_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, float, pown, float, int)
 
diff --git a/libclc/generic/lib/relational/isnan.cl b/libclc/generic/lib/relational/isnan.cl
index 1a64f67dbd2..ab5d58a9208 100644
--- a/libclc/generic/lib/relational/isnan.cl
+++ b/libclc/generic/lib/relational/isnan.cl
@@ -1,4 +1,5 @@
 #include <clc/clc.h>
+#include "../clcmacro.h"
 
 _CLC_DEFINE_UNARY_BUILTIN(int, isnan, __builtin_isnan, float)