Revert "[OpenCL] Move OpenCLBuiltins.td and remove unused include"

This reverts commit r363242 as it broke some builds with

  make[2]: *** No rule to make target 'ClangOpenCLBuiltinsImpl', needed by
  'tools/clang/lib/Sema/CMakeFiles/obj.clangSema.dir/SemaLookup.cpp.o'.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@363376 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Basic/CMakeLists.txt b/include/clang/Basic/CMakeLists.txt
index 15bed5adec9e16efa4c5921cc1a1564f635c7172..e26e683b9aba630e5d1d1e523bc3eb79daea2b33 100644 (file)
--- a/include/clang/Basic/CMakeLists.txt
+++ b/include/clang/Basic/CMakeLists.txt
@@ -41,6 +41,12 @@ clang_tablegen(AttrHasAttributeImpl.inc -gen-clang-attr-has-attribute-impl
   TARGET ClangAttrHasAttributeImpl
   )
 
+clang_tablegen(OpenCLBuiltins.inc
+  -I ${CMAKE_CURRENT_SOURCE_DIR}/../../ -gen-clang-opencl-builtins
+  SOURCE OpenCLBuiltins.td
+  TARGET ClangOpenCLBuiltinsImpl
+  )
+
 # ARM NEON
 clang_tablegen(arm_neon.inc -gen-arm-neon-sema
   SOURCE arm_neon.td

diff --git a/lib/Sema/OpenCLBuiltins.td b/include/clang/Basic/OpenCLBuiltins.td
similarity index 100%
rename from lib/Sema/OpenCLBuiltins.td
rename to include/clang/Basic/OpenCLBuiltins.td

diff --git a/lib/Sema/CMakeLists.txt b/lib/Sema/CMakeLists.txt
index 60560ef0f622791ba3104a34ba9596c058b7fb7c..1684e2a1ca6cbfe6cd05a47ac962960f17fa2a82 100644 (file)
--- a/lib/Sema/CMakeLists.txt
+++ b/lib/Sema/CMakeLists.txt
@@ -66,10 +66,3 @@ add_clang_library(clangSema
   clangEdit
   clangLex
   )
-
-clang_tablegen(OpenCLBuiltins.inc -gen-clang-opencl-builtins
-  SOURCE OpenCLBuiltins.td
-  TARGET ClangOpenCLBuiltinsImpl
-  )
-
-set_source_files_properties(SemaLookup.cpp OBJECT_DEPENDS ClangOpenCLBuiltinsImpl)

diff --git a/lib/Sema/SemaLookup.cpp b/lib/Sema/SemaLookup.cpp
index 086f90f5e93a73474aa909fc099b1eafc0541a77..7643a06a82f79f970e855c6878f0925f04ee282d 100644 (file)
--- a/lib/Sema/SemaLookup.cpp
+++ b/lib/Sema/SemaLookup.cpp
@@ -46,7 +46,7 @@
 #include <utility>
 #include <vector>
 
-#include "OpenCLBuiltins.inc"
+#include "clang/Basic/OpenCLBuiltins.inc"
 
 using namespace clang;
 using namespace sema;