[SPARC]: __builtin_trap() is bug-free in 3.3.1 and later.

diff --git a/include/asm-sparc/bug.h b/include/asm-sparc/bug.h
index a098c483d0c734bbf584f4b7891575f94faad1b0..8f04d610643ce187528058140355d207f30d0673 100644 (file)
--- a/include/asm-sparc/bug.h
+++ b/include/asm-sparc/bug.h
@@ -1,11 +1,19 @@
-/* $Id$ */
 #ifndef _SPARC_BUG_H
 #define _SPARC_BUG_H
 
 /* Only use the inline asm until a gcc release that can handle __builtin_trap
- * -rob 2003-06-25 */
+ * -rob 2003-06-25
+ *
+ * gcc-3.3.1 and later will be OK -DaveM
+ */
+#if (__GNUC__ > 3) || \
+    (__GNUC__ == 3 && __GNUC_MINOR__ > 3) || \
+    (__GNUC__ == 3 && __GNUC_MINOR__ == 3 && __GNUC_PATCHLEVEL__ >= 1)
+#define __bug_trap()           __builtin_trap()
+#else
 #define __bug_trap()                                   \
        __asm__ __volatile__ ("t 0x5\n\t" : : )
+#endif
 
 #ifdef CONFIG_DEBUG_BUGVERBOSE
 extern void do_BUG(const char *file, int line);