Index: binreloc/prefix.c
===================================================================
RCS file: /cvs/kaffe/kaffe/binreloc/prefix.c,v
retrieving revision 1.2
diff -u -r1.2 prefix.c
--- binreloc/prefix.c	10 Dec 2004 00:37:20 -0000	1.2
+++ binreloc/prefix.c	23 May 2005 15:31:06 -0000
@@ -110,9 +110,12 @@
 
 		if (!fgets (line, sizeof (line), f))
 			continue;
-		if (!strstr (line, " r-xp ") || !strchr (line, '/'))
+		if (!strchr (line, '/'))
 			continue;
-
+#ifndef __CYGWIN__ 
+		if (!strstr (line, " r-xp "))
+			continue;
+#endif
 		sscanf (line, "%x-%x ", &start, &end);
 		if (((unsigned int) symbol) >= start && ((unsigned int) symbol) < end)
 		{
Index: config/i386/trampolines.S
===================================================================
RCS file: /cvs/kaffe/kaffe/config/i386/trampolines.S,v
retrieving revision 1.1
diff -u -r1.1 trampolines.S
--- config/i386/trampolines.S	16 Mar 2005 10:30:56 -0000	1.1
+++ config/i386/trampolines.S	23 May 2005 15:31:06 -0000
@@ -20,13 +20,15 @@
 TRAMPOLINE_FUNCTION()
 
 #else
-/*
- * Otherwise we'll try to construct one.
- */
-#if defined(HAVE_UNDERSCORED_C_NAMES)
-#define	C_FUNC_NAME(FUNC) _FUNC
-#else
-#define	C_FUNC_NAME(FUNC) FUNC
+/*
+ * Otherwise we'll try to construct one.
+ */
+#if !defined(C_FUNC_NAME)
+#if defined(HAVE_UNDERSCORED_C_NAMES)
+#define C_FUNC_NAME(FUNC) _ ## FUNC
+#else
+#define C_FUNC_NAME(FUNC) FUNC
+#endif
 #endif
 
      .text
@@ -38,7 +40,7 @@
 	push	%ebp
 	mov	%esp,%ebp
 	push	%eax
-	call	C_FUNC_NAME(soft_fixup_trampoline)
+	call	C_FUNC_NAME(soft_fixup_trampoline)
 	leave
 	jmp	*%eax