From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18525 invoked by alias); 20 Apr 2010 06:10:05 -0000 Received: (qmail 18505 invoked by uid 22791); 20 Apr 2010 06:10:04 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=BAYES_00,MSGID_MULTIPLE_AT,TW_EG X-Spam-Check-By: sourceware.org Received: from mailhost.u-strasbg.fr (HELO mailhost.u-strasbg.fr) (130.79.200.152) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 20 Apr 2010 06:09:54 +0000 Received: from baal.u-strasbg.fr (baal.u-strasbg.fr [IPv6:2001:660:2402::41]) by mailhost.u-strasbg.fr (8.14.3/jtpda-5.5pre1) with ESMTP id o3K69lmf040342 ; Tue, 20 Apr 2010 08:09:47 +0200 (CEST) (envelope-from pierre.muller@ics-cnrs.unistra.fr) Received: from mailserver.u-strasbg.fr (ms2.u-strasbg.fr [IPv6:2001:660:2402:d::11]) by baal.u-strasbg.fr (8.14.0/jtpda-5.5pre1) with ESMTP id o3K69l03056172 ; Tue, 20 Apr 2010 08:09:47 +0200 (CEST) (envelope-from pierre.muller@ics-cnrs.unistra.fr) Received: from d620muller (lec67-4-82-230-53-140.fbx.proxad.net [82.230.53.140]) (user=mullerp mech=LOGIN) by mailserver.u-strasbg.fr (8.14.3/jtpda-5.5pre1) with ESMTP id o3K69khb079974 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=NO) ; Tue, 20 Apr 2010 08:09:46 +0200 (CEST) (envelope-from pierre.muller@ics-cnrs.unistra.fr) From: "Pierre Muller" To: "'Pedro Alves'" Cc: References: <001201cae013$b858d3b0$290a7b10$@muller@ics-cnrs.unistra.fr> <201004200022.31807.pedro@codesourcery.com> In-Reply-To: <201004200022.31807.pedro@codesourcery.com> Subject: RE: [RFA] [2/4] Mingw64 gdbserver support Date: Tue, 20 Apr 2010 06:10:00 -0000 Message-ID: <001501cae050$1feea720$5fcbf560$@muller@ics-cnrs.unistra.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2010-04/txt/msg00601.txt.bz2 It appears that I missed two issues raised by Pedro in my commit of part 2. This patch resolves those. With my apologies, Pierre 2010-04-20 Pierre Muller * win32-i386-low.c: Use __x86_64__ macro instead of __x86_64 to be consistent with other sources of this directory. (init_registers_amd64): Correct name of source file of this function in the comment. Index: win32-i386-low.c =================================================================== RCS file: /cvs/src/src/gdb/gdbserver/win32-i386-low.c,v retrieving revision 1.19 diff -u -p -r1.19 win32-i386-low.c --- win32-i386-low.c 20 Apr 2010 00:17:05 -0000 1.19 +++ win32-i386-low.c 20 Apr 2010 06:03:48 -0000 @@ -28,8 +28,8 @@ #define FLAG_TRACE_BIT 0x100 -#ifdef __x86_64 -/* Defined in auto-generated file reg-i386.c. */ +#ifdef __x86_64__ +/* Defined in auto-generated file reg-amd64.c. */ void init_registers_amd64 (void); #else /* Defined in auto-generated file reg-i386.c. */ @@ -223,7 +223,7 @@ i386_single_step (win32_thread_info *th) th->context.EFlags |= FLAG_TRACE_BIT; } -#ifndef __x86_64 +#ifndef __x86_64__ /* An array of offset mappings into a Win32 Context structure. This is a one-to-one mapping which is indexed by gdb's register @@ -280,7 +280,7 @@ static const int mappings[] = { }; #undef context_offset -#else /* __x86_64 */ +#else /* __x86_64__ */ #define context_offset(x) (offsetof (CONTEXT, x)) static const int mappings[] = @@ -347,7 +347,7 @@ static const int mappings[] = }; #undef context_offset -#endif /* __x86_64 */ +#endif /* __x86_64__ */ /* Fetch register from gdbserver regcache data. */ static void @@ -386,7 +386,7 @@ static const unsigned char i386_win32_br static void init_windows_x86 (void) { -#ifdef __x86_64 +#ifdef __x86_64__ init_registers_amd64 (); #else init_registers_i386 ();