From: Sven van Haastregt <sven.vanhaastregt@arm.com>
Date: Fri, 14 Jun 2019 12:14:58 +0000 (+0000)
Subject: Revert "[OpenCL] Move OpenCLBuiltins.td and remove unused include"
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e412648982c8b0b929cc25a749c146625714b17a;p=clang

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 15bed5adec..e26e683b9a 100644
--- 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 60560ef0f6..1684e2a1ca 100644
--- 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 086f90f5e9..7643a06a82 100644
--- 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;