aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2025-08-29gdb: amd64 linux coredump support with shadow stack.Christina Schimpe3-4/+221
Intel's Control-Flow Enforcement Technology (CET) provides the shadow stack feature for the x86 architecture. This commit adds support to write and read the shadow-stack node in corefiles. This helps debugging return address violations post-mortem. The format is synced with the linux kernel commit "x86: Add PTRACE interface for shadow stack". As the linux kernel restricts shadow stack support to 64-bit, apply the fix for amd64 only. Co-Authored-By: Christina Schimpe <christina.schimpe@intel.com> Reviewed-By: Thiago Jung Bauermann <thiago.bauermann@linaro.org> Approved-By: Luis Machado <luis.machado@arm.com> Approved-By: Andrew Burgess <aburgess@redhat.com> --- The code and testcase are lightly adapted from: [PATCH v3 5/9] GDB, gdbserver: aarch64-linux: Initial Guarded Control Stack support https://sourceware.org/pipermail/gdb-patches/2025-June/218892.html
2025-08-29gdb, gdbserver: Add support of Intel shadow stack pointer register.Christina Schimpe30-142/+613
This patch adds the user mode register PL3_SSP which is part of the Intel(R) Control-Flow Enforcement Technology (CET) feature for support of shadow stack. For now, only native and remote debugging support for shadow stack userspace on amd64 linux are covered by this patch including 64 bit and x32 support. 32 bit support is not covered due to missing Linux kernel support. This patch requires fixing the test gdb.base/inline-frame-cycle-unwind which is failing in case the shadow stack pointer is unavailable. Such a state is possible if shadow stack is disabled for the current thread but supported by HW. This test uses the Python unwinder inline-frame-cycle-unwind.py which fakes the cyclic stack cycle by reading the pending frame's registers and adding them to the unwinder: ~~~ for reg in pending_frame.architecture().registers("general"): val = pending_frame.read_register(reg) unwinder.add_saved_register(reg, val) return unwinder ~~~ However, in case the python unwinder is used we add a register (pl3_ssp) that is unavailable. This leads to a NOT_AVAILABLE_ERROR caught in gdb/frame-unwind.c:frame_unwind_try_unwinder and it is continued with standard unwinders. This destroys the faked cyclic behavior and the stack is further unwinded after frame 5. In the working scenario an error should be triggered: ~~~ bt 0 inline_func () at /tmp/gdb.base/inline-frame-cycle-unwind.c:49^M 1 normal_func () at /tmp/gdb.base/inline-frame-cycle-unwind.c:32^M 2 0x000055555555516e in inline_func () at /tmp/gdb.base/inline-frame-cycle-unwind.c:45^M 3 normal_func () at /tmp/gdb.base/inline-frame-cycle-unwind.c:32^M 4 0x000055555555516e in inline_func () at /tmp/gdb.base/inline-frame-cycle-unwind.c:45^M 5 normal_func () at /tmp/gdb.base/inline-frame-cycle-unwind.c:32^M Backtrace stopped: previous frame identical to this frame (corrupt stack?) (gdb) PASS: gdb.base/inline-frame-cycle-unwind.exp: cycle at level 5: backtrace when the unwind is broken at frame 5 ~~~ To fix the Python unwinder, we simply skip the unavailable registers. Also it makes the test gdb.dap/scopes.exp fail. The shadow stack feature is disabled by default, so the pl3_ssp register which is added with my CET shadow stack series will be shown as unavailable and we see a TCL error: ~~ >>> {"seq": 12, "type": "request", "command": "variables", "arguments": {"variablesReference": 2, "count": 85}} Content-Length: 129^M ^M {"request_seq": 12, "type": "response", "command": "variables", "success": false, "message": "value is not available", "seq": 25}FAIL: gdb.dap/scopes.exp: fetch all registers success ERROR: tcl error sourcing /tmp/gdb/testsuite/gdb.dap/scopes.exp. ERROR: tcl error code TCL LOOKUP DICT body ERROR: key "body" not known in dictionary while executing "dict get $val body variables" (file "/tmp/gdb/testsuite/gdb.dap/scopes.exp" line 152) invoked from within "source /tmp/gdb/testsuite/gdb.dap/scopes.exp" ("uplevel" body line 1) invoked from within "uplevel #0 source /tmp/gdb/testsuite/gdb.dap/scopes.exp" invoked from within "catch "uplevel #0 source $test_file_name" msg" UNRESOLVED: gdb.dap/scopes.exp: testcase '/tmp/gdb/testsuite/gdb.dap/scopes.exp' aborted due to Tcl error ~~ I am fixing this by enabling the test for CET shadow stack, in case we detect that the HW supports it: ~~~ # If x86 shadow stack is supported we need to configure GLIBC_TUNABLES # such that the feature is enabled and the register pl3_ssp is # available. Otherwise the reqeust to fetch all registers will fail # with "message": "value is not available". if { [allow_ssp_tests] } { append_environment GLIBC_TUNABLES "glibc.cpu.hwcaps" "SHSTK" } ~~~ Reviewed-by: Thiago Jung Bauermann <thiago.bauermann@linaro.org> Reviewed-By: Eli Zaretskii <eliz@gnu.org> Approved-By: Luis Machado <luis.machado@arm.com> Approved-By: Andrew Burgess <aburgess@redhat.com>
2025-08-29gdb, gdbserver: Use xstate_bv for target description creation on x86.Christina Schimpe22-156/+197
The XSAVE function set is organized in state components, which are a set of registers or parts of registers. So-called XSAVE-supported features are organized using state-component bitmaps, each bit corresponding to a single state component. The Intel Software Developer's Manual uses the term xstate_bv for a state-component bitmap, which is defined as XCR0 | IA32_XSS. The control register XCR0 only contains a state-component bitmap that specifies user state components, while IA32_XSS contains a state-component bitmap that specifies supervisor state components. Until now, XCR0 is used as input for target description creation in GDB. However, a following patch will add userspace support for the CET shadow stack feature by Intel. The CET state is configured in IA32_XSS and consists of 2 state components: - State component 11 used for the 2 MSRs controlling user-mode functionality for CET (CET_U state) - State component 12 used for the 3 MSRs containing shadow-stack pointers for privilege levels 0-2 (CET_S state). Reading the CET shadow stack pointer register on linux requires a separate ptrace call using NT_X86_SHSTK. To pass the CET shadow stack enablement state we would like to pass the xstate_bv value instead of xcr0 for target description creation. To prepare for that, we rename the xcr0 mask values for target description creation to xstate_bv. However, this patch doesn't add any functional changes in GDB. Future states specified in IA32_XSS such as CET will create a combined xstate_bv_mask including xcr0 register value and its corresponding bit in the state component bitmap. This combined mask will then be used to create the target descriptions. Reviewed-By: Thiago Jung Bauermann <thiago.bauermann@linaro.org> Approved-By: Luis Machado <luis.machado@arm.com>
2025-08-29gdb: Sync up x86-gcc-cpuid.h with cpuid.h from gcc 14 branch.Christina Schimpe1-31/+122
This is required for a later commit which requires "bit_SHSTK". Reviewed-by: Thiago Jung Bauermann <thiago.bauermann@linaro.org> Approved-By: Tom Tromey <tom@tromey.com> Approved-By: Luis Machado <luis.machado@arm.com>
2025-08-29gdbserver: Add assert in x86_linux_read_description.Christina Schimpe1-1/+6
On x86 the PTRACE_GETREGSET request is currently only used for the xstate regset. The size of the xstate regset is initialized to 0 such that it can be reset to the appropriate size once we know it is supported for the current target in x86_linux_read_description. However, this configuration would not just affect the xstate regset but any regset with PTRACE_GETREGSET request that is added in the future. The new regset would be misconfigured with the xstate regset size. To avoid this we add an assert for unsupported regsets and check explicitly for the note type of the register set. Reviewed-by: Thiago Jung Bauermann <thiago.bauermann@linaro.org> Approved-By: Luis Machado <luis.machado@arm.com>
2025-08-29gdbserver: Add optional runtime register set type.Christina Schimpe2-15/+42
Some register sets can be activated and deactivated by the OS during the runtime of a process. One example register is the Intel CET shadow stack pointer. This patch adds a new type of register set to handle such cases. We shouldn't deactivate these regsets and should not show a warning if the register set is not active but supported by the kernel. However, it is safe to deactivate them, if they are unsupported by the kernel. To differentiate those scenarios we can use the errno returned by the ptrace call. Reviewed-by: Thiago Jung Bauermann <thiago.bauermann@linaro.org> Approved-By: Luis Machado <luis.machado@arm.com>
2025-08-29gdb, testsuite: Extend core_find procedure to save program output.Christina Schimpe1-2/+8
From: Thiago Jung Bauermann <thiago.bauermann@linaro.org> The change comes from ARM's GCS series: [PATCH v3 5/9] GDB, gdbserver: aarch64-linux: Initial Guarded Control Stack support. We need it for testing coredump files, too. So include it in this patch series. Abridged-by: Christina Schimpe <christina.schimpe@intel.com> Approved-By: Luis Machado <luis.machado@arm.com> Approved-By: Andrew Burgess <aburgess@redhat.com> --- This is the patch mentioned above: https://sourceware.org/pipermail/gdb-patches/2025-June/218892.html Minus everything except for the change in gdb.exp's corefind procedure.
2025-08-29gdb/objfiles: make objfile::sections yield referencesSimon Marchi21-149/+149
I wrote this as a preparatory patch while attempting to make objfile::section_iterator use filtered_iterator. It turned out not so easy, so I have put it aside for now. But now I have this patch, so I thought I'd send it by itself. Since the `obj_section *` yielded by the iterator can't be nullptr, I think it makes sense for the iterator to yield references instead. Just like you would get if you iterated on an std::vector<obj_section>. Change-Id: I7bbee50ed52599e64c4f3b06bdbbde597feba9aa
2025-08-29[gdb/testsuite] Fix overlapping CUs in gdb.dwarf2/dw2-linkage-name-trust.expTom de Vries1-1/+1
When running test-case gdb.dwarf2/dw2-linkage-name-trust.exp with target board cc-with-gdb-index, I get: ... (gdb) file dw2-linkage-name-trust^M Reading symbols from dw2-linkage-name-trust...^M warning: .gdb_index address table has a range (0x4006ac - 0x4006cc) that \ overlaps with an earlier range, ignoring .gdb_index^M (gdb) delete breakpoints^M ... Fix this by compiling with nodebug. Tested on aarch64-linux. Approved-By: Tom Tromey <tom@tromey.com> PR testsuite/33315 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=33315
2025-08-29[gdb/testsuite] Fix overlapping CUs in gdb.dwarf2/dw2-entry-points.expTom de Vries2-3/+21
When running test-case gdb.dwarf2/dw2-entry-points.exp with target board cc-with-gdb-index, I get: ... (gdb) file dw2-entry-points^M Reading symbols from dw2-entry-points...^M warning: .gdb_index address table has a range (0x40066c - 0x4006e4) that \ overlaps with an earlier range, ignoring .gdb_index^M (gdb) delete breakpoints^M ... Fix this by copying function bar_helper to barso_helper, and using it where appropriate. Tested on aarch64-linux. Approved-By: Tom Tromey <tom@tromey.com> PR testsuite/33315 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=33315
2025-08-29gdb: use kill() in gdbpy_interrupt for hosts with signal supportAndrew Burgess2-24/+68
For background, see this thread: https://inbox.sourceware.org/gdb-patches/20250612144607.27507-1-tdevries@suse.de Tom describes the issue clearly in the above thread, here's what he said: Once in a while, when running test-case gdb.base/bp-cmds-continue-ctrl-c.exp, I run into: ... Breakpoint 2, foo () at bp-cmds-continue-ctrl-c.c:23^M 23 usleep (100);^M ^CFAIL: $exp: run: stop with control-c (unexpected) (timeout) FAIL: $exp: run: stop with control-c ... This is PR python/32167, observed both on x86_64-linux and powerpc64le-linux. This is not a timeout due to accidental slowness, gdb actually hangs. The backtrace at the hang is (on cfarm120 running AlmaLinux 9.6): ... (gdb) bt #0 0x00007fffbca9dd94 in __lll_lock_wait () from /lib64/glibc-hwcaps/power10/libc.so.6 #1 0x00007fffbcaa6ddc in pthread_mutex_lock@@GLIBC_2.17 () from /lib64/glibc-hwcaps/power10/libc.so.6 #2 0x000000001067aee8 in __gthread_mutex_lock () at /usr/include/c++/11/ppc64le-redhat-linux/bits/gthr-default.h:749 #3 0x000000001067afc8 in __gthread_recursive_mutex_lock () at /usr/include/c++/11/ppc64le-redhat-linux/bits/gthr-default.h:811 #4 0x000000001067b0d4 in std::recursive_mutex::lock () at /usr/include/c++/11/mutex:108 #5 0x000000001067b380 in std::lock_guard<std::recursive_mutex>::lock_guard () at /usr/include/c++/11/bits/std_mutex.h:229 #6 0x0000000010679d3c in set_quit_flag () at gdb/extension.c:865 #7 0x000000001066b6dc in handle_sigint () at gdb/event-top.c:1264 #8 0x00000000109e3b3c in handler_wrapper () at gdb/posix-hdep.c:70 #9 <signal handler called> #10 0x00007fffbcaa6d14 in pthread_mutex_lock@@GLIBC_2.17 () from /lib64/glibc-hwcaps/power10/libc.so.6 #11 0x000000001067aee8 in __gthread_mutex_lock () at /usr/include/c++/11/ppc64le-redhat-linux/bits/gthr-default.h:749 #12 0x000000001067afc8 in __gthread_recursive_mutex_lock () at /usr/include/c++/11/ppc64le-redhat-linux/bits/gthr-default.h:811 #13 0x000000001067b0d4 in std::recursive_mutex::lock () at /usr/include/c++/11/mutex:108 #14 0x000000001067b380 in std::lock_guard<std::recursive_mutex>::lock_guard () at /usr/include/c++/11/bits/std_mutex.h:229 #15 0x00000000106799cc in set_active_ext_lang () at gdb/extension.c:775 #16 0x0000000010b287ac in gdbpy_enter::gdbpy_enter () at gdb/python/python.c:232 #17 0x0000000010a8e3f8 in bpfinishpy_handle_stop () at gdb/python/py-finishbreakpoint.c:414 ... What happens here is the following: - the gdbpy_enter constructor attempts to set the current extension language to python using set_active_ext_lang - set_active_ext_lang attempts to lock ext_lang_mutex - while doing so, it is interrupted by sigint_wrapper (the SIGINT handler), handling a SIGINT - sigint_wrapper calls handle_sigint, which calls set_quit_flag, which also tries to lock ext_lang_mutex - since std::recursive_mutex::lock is not async-signal-safe, things go wrong, resulting in a hang. The hang bisects to commit 8bb8f834672 ("Fix gdb.interrupt race"), which introduced the lock, making PR python/32167 a regression since gdb 15.1. Commit 8bb8f834672 fixes PR dap/31263, a race reported by ThreadSanitizer: ... WARNING: ThreadSanitizer: data race (pid=615372) Read of size 1 at 0x00000328064c by thread T19: #0 set_active_ext_lang(extension_language_defn const*) gdb/extension.c:755 #1 scoped_disable_cooperative_sigint_handling::scoped_disable_cooperative_sigint_handling() gdb/extension.c:697 #2 gdbpy_interrupt gdb/python/python.c:1106 #3 cfunction_vectorcall_NOARGS <null> Previous write of size 1 at 0x00000328064c by main thread: #0 scoped_disable_cooperative_sigint_handling::scoped_disable_cooperative_sigint_handling() gdb/extension.c:704 #1 fetch_inferior_event() gdb/infrun.c:4591 ... Location is global 'cooperative_sigint_handling_disabled' of size 1 at 0x00000328064c ... SUMMARY: ThreadSanitizer: data race gdb/extension.c:755 in \ set_active_ext_lang(extension_language_defn const*) ... The problem here is that gdb.interrupt is called from a worker thread, and its implementation, gdbpy_interrupt races with the main thread on some variable. The fix presented here is based on the fix that Tom proposed, but fills in the missing Mingw support. The problem is basically split into two: hosts that support unix like signals, and Mingw, which doesn't support signals. For signal supporting hosts, I've adopted the approach that Tom suggests, gdbpy_interrupt uses kill() to send SIGINT to the GDB process. This is then handled in the main thread as if the user had pressed Ctrl+C. For these hosts no locking is required, so the existing lock is removed. However, everywhere the lock currently exists I've added an assert: gdb_assert (is_main_thread ()); If this assert ever triggers then we're setting or reading the quit flag on a worker thread, this will be a problem without the mutex. For Mingw, the current mutex is retained. This is fine as there are no signals, so no chance of the mutex acquisition being interrupted by a signal, and so, deadlock shouldn't be an issue. To manage the complexity of when we need an assert, and when we need the mutex, I've created 'struct ext_lang_guard', which can be used as a RAII object. This object either performs the assertion check, or acquires the mutex, depending on the host. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=32167 Co-Authored-By: Tom de Vries <tdevries@suse.de> Approved-By: Tom Tromey <tom@tromey.com>
2025-08-29readelf: Add --got-contents optionH.J. Lu19-215/+1378
Add --got-contents option to readelf, inspired by the -G option on Solaris, to display contents of GOT sections: $ readelf --got-contents libfoo.so Global Offset Table '.got' contains 1 entry: Index: Address Reloc Sym. Name + Addend/Value 0: 000000200340 R_X86_64_GLOB_DAT foo + 0 Global Offset Table '.got.plt' contains 4 entries: Index: Address Reloc Sym. Name + Addend/Value 0: 000000200348 200220 1: 000000200350 0 2: 000000200358 0 3: 000000200360 R_X86_64_JUMP_SLO bar + 0 When --got-content options are used: 1. Allocate an array, all_relocations, to hold all relocations. 2. Update dump_relr_relocations and dump_relocations to scan relocations and cache them in all_relocations. Don't display relocations if not requested. 3. Add process_got_section_contents to display contents of GOT sections by matching the GOT entry offset against the cached relocations. 4. Update process_mips_specific to only display the GOT related contents for --got-contents. binutils/ * NEWS: Mention "readelf --got-contents". * readelf.c (do_got_section_contents): New. (elf_relocation): Likewise. (all_relocations_root): Likewise. (all_relocations): Likewise. (all_relocations_count): Likewise. (update_all_relocations): Likewise. (dump_relr_relocations): Add a bool argument to indicate if relocations should be displayed. Populate all_relocations if do_got_section_contents is true. (dump_relocations): Likewise. (long_option_values): Add OPTION_GOT_CONTENTS. (options): Add --got-contents. (usage): Show --got-contents. (parse_args): Support --got-contents. (display_relocations): Add a bool argument, dump_reloc, to indicate if relocations should be displayed. Call update_all_relocations. Pass dump_reloc to dump_relr_relocations and dump_relocations. (process_relocs): Check do_got_section_contents. Handle do_got_section_contents for dynamic relocations. (process_section_contents): Pass true to display_relocations. (process_mips_specific): Add a bool argument, dump_got, to indicate if only the GOT related contents should be displayed. Display all MIPS specific information if dump_got is false. (elf_relocation_cmp): New. (display_elf_relocation_at): Likewise. (process_got_section_contents): Likewise. (process_object): Call process_got_section_contents. * doc/binutils.texi: Document --got-contents. ld/ * testsuite/ld-i386/binutils.exp: New file. * testsuite/ld-i386/got-1.s: Likewise. * testsuite/ld-i386/libgot-1a.rd: Likewise. * testsuite/ld-i386/libgot-1b.rd: Likewise. * testsuite/ld-i386/libgot-1c.rd: Likewise. * testsuite/ld-i386/libgot-1d.rd: Likewise. * testsuite/ld-x86-64/binutils.exp: Likewise. * testsuite/ld-x86-64/got-1.s: Likewise. * testsuite/ld-x86-64/libgot-1a-x32.rd: Likewise. * testsuite/ld-x86-64/libgot-1a.rd: Likewise. * testsuite/ld-x86-64/libgot-1b-x32.rd: Likewise. * testsuite/ld-x86-64/libgot-1b.rd: Likewise. * testsuite/ld-x86-64/libgot-1c-x32.rd: Likewise. * testsuite/ld-x86-64/libgot-1c.rd: Likewise. * testsuite/ld-x86-64/libgot-1d-x32.rd: Likewise. * testsuite/ld-x86-64/libgot-1d.rd: Likewise. Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
2025-08-29ld: drop bogus %F format modifiersJan Beulich2-4/+4
Support for %F was dropped in 6d74c1f313df ("PR 32603 followup, remove %F from einfo").
2025-08-29x86: add "udb" opcode (permanent official #UD in 64-bit mode)H. Peter Anvin (Intel)6-2190/+2211
The opcode D6 has been officially reserved as a single-byte permanent undefined (#UD) opcode in 64-bit mode with the mnemonic UDB. This is already the behavior of all known 64-bit implementations; this is thus merely an official statement of forward compatibility and the assignment of a mnemonic. This will be documented in the next version of the Intel Software Developer's Manual; in the meantime I DO speak officially for Intel on this issue. The x86 Advisory Council has ratified this decision, and so it is expected to be honored across vendors, but I obviously cannot make any official statement on any other vendor's behalf. I am covered by the Intel-FSF copyright assignment for binutils. Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
2025-08-29Automatic date update in version.inGDB Administrator1-1/+1
2025-08-28gdb/gdb-gdb.gdb.in: skip gdb::ref_ptr<.*>::getSimon Marchi1-0/+3
I think it's uninteresting to step into gdb::ref_ptr::get, so add a skip entry for it. I am adding just one to get the party started, but there are certainly more like this that we could skip. Change-Id: Ib074535c96a62137de63bbe58ff168a1e913688f Approved-By: Tom Tromey <tom@tromey.com>
2025-08-28gdb/testsuite: use gdb_test_no_output when dumping in gdb.base/dump.expSimon Marchi1-8/+1
I don't know if this is true on all platforms, but from what I can see on Linux, the dump commands don't output anything. Use gdb_test_no_output, which should be a bit more robust than checking for some specific error patterns. Change-Id: Idc82298c4752ba7808659dfea2f8324c8a97052d Approved-By: Tom Tromey <tom@tromey.com>
2025-08-28Fix documentation of -list-[target-]features resultsChristian Walther1-2/+2
The manual claims that the -list-features and -list-target-features MI commands return their result in a field named "result". The field is actually named "features", and always has been since the introduction of these commands in 084344d and c6ebd6c. See mi_cmd_list_features and mi_cmd_list_target_features in gdb/mi/mi-main.c. Approved-By: Tom Tromey <tom@tromey.com>
2025-08-28testsuite: add untested in case OS corefile is not foundChristina Schimpe7-0/+7
Even though the core_find proc will log a warning, it's better to log "untested" and then terminate the test. This will help to avoid silently skipped tests, when running the testsuite. Most of the tests already do that. This patch adds the missing ones. Approved-By: Luis Machado <luis.machado.foss@gmail.com>
2025-08-28Bump flake8 versionTom Tromey1-1/+1
"pre-commit autoupdate" pointed out that a newer version of flake8 has been released. This patch applies the update. No code changes were needed. Approved-By: Simon Marchi <simon.marchi@efficios.com>
2025-08-28gdb/python: check return from final PyObject_New in py-disasm.cAndrew Burgess1-44/+41
In this commit: commit dbd05b9edcf760a7001985f89bc760358a3c19d7 Date: Wed Aug 20 10:45:09 2025 +0100 gdb/python: check return value of PyObject_New in all cases I missed a call to PyObject_New in python/py-disasm.c, which this commit addresses. Unlike the previous commit, the call to PyObject_New in py-disasm.c is contained within the scoped_disasm_info_object class, which makes it harder to check for NULL and return. So in this commit I've rewritten the scoped_disasm_info_object class, moving the call to PyObject_New out into gdbpy_print_insn, which is the only place that scoped_disasm_info_object was being used. As scoped_disasm_info_object is no longer responsible for creating the underlying Python object, I figured that I might as well move the initialisation of that object out of scoped_disasm_info_object too. With that done, the scoped_disasm_info_object now has just one task, invalidating the existing disasm_info_object at the end of the scope. So I renamed scoped_disasm_info_object to scoped_invalidate_disasm_info, which reflects its only task. I made a couple of other small adjustments that were requested during review, these are both in the same code area: updating disasm_info_fill to take an object reference rather than a pointer, and removing the local variable insn_disas_obj from gdbpy_print_insn, and inline its value at the one place it was used. There should be no user visible changes after this commit. Except for the PyObject_New call, which now has proper error checking. But in the working case, nothing should have changed. Approved-By: Simon Marchi <simon.marchi@efficios.com>
2025-08-28gdb/objfiles: add comment explaining when obj_section::the_bfd_section is ↵Simon Marchi1-1/+3
nullptr Change-Id: Iae17492f468efba7b76463a6ff8526171e412040 Reviewed-By: Tom de Vries <tdevries@suse.de>
2025-08-28[gdb/testsuite] Use build_executable in gdb.tui/tui-missing-src.expTom de Vries1-4/+2
While looking at test-case gdb.tui/tui-missing-src.exp I noticed that gdb_compile is used to compile multiple sources: ... if { [gdb_compile "${srcfiles}" "${binfile}" \ executable {debug additional_flags=-O0}] != "" } { ... meaning there are no separate compile and link steps, as is required for fission [1]. Fix this by using build_executable instead. Tested on aarch64-linux. [1] https://gcc.gnu.org/wiki/DebugFission
2025-08-28gdb/record: Support wfi, sfence.vma, sret and mret instructions in risc-vtimurgol0071-11/+45
During testing of bare-metal applications on QEMU for RISC-V, it was discovered that the instructions wfi, sfence.vma, sret, and mret were not supported. This patch introduces support for these instructions. Additionally, it wraps fetch_instruction function in a try-catch block to gracefully handle errors that may occur when attempting to read invalid address. Reviewed-By: Guinevere Larsen <guinevere@redhat.com> Approved-By: Andrew Burgess <aburgess@redhat.com>
2025-08-28[gdb/testsuite] Fix require dwarf2_support check in some test-cases, some moreTom de Vries6-2/+10
The Linaro CI reported a regression in test-case gdb.dwarf2/macro-source-path-clang14-dw4.exp due to recent commit 81e5a23c7b8 ("[gdb/testsuite] Fix require dwarf2_support check in some test-cases"). The problem is that the "require dwarf2_support" in its new location doesn't work because proc dwarf2_support is not defined. I didn't notice this because I tested all gdb.dwarf2 test-cases together, and a different test-case had already imported the proc. Fix this by moving load_lib dwarf.exp earlier. Tested on x86_64-linux.
2025-08-27readelf: Update "-D -r" to dump DT_RELRH.J. Lu9-46/+222
1. Update dump_relr_relocations to take relr_size, relr_entsize and relr_offset, instead of a pointer to Elf_Internal_Shdr, as function arguments. 2. Update process_relocs to call dump_relr_relocations if relocation type is reltype_relr. binutils/ PR binutils/33328 * readelf.c (dump_relr_relocations): Replace a pointer to Elf_Internal_Shdr argument with relr_size, relr_entsize and relr_offset. (display_relocations): Update the dump_relr_relocations call. (process_relocs): Call dump_relr_relocations if relocation type is reltype_relr. ld/ PR binutils/33328 * testsuite/ld-i386/dt-relr-1c.d: New file. * testsuite/ld-i386/dt-relr-1d.d: Likewise. * testsuite/ld-x86-64/dt-relr-1c-x32.d: Likewise. * testsuite/ld-x86-64/dt-relr-1c.d: Likewise. * testsuite/ld-x86-64/dt-relr-1d-x32.d: Likewise. * testsuite/ld-x86-64/dt-relr-1d.d: Likewise. * testsuite/ld-i386/i386.exp: Run PR binutils/33328 tests. * testsuite/ld-x86-64/x86-64.exp: Likewise. Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
2025-08-28Automatic date update in version.inGDB Administrator1-1/+1
2025-08-27gdb/testsuite: get real executable in gdb.gdb/index-file.expSimon Marchi2-9/+44
Similar to a previous patch, if the gdb executable is in fact a libtool wrapper, we need to get the path to the real executable to load it in the top-level gdb. With this change, the test runs on Cygwin, although I do see two failures: FAIL: gdb.gdb/index-file.exp: debug_names files are identical FAIL: gdb.gdb/index-file.exp: debug_str files are identical Change-Id: Ie06d1ece67e61530e5b664e65b5ef0edccaf6afa Reviewed-By: Keith Seitz <keiths@redhat.com>
2025-08-27gdb/testsuite: turn thread events off in selftestsSimon Marchi1-0/+4
When running gdb.gdb/selftest.exp on Cygwin, the test eventually times out on this command: (gdb) PASS: gdb.gdb/selftest.exp: printed version as pointer continue Continuing. [New Thread 4804.0x1728] [New Thread 4804.0x2f24] [New Thread 4804.0x934] [New Thread 4804.0x23a8] [New Thread 4804.0x2cf4] [New Thread 4804.0x1408] [New Thread 4804.0x2c90] [New Thread 4804.0xc58] [New Thread 4804.0x1d40] [New Thread 4804.0x1824] GNU gdb (GDB) 17.0.50.20250530-git Copyright (C) 2024 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-pc-cygwin". Type "show configuration" for configuration details. For bug reporting instructions, please see: <https://www.gnu.org/software/gdb/bugs/>. Find the GDB manual and other documentation resources online at: <http://www.gnu.org/software/gdb/documentation/>. For help, type "help". Type "apropos word" to search for commands related to "word". (gdb) [New Thread 4804.0x2c64] [New Thread 4804.0x23c4] [New Thread 4804.0x2814] [Thread 4804.0x1200 exited with code 0] [Thread 4804.0x293c exited with code 0] [Thread 4804.0x2c9c exited with code 0] FAIL: gdb.gdb/selftest.exp: xgdb is at prompt (timeout) The problem is the new thread notification, and the fact that the test expects the prompt to be the last thing in the buffer. To avoid the thread events interfering with the test, disable them, they are not useful here. With this patch, gdb.gdb/selftest.exp mostly runs fine on Cygwin, the only remaining problem appears to be: (gdb) PASS: gdb.gdb/selftest.exp: send ^C to child process signal SIGINT Continuing with signal SIGINT. PASS: gdb.gdb/selftest.exp: send SIGINT signal to child process, top GDB message FAIL: gdb.gdb/selftest.exp: send SIGINT signal to child process, bottom GDB message (timeout) Change-Id: I0b1df0503c1961c042c8de559b4d223c5d3cb95c Reviewed-By: Keith Seitz <keiths@redhat.com>
2025-08-27gdb/testsuite: use libtool to launch selftestsSimon Marchi1-17/+87
When building GDB on Cygwin, gdb/gdb.exe is a libtool wrapper (which happens to be a PE executable). The real executable is at gdb/.libs/gdb.exe. The "does gdb have debug info test" that _selftest_setup does is bogus, because it loads the libtool wrapper (which doesn't have debug info), doesn't see any debug info, and thus the test is skipped. The "correct" way to deal with libtool wrappers is to run the shell command you want to run under `libtool --mode=execute`. That will replace any path resembling to a libtool wrapper with the real executable path. But it will also add to the environment the library paths necessary for this executable to find the libraries it needs. Therefore, modify the `do_self_tests` proc to: - run the top-level GDB commands under `libtool --mode=execute` - pass the path to the inferior GDB on the command-line of the top-level, so that it gets replaced with the real executable's path However, the "file" command was previously used to detect the presence of debug info in the GDB executable. It's not easy to implement this check when loading the executable directly on the command line. So, add a separate proc, _selftest_check_executable_debug_info, that spawns a temporary GDB and does the debug info check through the file command. This proc uses libtool to obtain the path to the real executable. When building, we use the bundled libtool.m4 at the top of the tree. This means that the libtool system package, and therefore the libtool binary, might not be available. Check for the presence of the libtool binary first, and only do the conversion if it is found. If it is not found, the test should still work on platforms that don't require the conversion. With this commit, the test runs on Cygwin, even though there are failures later. Change-Id: Ie7b712cdc84671a5a017655a7e41687ff23f906c Reviewed-By: Keith Seitz <keiths@redhat.com>
2025-08-27gdb/testsuite: do not copy gdb executable in self testsSimon Marchi1-21/+2
In the ROCm-GDB testing process, we hit a problem that is a combination of these 3 factors: 1. In the downstream ROCm-GDB packages, the gdb executable is built with a relative RUNPATH: 0x000000000000001d (RUNPATH) Library runpath: [${ORIGIN}/../lib] This is done so that the installation is relocatable (the whole ROCm directory can be copied around) and things still work. For instance, the rocgdb executable needs to be able to find the libraries it needs, such as `librocm-dbgapi.so.0`. The relative runpath allows that. 2. For testing, we run the testsuite against the gdb executable installed from one of those packages. It is possible to ./configure the testsuite directory on its own, and then do: $ make check RUNTESTFLAGS="GDB=/opt/rocm/bin/rocgdb" 3. The selftests (such as gdb.gdb/selftest.exp) copy the GDB under test to the standard output directory, before trying to debug it. The problem is that the gdb executable under test that has been copied can't find the libraries it needs. With this patch, I propose that we don't copy the gdb executable, but debug it in place instead. The comment removed in this patch says "in case this OS doesn't like to edit its own text space", and has been there since forever in some form. But it's not clear if there is a host OS (where we intend to run this test) that needs this nowadays. I would bet that there isn't. If there is in fact a GDB host OS (where we intend to run this test) that needs it, we can reinstate the copying, but as an opt-in operation. Another situation where this change helps is on Windows, where gdb/gdb.exe is a libtool wrapper (the real executable is at gdb/.libs/gdb.exe). Copying gdb/gdb.exe doesn't accomplish anything useful. The next patch does further changes to account for the libtool wrapper case. I tested on Linux and Cygwin, more testing would be welcome. Change-Id: Id4148517d4fc4ecdd49f099c12003e3d16c6a93d Reviewed-By: Keith Seitz <keiths@redhat.com>
2025-08-27gdb/testsuite: remove function parameter from do_self_testsSimon Marchi3-8/+7
The function to stop at is always main. Remove the parameter and hard-code main in _selftest_setup. Change-Id: Ibbbf598203b1658305eb6bc631d029652c10edac Reviewed-By: Keith Seitz <keiths@redhat.com>
2025-08-27gdb/testsuite: namespace procs in lib/selftest-support.expSimon Marchi1-5/+5
Rename some procs in lib/selftest-support.exp that are only used internally, to make it a bit clearer that they are just internal helpers. Change-Id: Icd399ac42698209fbc8e798bf43a7d8464aa848c Reviewed-By: Keith Seitz <keiths@redhat.com>
2025-08-27Fix formatting of gdbarch_components.pyTom Tromey1-1/+1
pre-commit pointed out that gdbarch_components.py had a minor formatting issue, according to the official version of 'black'. This patch corrects the oversight.
2025-08-27objcopy "strip without global symbol" testAlan Modra1-4/+9
This binutils test fails with -fsanitize. NOSANITIZE_CFLAGS isn't available in the binutils testsuite, and importing it over from ld requires a huge amount of tcl code to be moved. So I chose to simply add -fno-sanitize=all if -fsanitize= is seem in CFLAGS. * testsuite/binutils-all/objcopy.exp (objcopy_test_without_global_symbol): Add -fno-sanitize=all to flags if -fsanitize= is found in CFLAGS_FOR_TARGET. Tidy use of objfile.
2025-08-27tekhex test for commit bf0f85df1254Alan Modra3-6/+36
* testsuite/binutils-all/tek2.obj: Change to a 3 byte data file that triggers tekhex error fixed by commit bf0f85df1254. * testsuite/binutils-all/ar.exp: Adjust to suit. * testsuite/binutils-all/objcopy.exp (objcopy_tek2bin): New proc.
2025-08-27objcopy "Unable to recognise the format of the input file"Alan Modra2-10/+13
This bogus error comes up when trying something like objcopy -O binary .../binutils/testsuite/binutils-all/tek2.obj xxx This is an annoying message, as HJ said in https://sourceware.org/pipermail/binutils/2002-August/021354.html and removed it for some cases, eg. I can make it go away by specifying -I tekhex. The message is also untrue, as objcopy does in fact know the format of the input file. I think the message should be limited to ELF input files that are being handled by the elf64-little, elf64-big, elf32-little or elf32-big targets, due to libbfd being compiled with limited target support. I'm also changing the message a litle. * objcopy.c (copy_object): Change "Unable to recognise format" message to "Unable to recognise architecture" and only report this error for ELF objects lacking their proper target support. * testsuite/binutils-all/x86-64/x86-64.exp: Update to suit.
2025-08-27Revert part of commit 8e885fece150Alan Modra1-11/+6
After commit 5e83077d552e we no longer choose a "plugin" target in objcopy so ibfd->target_defaults can again be used to test whether the user supplied a target. PR 33230 * objcopy.c (copy_file): Revert change adding a target_defaulted variable and passing down to.. (copy_archive, copy_object): ..here. Remove target_defaulted parameter. Use ibfd->target_defaulted.
2025-08-27gdb/testsuite: work around empty substring bug in expectAndrew Burgess1-11/+25
There is a bug in expect, see: https://sourceforge.net/p/expect/patches/26/ which causes empty substring matches from a regexp to instead return the complete input buffer. To reproduce this bug, try this command: expect -c 'spawn sh -c "echo -n -e \"abc\""; \ expect -re "(a?)(a)(bc)"; \ puts "\n"; \ for { set i 1 } { $i < 4 } { incr i } { \ puts -nonewline "($i): \""; \ puts -nonewline $expect_out($i,string); \ puts "\"" \ }' For a working expect the output looks like: spawn sh -c echo -n -e "abc" abc (1): "" (2): "a" (3): "bc" But for a broken expect the output looks like: spawn sh -c echo -n -e "abc" abc (1): "abc" (2): "a" (3): "bc" Notice that (1) is now returning the complete input buffer rather than the empty string, this is wrong. This is not the first time this bug has impacted GDB's testsuite, this commit seems to be working around the same problem: commit e579b537353cd91cb8fac1eaeb69901d4936766f Date: Sat Aug 16 20:32:37 2025 +0200 [gdb/testsuite] Fix TUI tests on freebsd I recently pushed this commit: commit 3825c972a636852600b47c242826313f4b9963b8 Date: Wed Jun 18 15:02:29 2025 +0100 gdb: allow gdb.Color to work correctly with pagination Which added gdb.python/py-color-pagination.exp. Bug PR gdb/33321 was then created as the test was failing on some hosts. Turns out, this is same expect bug. The fix presented here is the same as for e579b537353cd91cb8, avoid using optional regexp substrings at the start of a regexp, and instead use two separate regexp patterns. With this change in place, the test now passes on all hosts. There's no change in what is being tested after this commit. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=33321 Approved-By: Tom de Vries <tdevries@suse.de>
2025-08-27[gdb/testsuite] Fix gdb.server/non-existing-program.exp on msys2-ucrt64Tom de Vries1-1/+3
On msys2-ucrt64, with test-case gdb.server/non-existing-program.exp I get: ... (gdb) quit^M gdb_caching_proc allow_xml_test caused gdb_exit to be called gdb_caching_proc allow_xml_test marked as called gdb_caching_proc get_mount_point_map marked as called builtin_spawn gdbserver stdio non-existing-program^M Error creating process "non-existing-program " (error 2): \ The system cannot find the file specified.^M^M Exiting^M^M FAIL: gdb.server/non-existing-program.exp: gdbserver exits cleanly ... This happens because this regexp fails to match: ... # This is what we get on Windows. -re "Error creating process\r\n\r\nExiting\r\n" { ... Fix this by updating the regexp. Tested on x86_64-w64-mingw32 (msys2-ucrt64).
2025-08-27[gdb/testsuite] Add have_startup_shellTom de Vries6-3/+54
Say we disable startup-with-shell, we get: ... (gdb) run `echo 8`^M Starting program: a2-run `echo 8`^M [Thread debugging using libthread_db enabled]^M Using host libthread_db library "/lib64/libthread_db.so.1".^M usage: factorial <number>^M [Inferior 1 (process 10787) exited with code 01]^M (gdb) FAIL: gdb.base/a2-run.exp: run "a2-run" with shell (timeout) ... Fix this by only doing this test if startup-with-shell is supported. This fixes the test-case on msys2-ucrt64, where startup-with-shell is not supported. Likewise in other test-cases. Tested on x86_64-linux.
2025-08-27[gdb/testsuite] Add missing require {!is_remote host}Tom de Vries6-1/+8
I ran test-case gdb.python/py-color-pagination.exp with make-check-all.sh and noticed failures when using remote host. So I grepped to find all test-cases using with_ansi_styling_terminal and ran them with host/target board local-remote-host-native. Fix the failing test-cases using require {!is_remote host}. Tested on x86_64-linux.
2025-08-26x86: Don't put R_386_TLS_DESC/R_X86_64_TLSDESC in .rel.plt/.rela.pltH.J. Lu22-162/+309
Since lazy tlsdesc relocation has data races: https://sourceware.org/bugzilla/show_bug.cgi?id=27137 put R_386_TLS_DESC and R_X86_64_TLSDESC relocation in .rela.tls/.rel.tls section, instead of .rel.plt/.rela.plt section. Tested with glibc/i686 and glibc/x86-64 compiled with -mtls-dialect=gnu2 as well as GCC 16 configured with --with-tls=gnu2. bfd/ PR ld/28387 * elf32-i386.c (elf_i386_relocate_section): Put R_386_TLS_DESC in rel_tls_desc instead of elf.srelplt. * elf64-x86-64.c (elf_x86_64_relocate_section): Put R_X86_64_TLSDESC in rel_tls_desc instead of elf.srelplt. * elfxx-x86.c (elf_x86_allocate_dynrelocs): Use rel_tls_desc, instead of elf.srelplt, for GOT_TLS_GDESC_P. (_bfd_elf_x86_get_reloc_section): New function. (_bfd_x86_elf_late_size_sections): Use rel_tls_desc, instead of elf.srelplt, for GOT_TLS_GDESC_P. Remove next_tls_desc_index. (_bfd_x86_elf_link_setup_gnu_properties): Allocate .rela.tls/.rel.tls section for rel_tls_desc. * elfxx-x86.h (elf_x86_link_hash_table): Add rel_tls_desc. Remove next_tls_desc_index. (_bfd_elf_x86_get_reloc_section): New. (elf_backend_get_reloc_section): Likewise. ld/ PR ld/28387 * emulparams/elf32_x86_64.sh (OTHER_GOT_RELOC_SECTIONS): New. * emulparams/elf_i386.sh (OTHER_GOT_RELOC_SECTIONS): Likewise. * emulparams/elf_x86_64.sh (OTHER_GOT_RELOC_SECTIONS): Likewise. * testsuite/ld-i386/i386.exp: Run pr28387. * testsuite/ld-i386/pr17057.d: Adjusted * testsuite/ld-i386/tlsdesc.rd: Likewise. * testsuite/ld-i386/tlsdesc2.d: Likewise. * testsuite/ld-i386/tlsgdesc.rd: Likewise. * testsuite/ld-x86-64/tlsdesc.pd: Likewise. * testsuite/ld-x86-64/tlsdesc.rd: Likewise. * testsuite/ld-x86-64/tlsdesc2.d: Likewise. * testsuite/ld-x86-64/tlsgdesc.rd: Likewise. * testsuite/ld-i386/pr28387.d: New file. * testsuite/ld-i386/pr28387.s: Likewise. * testsuite/ld-x86-64/pr28387-x32.d: Likewise. * testsuite/ld-x86-64/pr28387.d: Likewise. * testsuite/ld-x86-64/pr28387.s: Likewise. * testsuite/ld-x86-64/x86-64.exp: Run pr28387 and pr28387-x32. Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
2025-08-27Automatic date update in version.inGDB Administrator1-1/+1
2025-08-26gdb/python: return gdbpy_ref<> from gdbpy_create_ptid_objectAndrew Burgess3-7/+12
Update gdbpy_create_ptid_object (python/py-infthread.c) to return a gdbpy_ref<> rather than a 'PyObject *'. This reduces the chances that a caller will leak an object, though no such memory leaks are fixed in this commit, this is just a code improvement patch. There should be no user visible changes after this commit. Approved-By: Simon Marchi <simon.marchi@efficios.com>
2025-08-26gdb: use existing argument more in rename_vmcore_idle_reg_sectionsAndrew Burgess1-5/+8
In corelow.c, in the function rename_vmcore_idle_reg_sections, the argument ABFD holds the core file bfd pointer. When this function is called current_program_space->core_bfd() is passed as the argument value. Within this function, we sometimes use the function argument, and sometimes access current_program_space->core_bfd() directly. This is confusing, and unnecessary. Lets not do that. I've renamed the argument to cbfd (for Core file BFD), and then updated the function to make use of this argument throughout. This reduces the number of accesses to global state, which is, I think, a good thing. There should be no user visible changes after this commit. Approved-By: Simon Marchi <simon.marchi@efficios.com>
2025-08-26gdb: more current_program_space->core_bfd() removalAndrew Burgess6-20/+24
This commit changes the signature of the gdbarch_core_info_proc method so that it takes a 'struct bfd *' as an extra argument. This argument is used to pass through the core file bfd pointer. Now, in corelow.c, when calling gdbarch_core_info_proc, we can pass through current_program_space->core_bfd() as the argument. Within the implementations, (Linux and FreeBSD) we can use this argument rather than having to access the core file through current_program_space. This reduces the use of global state, which I think is a good thing. There should be no user visible changes after this commit. Approved-By: Simon Marchi <simon.marchi@efficios.com>
2025-08-26gdb: use current_program_space->core_bfd() a little lessAndrew Burgess1-11/+7
The function linux_read_core_file_mappings is passed an argument CBFD, which is the BFD for the core file. In core_target::build_file_mappings, where the function is called, we pass current_program_space->core_bfd() as the argument. However, in linux_read_core_file_mappings, in some places we use the CBFD argument, and in other places we directly use current_program_space->core_bfd(). This is confusing, and unnecessary. Lets not do that. Standardise on just using CBFD. This removes some references to global state in favour of passing the global state in as an argument, I think this is a good thing. There should be no user visible changes after this commit. Approved-By: Simon Marchi <simon.marchi@efficios.com>
2025-08-26[gdb/tdep] Add XOP support in amd64_get_insn_detailsTom de Vries1-2/+30
Implement support for XOP instructions [1] in amd64_get_insn_details. The encoding scheme is documented here [2]. Essentially it's a variant of the VEX3 encoding scheme, with: - 0x8f as the first byte instead of 0xc4, and - an opcode map >= 8. The changes are roughly the same as the XOP part of an earlier submission [3], hence the tag. The only real difference is that that patch proposed to implement xop_prefix_p using: ... return pfx[0] == 0x8f && (pfx[1] & 0x38); ... which tries to resolve the conflict between the XOP prefix (starts with 0x8f) and the POP instruction (opcode 0x8f) by detecting that it's not a POP instruction. Instead, use the way AMD has resolved this conflict in the specification, by checking for opcode map >= 8: ... gdb_byte m = pfx[1] & 0x1f; return pfx[0] == 0x8f && m >= 8; ... Tested on x86_64-linux. Co-Authored-By: Jan Beulich <jbeulich@suse.com> Reviewed-By: Klaus Gerlicher<klaus.gerlicher.@intel.com> [1] https://en.wikipedia.org/wiki/XOP_instruction_set [2] https://www.amd.com/content/dam/amd/en/documents/archived-tech-docs/programmer-references/43479.pdf [3] https://sourceware.org/pipermail/gdb-patches/2019-February/155347.html
2025-08-26gdb/python: fix an unlikely memory leakAndrew Burgess1-16/+11
I noticed a possible memory leak in gdbpy_create_ptid_object, in py-infthread.c. We create a Tuple, and hold the reference in a 'PyObject*' local. If we then fail to create any of the tuple contents we perform an early exit, returning nullptr, this will leak the Tuple object. Currently, we create the Tuple as the first action in the function, but we don't really need the tuple until the end of the function. In this commit I have: 1. Moved creation of the Tuple until the end of the function, just before we need it. 2. Stored the Tuple reference in a gdbpy_ref<>. This is not strictly needed any more, but is (I think) good practice as future changes to the function will not need to worry about releasing the Tuple object. 3. Taken the opportunity to replace a NULL with nullptr in this function. 4. Inlined the local variable declarations to the point of first use. There should be no user visible changes after this commit. No tests as I have no idea how to make gdb_py_object_from_longest (and friends) fail, and so trigger the memory leak. I suspect we'd never actually see this leak in the real world, but it doesn't hurt to clean these things up. Approved-By: Simon Marchi <simon.marchi@efficios.com>