diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2023-02-02 13:15:09 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2023-02-15 18:24:31 +0100 |
| commit | c4894fadd53d89559884e844f113f66386b51500 (patch) | |
| tree | 7c72c50408eab06eca540093080b76259fb3dc5b | |
| parent | 8c3cc54e727d99b14373cc90f5b5a1de46427d11 (diff) | |
| download | meta-openembedded-contrib-c4894fadd53d89559884e844f113f66386b51500.tar.gz | |
opencv: don't use -fsched2-use-superblocks when building third party carotene
* just as temporary work around for carotene triggering ICE with gcc-13
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/opencv/opencv/0001-carotene-don-t-use-fsched2-use-superblocks.patch | 46 | ||||
| -rw-r--r-- | meta-oe/recipes-support/opencv/opencv_4.6.0.bb | 1 |
2 files changed, 47 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv/0001-carotene-don-t-use-fsched2-use-superblocks.patch b/meta-oe/recipes-support/opencv/opencv/0001-carotene-don-t-use-fsched2-use-superblocks.patch new file mode 100644 index 0000000000..7d21c4bed2 --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/0001-carotene-don-t-use-fsched2-use-superblocks.patch @@ -0,0 +1,46 @@ +From f1c4937b891005a61341317191905a93bbfaef14 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Thu, 2 Feb 2023 13:11:22 +0000 +Subject: [PATCH] carotene: don't use -fsched2-use-superblocks + +* just as temporary work around for carotene triggering ICE with gcc-13: +opencv/4.6.0-r0/git/3rdparty/carotene/src/flip.cpp:98:1: internal compiler error: in cselib_subst_to_values, at cselib.cc:2148 + 98 | } + | ^ +0x1afbcbb internal_error(char const*, ...) + ???:0 +0x6e40e4 fancy_abort(char const*, int, char const*) + ???:0 +0xa12da1 cselib_subst_to_values_from_insn(rtx_def*, machine_mode, rtx_insn*) + ???:0 +0x1a4f9b1 deps_analyze_insn(deps_desc*, rtx_insn*) + ???:0 +0x1a501da sched_analyze(deps_desc*, rtx_insn*, rtx_insn*) + ???:0 +0x1a532f6 schedule_ebb(rtx_insn*, rtx_insn*, bool) + ???:0 +0x1a537e3 schedule_ebbs() + ???:0 +Please submit a full bug report, with preprocessed source (by using -freport-bug). +Please include the complete backtrace with any bug report. +See <https://gcc.gnu.org/bugs/> for instructions. + +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + 3rdparty/carotene/hal/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/3rdparty/carotene/hal/CMakeLists.txt b/3rdparty/carotene/hal/CMakeLists.txt +index 592771c676..0808cbf1c1 100644 +--- a/3rdparty/carotene/hal/CMakeLists.txt ++++ b/3rdparty/carotene/hal/CMakeLists.txt +@@ -28,7 +28,7 @@ if(CV_GCC OR CV_CLANG) + elseif(CV_CLANG) + list(APPEND TEGRA_COMPILER_FLAGS -fwrapv) + else() +- list(APPEND TEGRA_COMPILER_FLAGS -fweb -fwrapv -frename-registers -fsched2-use-superblocks -fsched2-use-traces ++ list(APPEND TEGRA_COMPILER_FLAGS -fweb -fwrapv -frename-registers -fsched2-use-traces + -fsched-stalled-insns-dep=100 -fsched-stalled-insns=2) + endif() + if((ANDROID_COMPILER_IS_CLANG OR NOT ANDROID_COMPILER_VERSION VERSION_LESS "4.7") AND ANDROID_NDK_RELEASE STRGREATER "r8d" ) diff --git a/meta-oe/recipes-support/opencv/opencv_4.6.0.bb b/meta-oe/recipes-support/opencv/opencv_4.6.0.bb index fcbafd78a9..f29669e0f0 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.6.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.6.0.bb @@ -53,6 +53,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol file://0001-Make-ts-module-external.patch \ file://0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch \ file://0008-Do-not-embed-build-directory-in-binaries.patch \ + file://0001-carotene-don-t-use-fsched2-use-superblocks.patch \ " SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib" |