From: Manish Singh <yosh@gimp.org>
Date: Fri, 12 Mar 2004 23:31:23 +0000 (+0000)
Subject: ia32's G_BREAKPOINT() implementation works on amd64 too. Enable it.
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=d8ba1394da7996a779344e8274653c3936462b64;p=dana%2Fcg-glib.git

ia32's G_BREAKPOINT() implementation works on amd64 too. Enable it.

Fri Mar 12 15:30:58 2004  Manish Singh  <yosh@gimp.org>

        * glib/gbacktrace.h: ia32's G_BREAKPOINT() implementation works on
        amd64 too. Enable it.
---

diff --git a/ChangeLog b/ChangeLog
index 23d89649..68b26875 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 12 15:30:58 2004  Manish Singh  <yosh@gimp.org>
+
+	* glib/gbacktrace.h: ia32's G_BREAKPOINT() implementation works on
+	amd64 too. Enable it.
+
 Fri Mar 12 15:21:22 2004  Manish Singh  <yosh@gimp.org>
 
 	* glib/gatomic.c: Non-optimizing compile fails for two asm
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 23d89649..68b26875 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri Mar 12 15:30:58 2004  Manish Singh  <yosh@gimp.org>
+
+	* glib/gbacktrace.h: ia32's G_BREAKPOINT() implementation works on
+	amd64 too. Enable it.
+
 Fri Mar 12 15:21:22 2004  Manish Singh  <yosh@gimp.org>
 
 	* glib/gatomic.c: Non-optimizing compile fails for two asm
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 23d89649..68b26875 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Fri Mar 12 15:30:58 2004  Manish Singh  <yosh@gimp.org>
+
+	* glib/gbacktrace.h: ia32's G_BREAKPOINT() implementation works on
+	amd64 too. Enable it.
+
 Fri Mar 12 15:21:22 2004  Manish Singh  <yosh@gimp.org>
 
 	* glib/gatomic.c: Non-optimizing compile fails for two asm
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 23d89649..68b26875 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Fri Mar 12 15:30:58 2004  Manish Singh  <yosh@gimp.org>
+
+	* glib/gbacktrace.h: ia32's G_BREAKPOINT() implementation works on
+	amd64 too. Enable it.
+
 Fri Mar 12 15:21:22 2004  Manish Singh  <yosh@gimp.org>
 
 	* glib/gatomic.c: Non-optimizing compile fails for two asm
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 23d89649..68b26875 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri Mar 12 15:30:58 2004  Manish Singh  <yosh@gimp.org>
+
+	* glib/gbacktrace.h: ia32's G_BREAKPOINT() implementation works on
+	amd64 too. Enable it.
+
 Fri Mar 12 15:21:22 2004  Manish Singh  <yosh@gimp.org>
 
 	* glib/gatomic.c: Non-optimizing compile fails for two asm
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 23d89649..68b26875 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri Mar 12 15:30:58 2004  Manish Singh  <yosh@gimp.org>
+
+	* glib/gbacktrace.h: ia32's G_BREAKPOINT() implementation works on
+	amd64 too. Enable it.
+
 Fri Mar 12 15:21:22 2004  Manish Singh  <yosh@gimp.org>
 
 	* glib/gatomic.c: Non-optimizing compile fails for two asm
diff --git a/glib/gbacktrace.h b/glib/gbacktrace.h
index ee0d443a..0c9981a3 100644
--- a/glib/gbacktrace.h
+++ b/glib/gbacktrace.h
@@ -43,10 +43,10 @@ G_BEGIN_DECLS
 void g_on_error_query (const gchar *prg_name);
 void g_on_error_stack_trace (const gchar *prg_name);
 
-/* Hacker macro to place breakpoints for elected machines.
+/* Hacker macro to place breakpoints for selected machines.
  * Actual use is strongly discouraged of course ;)
  */
-#if defined (__i386__) && defined (__GNUC__) && __GNUC__ >= 2
+#if (defined (__i386__) || defined (__x86_64__)) && defined (__GNUC__) && __GNUC__ >= 2
 #  define G_BREAKPOINT()	G_STMT_START{ __asm__ __volatile__ ("int $03"); }G_STMT_END
 #elif defined (_MSC_VER) && defined (_M_IX86)
 #  define G_BREAKPOINT()	G_STMT_START{ __asm int 3h }G_STMT_END