From 8228833924fa3c92a436a5f938a94dae180773f9 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 3 May 2021 08:57:46 -0600 Subject: [PATCH] Fix x86_64 mingw build PR build/27807 points out that my recent changes to the Windows port missed a spot in win32-i386-low.cc -- a call to win32_Wow64GetThreadContext remained, causing link errors in gdbserver. This happened because I tested an i686 build, but this code is only used on an x86_64 build. This patch fixes the bug. I am checking it in. gdbserver/ChangeLog 2021-05-03 Tom Tromey PR build/27807: * win32-i386-low.cc (i386_get_thread_context): Call Wow64GetThreadContext, not win32_Wow64GetThreadContext. --- gdbserver/ChangeLog | 6 ++++++ gdbserver/win32-i386-low.cc | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 057ed158be9..8ff59d1f486 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,9 @@ +2021-05-03 Tom Tromey + + PR build/27807: + * win32-i386-low.cc (i386_get_thread_context): Call + Wow64GetThreadContext, not win32_Wow64GetThreadContext. + 2021-04-30 Tom Tromey * win32-low.cc (do_initial_child_stuff): Update. diff --git a/gdbserver/win32-i386-low.cc b/gdbserver/win32-i386-low.cc index 5fc4be0d4c7..e2afd2a8c17 100644 --- a/gdbserver/win32-i386-low.cc +++ b/gdbserver/win32-i386-low.cc @@ -260,7 +260,7 @@ i386_get_thread_context (windows_thread_info *th) BOOL ret; #ifdef __x86_64__ if (wow64_process) - ret = win32_Wow64GetThreadContext (th->h, &th->wow64_context); + ret = Wow64GetThreadContext (th->h, &th->wow64_context); else #endif ret = GetThreadContext (th->h, &th->context); -- 2.30.2