From: Pierre Muller <muller@sourceware.org>
Date: Tue, 20 Apr 2010 09:58:42 +0000 (+0000)
Subject: 	* win32-i386-low.c: Use __x86_64__ macro instead of __x86_64 to
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1c07cc19039fc86c4f857fae766f02f5452a9a22;p=binutils-gdb.git

	* 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.
---

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 2d6b844a48d..04f706df58f 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-20  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+	* 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.
+
 2010-04-19  Pierre Muller  <muller@ics.u-strasbg.fr>
 
 	* configure.srv (x86_64-*-mingw*): New configuration for Windows
diff --git a/gdb/gdbserver/win32-i386-low.c b/gdb/gdbserver/win32-i386-low.c
index 6f5ab09bb0f..2e67615497e 100644
--- a/gdb/gdbserver/win32-i386-low.c
+++ b/gdb/gdbserver/win32-i386-low.c
@@ -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_breakpoint = 0xcc;
 static void
 init_windows_x86 (void)
 {
-#ifdef __x86_64
+#ifdef __x86_64__
   init_registers_amd64 ();
 #else
   init_registers_i386 ();