summaryrefslogtreecommitdiff
path: root/glib
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-05-06 20:08:54 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-05-06 20:08:54 +0000
commit0522bb588bc406ee83eb9c1a1ff5b13edba776bc (patch)
tree395a8f8d4323af3fba7cec103ccb77d704937abd /glib
parent26a67305472e9476f2ba41ce5f0cc4951b99b572 (diff)
downloadglib-0522bb588bc406ee83eb9c1a1ff5b13edba776bc.tar.gz
Exclude OSF from alpha definition of G_BREAKPOINT(), since the assembler
Mon May 6 16:00:41 2002 Owen Taylor <otaylor@redhat.com> * glib/gbacktrace.h: Exclude OSF from alpha definition of G_BREAKPOINT(), since the assembler apparently doesn't support bpt. (#77852, Gareth Pierce) [from stable]
Diffstat (limited to 'glib')
-rw-r--r--glib/gbacktrace.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/glib/gbacktrace.h b/glib/gbacktrace.h
index 77928f9b7..ee0d443a5 100644
--- a/glib/gbacktrace.h
+++ b/glib/gbacktrace.h
@@ -44,13 +44,13 @@ 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.
- * Actual use is strongly deprecated of course ;)
+ * Actual use is strongly discouraged of course ;)
*/
#if defined (__i386__) && 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
-#elif defined (__alpha__) && defined (__GNUC__) && __GNUC__ >= 2
+#elif defined (__alpha__) && !defined(__osf__) && defined (__GNUC__) && __GNUC__ >= 2
# define G_BREAKPOINT() G_STMT_START{ __asm__ __volatile__ ("bpt"); }G_STMT_END
#else /* !__i386__ && !__alpha__ */
# define G_BREAKPOINT() G_STMT_START{ raise (SIGTRAP); }G_STMT_END