From c8fc88b7ed082706af30aac7d4cf4e7201f62542 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Tue, 30 May 2023 09:03:01 +0800 Subject: intel-compute-runtime: fix build with gcc13 Dont turn warnings to errors. Helps when compiling with gcc13. | /build/poky/build/tmp/work/corei7-64-poky-linux/intel-compute-runtime/23.09.25812.14-r0/recipe-sysroot/usr/include/c++/13.1.1/bits/stl_algobase.h:398:11: error: '*(unsigned char (*)[7])((char*)& + offsetof(NEO::ArgDescValue, NEO::ArgDescValue::elements.StackVec::onStackMemRawBytes[0]))' may be used uninitialized [-Werror=maybe-uninitialized] | 398 | { *__to = *__from; } | | Also, include cstdint header to get rid of other gcc13 specific errors. Signed-off-by: Anuj Mittal --- ...-cstdint-header-to-fix-compile-with-gcc13.patch | 56 ++++++++++++++++++++++ .../intel-compute-runtime/disable-werror.patch | 16 +++++++ .../intel-compute-runtime_23.13.26032.30.bb | 2 + 3 files changed, 74 insertions(+) create mode 100644 dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/add-missing-cstdint-header-to-fix-compile-with-gcc13.patch create mode 100644 dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/disable-werror.patch diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/add-missing-cstdint-header-to-fix-compile-with-gcc13.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/add-missing-cstdint-header-to-fix-compile-with-gcc13.patch new file mode 100644 index 00000000..7f75cbb8 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/add-missing-cstdint-header-to-fix-compile-with-gcc13.patch @@ -0,0 +1,56 @@ +From 078af5b7ac3086d336f76183b798771263491c34 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal +Date: Tue, 30 May 2023 11:07:10 +0800 +Subject: [PATCH] add missing cstdint header to fix compile with gcc13 + +Include the headers as per: +https://gcc.gnu.org/gcc-13/porting_to.html + +Upstream-Status: Pending + +Signed-off-by: Anuj Mittal +--- + opencl/test/unit_test/built_ins/built_ins_file_names.h | 1 + + shared/test/common/os_interface/linux/sys_calls_linux_ult.h | 1 + + third_party/aot_config_headers/platforms.h | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/opencl/test/unit_test/built_ins/built_ins_file_names.h b/opencl/test/unit_test/built_ins/built_ins_file_names.h +index 08dc38d406..e04f916e71 100644 +--- a/opencl/test/unit_test/built_ins/built_ins_file_names.h ++++ b/opencl/test/unit_test/built_ins/built_ins_file_names.h +@@ -9,6 +9,7 @@ + + #include + #include ++#include + + namespace NEO { + std::vector getBuiltInFileNames(bool imagesSupport); +diff --git a/shared/test/common/os_interface/linux/sys_calls_linux_ult.h b/shared/test/common/os_interface/linux/sys_calls_linux_ult.h +index 9f1fd4dacb..e64dd40254 100644 +--- a/shared/test/common/os_interface/linux/sys_calls_linux_ult.h ++++ b/shared/test/common/os_interface/linux/sys_calls_linux_ult.h +@@ -7,6 +7,7 @@ + + #pragma once + ++#include + #include + #include + #include +diff --git a/third_party/aot_config_headers/platforms.h b/third_party/aot_config_headers/platforms.h +index 056d615503..d2024d1b54 100644 +--- a/third_party/aot_config_headers/platforms.h ++++ b/third_party/aot_config_headers/platforms.h +@@ -7,6 +7,7 @@ + + #include + #include ++#include + + #pragma once + +-- +2.37.3 + diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/disable-werror.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/disable-werror.patch new file mode 100644 index 00000000..20d9b847 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/disable-werror.patch @@ -0,0 +1,16 @@ +Upstream-Status: Inappropriate +Signed-off-by: Anuj Mittal + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d52e089778..bc0cf35014 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -727,7 +727,7 @@ if(NOT MSVC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-noexcept-type") # Added for gtest + endif() + endif() +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=vla") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=vla") + + if(USE_SANITIZE_UB) + check_cxx_compiler_flag(-fsanitize=undefined COMPILER_SUPPORTS_UNDEFINED_BEHAVIOR_SANITIZER) diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_23.13.26032.30.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_23.13.26032.30.bb index 644c978b..f6cdf5fd 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_23.13.26032.30.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_23.13.26032.30.bb @@ -9,6 +9,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eca6ec6997e18db166db7109cdbe611c \ file://third_party/opencl_headers/LICENSE;md5=dcefc90f4c3c689ec0c2489064e7273b" SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=releases/23.13 \ + file://disable-werror.patch \ + file://add-missing-cstdint-header-to-fix-compile-with-gcc13.patch \ " SRC_URI:append:class-target = "file://allow-to-find-cpp-generation-tool.patch \ -- cgit v1.2.3-54-g00ecf