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]

diff --git a/ChangeLog b/ChangeLog
index a41cc63..77435c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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]
+
 Mon May  6 11:48:08 2002  Owen Taylor  <otaylor@redhat.com>
 
        [ merged from stable ]

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a41cc63..77435c4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+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]
+
 Mon May  6 11:48:08 2002  Owen Taylor  <otaylor@redhat.com>
 
        [ merged from stable ]

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index a41cc63..77435c4 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+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]
+
 Mon May  6 11:48:08 2002  Owen Taylor  <otaylor@redhat.com>
 
        [ merged from stable ]

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a41cc63..77435c4 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+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]
+
 Mon May  6 11:48:08 2002  Owen Taylor  <otaylor@redhat.com>
 
        [ merged from stable ]

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a41cc63..77435c4 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+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]
+
 Mon May  6 11:48:08 2002  Owen Taylor  <otaylor@redhat.com>
 
        [ merged from stable ]

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a41cc63..77435c4 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+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]
+
 Mon May  6 11:48:08 2002  Owen Taylor  <otaylor@redhat.com>
 
        [ merged from stable ]

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a41cc63..77435c4 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+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]
+
 Mon May  6 11:48:08 2002  Owen Taylor  <otaylor@redhat.com>
 
        [ merged from stable ]

diff --git a/glib/gbacktrace.h b/glib/gbacktrace.h
index 77928f9..ee0d443 100644 (file)
--- 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