4 files changed, 24 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 241f3e7..3b851db 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2020-09-23  Hannes Domani  <ssbssa@yahoo.de>
+
+	* nat/windows-nat.c (handle_exception): Handle 64bit breakpoints
+	in WOW64 processes as SIGINT.
+	* nat/windows-nat.h: Make wow64_process a shared variable.
+	* windows-nat.c: Remove static wow64_process variable.
+
 2020-09-23  Tom Tromey  <tom@tromey.com>
 
 	PR symtab/25470:
diff --git a/gdb/nat/windows-nat.c b/gdb/nat/windows-nat.c
index be6db97..2cbbc0f 100644
--- a/gdb/nat/windows-nat.c
+++ b/gdb/nat/windows-nat.c
@@ -41,6 +41,7 @@ std::vector<pending_stop> pending_stops;
 EXCEPTION_RECORD siginfo_er;
 
 #ifdef __x86_64__
+bool wow64_process = false;
 bool ignore_first_breakpoint = false;
 #endif
 
@@ -240,6 +241,20 @@ handle_exception (struct target_waitstatus *ourstatus, bool debug_exceptions)
 	  ourstatus->kind = TARGET_WAITKIND_SPURIOUS;
 	  ignore_first_breakpoint = false;
 	}
+      else if (wow64_process)
+	{
+	  /* This breakpoint exception is triggered for WOW64 processes when
+	     reaching an int3 instruction in 64bit code.
+	     gdb checks for int3 in case of SIGTRAP, this fails because
+	     Wow64GetThreadContext can only report the pc of 32bit code, and
+	     gdb lets the target process continue.
+	     So handle it as SIGINT instead, then the target is stopped
+	     unconditionally.  */
+	  DEBUG_EXCEPTION_SIMPLE ("EXCEPTION_BREAKPOINT");
+	  rec->ExceptionCode = DBG_CONTROL_C;
+	  ourstatus->value.sig = GDB_SIGNAL_INT;
+	  break;
+	}
 #endif
       /* FALLTHROUGH */
     case STATUS_WX86_BREAKPOINT:
diff --git a/gdb/nat/windows-nat.h b/gdb/nat/windows-nat.h
index f742db2..9bfcb16 100644
--- a/gdb/nat/windows-nat.h
+++ b/gdb/nat/windows-nat.h
@@ -215,6 +215,8 @@ extern std::vector<pending_stop> pending_stops;
 extern EXCEPTION_RECORD siginfo_er;
 
 #ifdef __x86_64__
+/* The target is a WOW64 process */
+extern bool wow64_process;
 /* Ignore first breakpoint exception of WOW64 process */
 extern bool ignore_first_breakpoint;
 #endif
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index ba88c33..7fff41d 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -235,7 +235,6 @@ static std::vector<windows_thread_info *> thread_list;
 static int saw_create;
 static int open_process_used = 0;
 #ifdef __x86_64__
-static bool wow64_process = false;
 static void *wow64_dbgbreak;
 #endif