Rename common_clang to opencl_clang (#404)

Author: wenju-he

CMakeLists.txt

@@ -101,10 +101,10 @@ else (WIN32)
 endif (WIN32)
 
 # set that name of the main output file as a target name
-if (NOT DEFINED COMMON_CLANG_LIBRARY_NAME)
-    set(COMMON_CLANG_LIBRARY_NAME "opencl-clang")
+if (NOT DEFINED OPENCL_CLANG_LIBRARY_NAME)
+    set(OPENCL_CLANG_LIBRARY_NAME "opencl-clang")
 endif()
-set(TARGET_NAME ${COMMON_CLANG_LIBRARY_NAME}${BUILD_PLATFORM} )
+set(TARGET_NAME ${OPENCL_CLANG_LIBRARY_NAME}${BUILD_PLATFORM} )
 
 # PCH_EXTENSION can override PCH extension map in options_compile.cpp.
 # Example: "cl_khr_3d_image_writes,cl_khr_depth_images"
@@ -187,7 +187,7 @@ add_public_tablegen_target(CClangCompileOptions)
 # Source code
 #
 set(TARGET_INCLUDE_FILES
-    common_clang.h
+    opencl_clang.h
     options.h
     binary_result.h
     pch_mgr.h
@@ -196,7 +196,7 @@ set(TARGET_INCLUDE_FILES
 )
 
 set(TARGET_SOURCE_FILES
-    common_clang.cpp
+    opencl_clang.cpp
     options.cpp
     pch_mgr.cpp
     options_compile.cpp
@@ -213,7 +213,7 @@ set (LLVM_VER_MINOR ${LLVM_VERSION_MINOR} )
 
 add_definitions( -D__STDC_LIMIT_MACROS )
 add_definitions( -D__STDC_CONSTANT_MACROS )
-add_definitions( -DCOMMON_CLANG_EXPORTS )
+add_definitions( -DOPENCL_CLANG_EXPORTS )
 
 #
 # Include directories
@@ -308,7 +308,7 @@ if (WIN32)
 
 elseif(UNIX)
     set_property(TARGET ${TARGET_NAME} APPEND_STRING PROPERTY
-        COMPILE_DEFINITIONS LIBCOMMON_CLANG_NAME="$<TARGET_SONAME_FILE_NAME:${TARGET_NAME}>")
+        COMPILE_DEFINITIONS LIBOPENCL_CLANG_NAME="$<TARGET_SONAME_FILE_NAME:${TARGET_NAME}>")
 
     set_property(TARGET ${TARGET_NAME} APPEND_STRING PROPERTY
         LINK_FLAGS " -Wl,--no-undefined")
@@ -359,7 +359,7 @@ target_link_libraries( ${TARGET_NAME}
                        ${OTHER_LIBRARIES}
                       )
 
-install(FILES common_clang.h
+install(FILES opencl_clang.h
         DESTINATION include/cclang
         COMPONENT ${TARGET_NAME})
 
@@ -384,5 +384,5 @@ if (WIN32)
     endif(INSTALL_PDBS)
     install(FILES ${RT_OUTPUT_DIRECTORY}/\${BUILD_TYPE}/${TARGET_NAME}_stripped.pdb DESTINATION bin)
 else (WIN32)
-    SET_LINUX_EXPORTS_FILE( ${TARGET_NAME} common_clang.map )
+    SET_LINUX_EXPORTS_FILE( ${TARGET_NAME} opencl_clang.map )
 endif(WIN32)

binary_result.h

@@ -18,7 +18,7 @@ Copyright (c) Intel Corporation (2009-2017).
 
 #pragma once
 
-#include "common_clang.h"
+#include "opencl_clang.h"
 #include "llvm/ADT/SmallVector.h"
 #include <string>
 

common_clang.cpp renamed to opencl_clang.cpp

@@ -12,11 +12,11 @@ Copyright (c) Intel Corporation (2009-2017).
     use of the code. No license, express or implied, by estoppel or otherwise,
     to any intellectual property rights is granted herein.
 
-  \file common_clang.cpp
+  \file opencl_clang.cpp
 
 \*****************************************************************************/
 
-#include "common_clang.h"
+#include "opencl_clang.h"
 #include "pch_mgr.h"
 #include "cl_headers/resource.h"
 #include "binary_result.h"

common_clang.h renamed to opencl_clang.h

@@ -12,7 +12,7 @@ Copyright (c) Intel Corporation (2009-2017).
     use of the code. No license, express or implied, by estoppel or otherwise,
     to any intellectual property rights is granted herein.
 
-  \file common_clang.h
+  \file opencl_clang.h
 
 \*****************************************************************************/
 
@@ -21,7 +21,7 @@ Copyright (c) Intel Corporation (2009-2017).
 #include "cstddef" // size_t
 
 #if defined(_WIN32)
-#if defined(COMMON_CLANG_EXPORTS)
+#if defined(OPENCL_CLANG_EXPORTS)
 #define CC_DLL_EXPORT _declspec(dllexport)
 #else
 #define CC_DLL_EXPORT _declspec(dllimport)

common_clang.map renamed to opencl_clang.map

@@ -1,6 +1,6 @@
 //===----------------------------------------------------------------------===//
 //
-//  This file defines the options accepted by common_clang.
+//  This file defines the options accepted by opencl_clang.
 //
 //===----------------------------------------------------------------------===//
 

opencl_clang_options.td

@@ -12,14 +12,14 @@ Copyright (c) Intel Corporation (2009-2017).
     use of the code. No license, express or implied, by estoppel or otherwise,
     to any intellectual property rights is granted herein.
 
-  \file common_clang.h
+  \file opencl_clang.h
 
   \brief Defines the common structures for both compile and link options parsing
 
 \*****************************************************************************/
 
-#ifndef COMMON_CLANG_OPTIONS_H
-#define COMMON_CLANG_OPTIONS_H
+#ifndef OPENCL_CLANG_OPTIONS_H
+#define OPENCL_CLANG_OPTIONS_H
 
 #include "llvm/Option/Arg.h"
 #include "llvm/ADT/ArrayRef.h"

options.h

@@ -16,7 +16,7 @@ Copyright (c) Intel Corporation (2009-2017).
 
 \*****************************************************************************/
 
-#include "common_clang.h"
+#include "opencl_clang.h"
 #include "options.h"
 
 #include "clang/Driver/Options.h"

options_compile.cpp

@@ -210,7 +210,7 @@ bool ResourceManager::load_resource(const char *id, const char *pszType,
 #ifdef WIN32
   bool ok = GetResourceWin32(id, pszType, res, size);
 #else
-  bool ok = GetResourceUnix(id, pszType, LIBCOMMON_CLANG_NAME,
+  bool ok = GetResourceUnix(id, pszType, LIBOPENCL_CLANG_NAME,
                             false, res, size);
 #endif