Submitted by: Ismael Luceno (ismaell at montevideo dot com dot uy)
Date: 17-02-2006
Initial Package Version: 1.0.7
Origin: me
Upstream Status: Submitted
Description: Fixes compilation with gcc-3.4.x


--- kaffe-1.0.7/libraries/clib/awt/X/clr.c~	2006-02-17 19:36:17.000000000 -0300
+++ kaffe-1.0.7/libraries/clib/awt/X/clr.c	2006-02-17 19:36:17.000000000 -0300
@@ -774,9 +774,6 @@
 	//rgbs = (*env)->NewIntArray( env, 256, 0);
 	//cm = (*env)->NewObject( env, cmClazz, cmCtorId, 8, rgbs, 0);
 	break;
-
-  default:
-
   }
 
   return cm;
--- kaffe-1.0.7/kaffe/kaffevm/jit3/machine.h~	2006-02-17 20:02:16.000000000 -0300
+++ kaffe-1.0.7/kaffe/kaffevm/jit3/machine.h	2006-02-17 20:02:16.000000000 -0300
@@ -148,8 +148,8 @@
 	int     codelen;
 } nativeCodeInfo;
 
-#define	willCatch(FLAG)	willcatch.##FLAG = true
-#define	canCatch(FLAG)	willcatch.##FLAG
+#define	willCatch(FLAG)	willcatch.FLAG = true
+#define	canCatch(FLAG)	willcatch.FLAG
 
 void setupGlobalRegisters(void);
 void setupArgumentRegisters(void);
--- kaffe-1.0.7/config/i386/trampolines.c~	2006-02-17 20:11:08.000000000 -0300
+++ kaffe-1.0.7/config/i386/trampolines.c	2006-02-17 20:11:08.000000000 -0300
@@ -33,10 +33,10 @@
 
 asm(
 	START_ASM_FUNC() C_FUNC_NAME(i386_do_fixup_trampoline) "\n"
-C_FUNC_NAME(i386_do_fixup_trampoline) ":			\n
-	call	" C_FUNC_NAME(soft_fixup_trampoline) "		\n
-	popl	%ecx						\n
-	jmp	*%eax"
+	C_FUNC_NAME(i386_do_fixup_trampoline) ":		\n"
+	"call	" C_FUNC_NAME(soft_fixup_trampoline) "		\n"
+	"popl	%ecx						\n"
+	"jmp	*%eax"
 	END_ASM_FUNC()
 );
 
@@ -48,17 +48,16 @@
  */
 asm(
 	START_ASM_FUNC() C_FUNC_NAME(__kaffe_i386_gcj_fixup) "\n"
-C_FUNC_NAME(__kaffe_i386_gcj_fixup) ":
-	mov	(%esp), %eax	# get return address
-	add	-4(%eax), %eax	# add jump relative offset from previous instr.
-				# this points at at jmp *$off(%ebx) instr.
-	mov	2(%eax), %eax	# extract 'off'
-	add	%ebx, %eax	# compute $off(%ebx)
-	pushl	%eax		# pass as first argument
-	call	" C_FUNC_NAME(gcj_fixup_trampoline) " # returns target
-	addl	$4, %esp	# remove argument
-	jmp	*%eax		# jump to target
-"
+	C_FUNC_NAME(__kaffe_i386_gcj_fixup) ":"
+	"mov	(%esp), %eax	# get return address"
+	"add	-4(%eax), %eax	# add jump relative offset from previous instr."
+	"			# this points at at jmp *$off(%ebx) instr."
+	"mov	2(%eax), %eax	# extract 'off'"
+	"add	%ebx, %eax	# compute $off(%ebx)"
+	"pushl	%eax		# pass as first argument"
+	"call	" C_FUNC_NAME(gcj_fixup_trampoline) " # returns target"
+	"addl	$4, %esp	# remove argument"
+	"jmp	*%eax		# jump to target"
 	END_ASM_FUNC()
 );