[libclc] Fix recent merge issues

libclc/clc/lib/generic/integer/clc_mul_hi.cl

@@ -113,6 +113,7 @@ _CLC_OVERLOAD _CLC_DEF ulong __clc_mul_hi(ulong x, ulong y) {
 
 #define __CLC_MUL_HI_TYPES()                                                   \
   __CLC_MUL_HI_DEC_IMPL(short, char, 8)                                        \
+  __CLC_MUL_HI_DEC_IMPL(short, schar, 8)                                       \
   __CLC_MUL_HI_DEC_IMPL(ushort, uchar, 8)                                      \
   __CLC_MUL_HI_DEC_IMPL(int, short, 16)                                        \
   __CLC_MUL_HI_DEC_IMPL(uint, ushort, 16)                                      \

libclc/generic/include/core/clc_core.h

@@ -38,21 +38,8 @@
 
 #include <core/convert.h>
 
-#include <core/integer/clc_abs.h>
-#include <core/integer/clc_abs_diff.h>
 #include <core/integer/clc_add_sat.h>
-#include <core/integer/clc_hadd.h>
-#include <core/integer/clc_mad24.h>
-#include <core/integer/clc_mad_hi.h>
 #include <core/integer/clc_mad_sat.h>
-#include <core/integer/clc_mul24.h>
-#include <core/integer/clc_mul_hi.h>
-#include <core/integer/clc_rhadd.h>
 #include <core/integer/clc_sub_sat.h>
-#include <core/integer/clc_upsample.h>
-
-#include <core/shared/clc_clamp.h>
-#include <core/shared/clc_max.h>
-#include <core/shared/clc_min.h>
 
 #pragma OPENCL EXTENSION all : disable

libclc/generic/lib/math/sin.cl

@@ -20,7 +20,6 @@
  * THE SOFTWARE.
  */
 
-#include "sincos_helpers.h"
 #include <clc/clc.h>
 #include <clc/clcmacro.h>
 #include <libspirv/spirv.h>

libclc/libspirv/lib/generic/SOURCES

@@ -28,15 +28,8 @@ common/sign.cl
 common/smoothstep.cl
 common/step.cl
 core/integer/clc_add_sat.cl
-core/integer/clc_hadd.cl
-core/integer/clc_mad24.cl
-core/integer/clc_mad_hi.cl
 core/integer/clc_mad_sat.cl
-core/integer/clc_mul24.cl
-core/integer/clc_mul_hi.cl
-core/integer/clc_rhadd.cl
 core/integer/clc_sub_sat.cl
-core/integer/clc_upsample.cl
 geometric/cross.cl
 geometric/distance.cl
 geometric/dot.cl

libclc/libspirv/lib/generic/common/degrees.cl

@@ -12,5 +12,5 @@
 
 #define FUNCTION __spirv_ocl_degrees
 #define __CLC_FUNCTION(x) __clc_degrees
-#define __CLC_BODY <clc/common/unary_def.inc>
+#define __CLC_BODY <clc/shared/unary_def.inc>
 #include <clc/math/gentype.inc>

libclc/libspirv/lib/generic/common/radians.cl

@@ -12,5 +12,5 @@
 
 #define FUNCTION __spirv_ocl_radians
 #define __CLC_FUNCTION(x) __clc_radians
-#define __CLC_BODY <clc/common/unary_def.inc>
+#define __CLC_BODY <clc/shared/unary_def.inc>
 #include <clc/math/gentype.inc>