From 1de1444d6254604b5d410ae81e09e32e56cc7a95 Mon Sep 17 00:00:00 2001
From: Jan Vesely <jan.vesely@rutgers.edu>
Date: Sun, 8 Oct 2017 19:33:58 +0000
Subject: [PATCH] Do not include clc_nextafter header globally

Drop unused clc/math/clc_nextafter.h header

Reviewer: Jeroen Ketema
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
llvm-svn: 315190
---
 libclc/amdgpu/lib/math/nextafter.cl             |  1 +
 libclc/generic/include/clc/clc.h                |  5 -----
 libclc/generic/include/clc/math/clc_nextafter.h | 11 -----------
 libclc/generic/include/clc/math/gentype.inc     |  2 ++
 4 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 libclc/generic/include/clc/math/clc_nextafter.h

diff --git a/libclc/amdgpu/lib/math/nextafter.cl b/libclc/amdgpu/lib/math/nextafter.cl
index 6aee0a0c0654..5b4521d21c26 100644
--- a/libclc/amdgpu/lib/math/nextafter.cl
+++ b/libclc/amdgpu/lib/math/nextafter.cl
@@ -1,5 +1,6 @@
 #include <clc/clc.h>
 #include "../lib/clcmacro.h"
+#include <math/clc_nextafter.h>
 
 _CLC_DEFINE_BINARY_BUILTIN(float, nextafter, __clc_nextafter, float, float)
 
diff --git a/libclc/generic/include/clc/clc.h b/libclc/generic/include/clc/clc.h
index adaab909f736..3701336ad1a7 100644
--- a/libclc/generic/include/clc/clc.h
+++ b/libclc/generic/include/clc/clc.h
@@ -264,9 +264,4 @@
 #include <clc/image/image_defines.h>
 #include <clc/image/image.h>
 
-/* libclc internal defintions */
-#ifdef __CLC_INTERNAL
-#include <math/clc_nextafter.h>
-#endif
-
 #pragma OPENCL EXTENSION all : disable
diff --git a/libclc/generic/include/clc/math/clc_nextafter.h b/libclc/generic/include/clc/math/clc_nextafter.h
deleted file mode 100644
index 81c8f369c3bd..000000000000
--- a/libclc/generic/include/clc/math/clc_nextafter.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#define __CLC_BODY <clc/math/binary_decl.inc>
-
-#define __CLC_FUNCTION nextafter
-#include <clc/math/gentype.inc>
-#undef __CLC_FUNCTION
-
-#define __CLC_FUNCTION __clc_nextafter
-#include <clc/math/gentype.inc>
-#undef __CLC_FUNCTION
-
-#undef __CLC_BODY
diff --git a/libclc/generic/include/clc/math/gentype.inc b/libclc/generic/include/clc/math/gentype.inc
index e6ffad104b5b..954cd0005028 100644
--- a/libclc/generic/include/clc/math/gentype.inc
+++ b/libclc/generic/include/clc/math/gentype.inc
@@ -54,6 +54,8 @@
 
 #ifndef __FLOAT_ONLY
 #ifdef cl_khr_fp64
+#pragma OPENCL EXTENSION cl_khr_fp64 : enable
+
 #define __CLC_SCALAR_GENTYPE double
 #define __CLC_FPSIZE 64