[PATCH 2/3] Revert "Fix ctrl-c when debugging WOW64 processes"

[Hannes Domani via Gdb-patches <gdb-patches@sourceware.org>]

This is no longer needed, since breakpoints in 64bit code can now be
handled by gdb.

2020-09-23  Hannes Domani  <ssbssa@yahoo.de>

	* windows-nat.c (ctrl_c_handler): Remove special handling for
	WOW64 processes.
---
 gdb/windows-nat.c | 37 +++----------------------------------
 1 file changed, 3 insertions(+), 34 deletions(-)

diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 1e8e21446f..f9172c3a7f 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -71,7 +71,6 @@
 #include "gdbsupport/pathstuff.h"
 #include "gdbsupport/gdb_wait.h"
 #include "nat/windows-nat.h"
-#include "gdbsupport/symbol.h"
 
 using namespace windows_nat;
 
@@ -234,9 +233,6 @@ static std::vector<windows_thread_info *> thread_list;
 /* Counts of things.  */
 static int saw_create;
 static int open_process_used = 0;
-#ifdef __x86_64__
-static void *wow64_dbgbreak;
-#endif
 
 /* User options.  */
 static bool new_console = false;
@@ -1523,36 +1519,9 @@ ctrl_c_handler (DWORD event_type)
   if (!new_console && !attach_flag)
     return TRUE;
 
-#ifdef __x86_64__
-  if (wow64_process)
-    {
-      /* Call DbgUiRemoteBreakin of the 32bit ntdll.dll in the target process.
-	 DebugBreakProcess would call the one of the 64bit ntdll.dll, which
-	 can't be correctly handled by gdb.  */
-      if (wow64_dbgbreak == nullptr)
-	{
-	  CORE_ADDR addr;
-	  if (!find_minimal_symbol_address ("ntdll!DbgUiRemoteBreakin",
-					    &addr, 0))
-	    wow64_dbgbreak = (void *) addr;
-	}
-
-      if (wow64_dbgbreak != nullptr)
-	{
-	  HANDLE thread = CreateRemoteThread (current_process_handle, NULL,
-					      0, (LPTHREAD_START_ROUTINE)
-					      wow64_dbgbreak, NULL, 0, NULL);
-	  if (thread)
-	    CloseHandle (thread);
-	}
-    }
-  else
-#endif
-    {
-      if (!DebugBreakProcess (current_process_handle))
-	warning (_("Could not interrupt program.  "
-		   "Press Ctrl-c in the program console."));
-    }
+  if (!DebugBreakProcess (current_process_handle))
+    warning (_("Could not interrupt program.  "
+	       "Press Ctrl-c in the program console."));
 
   /* Return true to tell that Ctrl-C has been handled.  */
   return TRUE;
-- 
2.27.0