Merge bk://kernel.bkbits.net/davem/sparc-2.5

into home.osdl.org:/home/torvalds/v2.5/linux

arch/sparc/Makefile

@@ -52,7 +52,9 @@ CORE_Y		+= kernel/ mm/ fs/ ipc/ security/ crypto/
 CORE_Y		:= $(patsubst %/, %/built-in.o, $(CORE_Y))
 DRIVERS_Y	:= $(patsubst %/, %/built-in.o, $(drivers-y))
 NET_Y		:= $(patsubst %/, %/built-in.o, $(net-y))
-LIBS_Y		:= $(patsubst %/, %/lib.a, $(libs-y))
+LIBS_Y1		:= $(patsubst %/, %/lib.a, $(libs-y))
+LIBS_Y2		:= $(patsubst %/, %/built-in.o, $(libs-y))
+LIBS_Y		:= $(LIBS_Y1) $(LIBS_Y2)
 export INIT_Y CORE_Y DRIVERS_Y NET_Y LIBS_Y HEAD_Y
 
 # Default target

include/asm-sparc/bug.h

@@ -2,14 +2,19 @@
 #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 */
+#define __bug_trap()					\
+	__asm__ __volatile__ ("t 0x5\n\t" : : )
+
 #ifdef CONFIG_DEBUG_BUGVERBOSE
 extern void do_BUG(const char *file, int line);
 #define BUG() do {					\
 	do_BUG(__FILE__, __LINE__);			\
-	__builtin_trap();				\
+	__bug_trap();				\
 } while (0)
 #else
-#define BUG()		__builtin_trap()
+#define BUG()		__bug_trap()
 #endif
 
 #define BUG_ON(condition) do { \