Date: Sat, 16 Apr 2022 08:09:02 GMT From: Yasuhiro Kimura <yasu@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 427746f6a3ec - main - lang/gcc11: Add upstream patch to fix bug of libgccjit Message-ID: <202204160809.23G8928G006736@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=427746f6a3ecdb70f182adfd42e48130f273fdda commit 427746f6a3ecdb70f182adfd42e48130f273fdda Author: Yasuhiro Kimura <yasu@FreeBSD.org> AuthorDate: 2022-04-14 18:11:17 +0000 Commit: Yasuhiro Kimura <yasu@FreeBSD.org> CommitDate: 2022-04-16 08:07:56 +0000 lang/gcc11: Add upstream patch to fix bug of libgccjit After switching to LTO bootstrap with commit 2f6be9fb8281, build of editors/emacs-devel fails with segmentation fault of emacs if NATIVECOMP option is enabled. The cause of the problem is bug of libgccjit and it was unveiled by switching to LTO bootstrap. So add upstream patch to fix it. PR: 263271 Approved by: gerald (toolchain@) --- lang/gcc11/Makefile | 2 +- lang/gcc11/files/patch-gcc_jit_jit-playback.c | 33 +++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/lang/gcc11/Makefile b/lang/gcc11/Makefile index 514e58cc20a8..015cf4ef306c 100644 --- a/lang/gcc11/Makefile +++ b/lang/gcc11/Makefile @@ -2,7 +2,7 @@ PORTNAME= gcc PORTVERSION= 11.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= GCC PKGNAMESUFFIX= ${SUFFIX} diff --git a/lang/gcc11/files/patch-gcc_jit_jit-playback.c b/lang/gcc11/files/patch-gcc_jit_jit-playback.c new file mode 100644 index 000000000000..760b24746020 --- /dev/null +++ b/lang/gcc11/files/patch-gcc_jit_jit-playback.c @@ -0,0 +1,33 @@ +From 7510c23c1ec53aa4a62705f0384079661342ff7b Mon Sep 17 00:00:00 2001 +From: Martin Liska <mliska@suse.cz> +Date: Wed, 24 Nov 2021 10:15:34 +0100 +Subject: [PATCH 20/67] jit: Initialize function::m_blocks in ctor + +This resolves the problem reported here: +https://mail.gnu.org/archive/html/bug-gnu-emacs/2021-11/msg00606.html +https://bugzilla.opensuse.org/show_bug.cgi?id=1192951 + +gcc/jit/ChangeLog: + + * jit-playback.c (function): Initialize m_blocks vector. +--- + gcc/jit/jit-playback.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git gcc/jit/jit-playback.c gcc/jit/jit-playback.c +index c6136301243..50db23df159 100644 +--- gcc/jit/jit-playback.c ++++ gcc/jit/jit-playback.c +@@ -1481,7 +1481,8 @@ function (context *ctxt, + : m_ctxt(ctxt), + m_inner_fndecl (fndecl), + m_inner_bind_expr (NULL), +- m_kind (kind) ++ m_kind (kind), ++ m_blocks () + { + if (m_kind != GCC_JIT_FUNCTION_IMPORTED) + { +-- +2.35.2 +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202204160809.23G8928G006736>