reduce scope of PR

Author: frasercrmck

clang/lib/Driver/ToolChains/Clang.cpp

@@ -8544,9 +8544,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   }
 
   if (IsCuda || (IsSYCLDevice && Triple.isNVPTX())) {
-    bool UseShortPtr = IsSYCLDevice && Triple.isNVPTX();
     if (Args.hasFlag(options::OPT_fcuda_short_ptr,
-                     options::OPT_fno_cuda_short_ptr, UseShortPtr))
+                     options::OPT_fno_cuda_short_ptr, false))
       CmdArgs.push_back("-fcuda-short-ptr");
   }
 

libclc/CMakeLists.txt

@@ -506,10 +506,27 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
       list(APPEND build_flags -D__unix__)
     endif()
 
-    add_libclc_builtin_set(libspirv-${arch_suffix}
+    string( TOUPPER "CLC_${MACRO_ARCH}" CLC_TARGET_DEFINE )
+
+    list( APPEND build_flags
+      -D__CLC_INTERNAL
+      -D${CLC_TARGET_DEFINE}
+      # All libclc builtin libraries see CLC headers
+      -I${CMAKE_CURRENT_SOURCE_DIR}/clc/include
+      # FIXME: Fix libclc to not require disabling this noisy warning
+      -Wno-bitwise-conditional-parentheses
+    )
+
+    if( NOT "${cpu}" STREQUAL "" )
+      list( APPEND build_flags -mcpu=${cpu} )
+    endif()
+
+    add_libclc_builtin_set(
+      CLC_INTERNAL
+      ARCH ${ARCH}
+      ARCH_SUFFIX clc-${arch_suffix}
       TRIPLE ${clang_triple}
-      TARGET_ENV libspirv
-      COMPILE_OPT ${build_flags}
+      COMPILE_FLAGS ${build_flags}
       OPT_FLAGS ${opt_flags}
       LIB_FILES ${clc_lib_files}
     )