SHA256
1
0
forked from pool/pocl
pocl/0001-Fixes-357-broken-build-with-GCC-6.1.patch

27 lines
1.4 KiB
Diff

Index: cmake/bitcode_rules.cmake
===================================================================
--- cmake/bitcode_rules.cmake.orig
+++ cmake/bitcode_rules.cmake
@@ -62,7 +62,7 @@ function(compile_cc_to_bc FILENAME SUBDI
DEPENDS "${FULL_F_PATH}"
${KERNEL_DEPEND_HEADERS}
COMMAND "${CLANGXX}" ${CLANG_FLAGS} ${KERNEL_CLANGXX_FLAGS}
- ${DEVICE_CL_FLAGS} "-o" "${BC_FILE}" "-c" "${FULL_F_PATH}"
+ ${DEVICE_CL_FLAGS} "-std=c++11" "-o" "${BC_FILE}" "-c" "${FULL_F_PATH}"
COMMENT "Building C++ to LLVM bitcode ${BC_FILE}"
VERBATIM)
endfunction()
Index: lib/kernel/rules.mk
===================================================================
--- lib/kernel/rules.mk.orig
+++ lib/kernel/rules.mk
@@ -74,7 +74,7 @@ _kernel.h.pch: @top_builddir@/include/${
@CLANG@ ${CLANG_FLAGS} ${CLFLAGS} ${DEVICE_CL_FLAGS} -D__CBUILD__ -c -o $@ -include ${abs_top_srcdir}/include/_kernel_c.h $<
%.cc.bc: %.cc ${LKERNEL_HDRS_EXTRA}
mkdir -p ${dir $@}
- @CLANGXX@ ${CLANG_FLAGS} ${CLANGXX_FLAGS} ${DEVICE_CL_FLAGS} -c -o $@ $<
+ @CLANGXX@ -std=c++11 ${CLANG_FLAGS} ${CLANGXX_FLAGS} ${DEVICE_CL_FLAGS} -c -o $@ $<
%.cl.bc: %.cl ${abs_top_srcdir}/include/_kernel.h ${abs_top_srcdir}/include/_kernel_c.h ${abs_top_srcdir}/include/pocl_types.h ${LKERNEL_HDRS_EXTRA}
mkdir -p ${dir $@}
@CLANG@ ${CLANG_FLAGS} -x cl ${CLFLAGS} ${DEVICE_CL_FLAGS} -fsigned-char -c -o $@ $< -include ${abs_top_srcdir}/include/_kernel.h