From b701f560ee76f353451ac95214f9016f985e0f4a Mon Sep 17 00:00:00 2001 From: Arnaud Le Blanc Date: Mon, 7 Oct 2024 18:32:43 +0200 Subject: [PATCH] Use Zend's GDB JIT definitions in IR Define IR_EXTERNAL_GDB_ENTRY so that IR will not define its own __jit_debug_descriptor and __jit_debug_register_code symbols. When these symbols are defined multiple times, GDB and the program may not use the same, which breaks the GDB integration. --- ext/opcache/config.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 index 8f6d5ab711b28..f9abbbff049d6 100644 --- a/ext/opcache/config.m4 +++ b/ext/opcache/config.m4 @@ -100,7 +100,7 @@ if test "$PHP_OPCACHE" != "no"; then PHP_SUBST([DASM_FLAGS]) PHP_SUBST([DASM_ARCH]) - JIT_CFLAGS="-I@ext_builddir@/jit/ir -D$IR_TARGET -DIR_PHP" + JIT_CFLAGS="-I@ext_builddir@/jit/ir -D$IR_TARGET -DIR_PHP -DIR_EXTERNAL_GDB_ENTRY" AS_VAR_IF([ZEND_DEBUG], [yes], [JIT_CFLAGS="$JIT_CFLAGS -DIR_DEBUG"]) ])