[pushed/ob] Restore windows_nat_target::wait is_sw_breakpoint change

[Pedro Alves <pedro@palves.net>]

Hi!

On 2026-04-26 13:52, Hannes Domani wrote:

> This reverted the is_sw_breakpoint change done for aarch64 support.

Whoops, sorry about that.  Lost in rebase conflict resolution.

I've pushed the obvious fix below.

From 20699002b9630ed90b2518735c7d945e89445a83 Mon Sep 17 00:00:00 2001
From: Pedro Alves <pedro@palves.net>
Date: Mon, 27 Apr 2026 11:46:21 +0100
Subject: [PATCH] Restore windows_nat_target::wait is_sw_breakpoint change

Hannes noticed that commit db040a86c8 ("Windows gdb: Simplify
windows_nat_target::wait") inadvertently reverted the earlier
is_sw_breakpoint change in windows_nat_target::wait from 6fc89bae17
("Move software breakpoint recognition code into x86-windows-nat.c")
for Aarch64 support.  This commit restores it.

Change-Id: Ice2181bf4a6c8dcefd127a85ebfc660a3f430517
commit-id:546f39de
---
 gdb/windows-nat.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 17166fdcfad..1dfe2df389d 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -1216,10 +1216,8 @@ windows_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus,
 	      th->stopped_at_software_breakpoint = false;
 	      if (current_event.dwDebugEventCode
 		  == EXCEPTION_DEBUG_EVENT
-		  && ((current_event.u.Exception.ExceptionRecord.ExceptionCode
-		       == EXCEPTION_BREAKPOINT)
-		      || (current_event.u.Exception.ExceptionRecord.ExceptionCode
-			  == STATUS_WX86_BREAKPOINT))
+		  && is_sw_breakpoint (&current_event
+				       .u.Exception.ExceptionRecord)
 		  && windows_process->windows_initialization_done)
 		{
 		  th->stopped_at_software_breakpoint = true;

base-commit: 831f056f767fe775c8862a09dc3bbe2e69c5e17c
-- 
2.53.0