[kaffe] CVS kaffe (guilhem): Fixed symbol concatenation in trampolines.S

[Kaffe CVS]

PatchSet 6670 
Date: 2005/06/29 11:37:45
Author: guilhem
Branch: HEAD
Tag: (none) 
Log:
Fixed symbol concatenation in trampolines.S

        * config/alpha/trampolines.S,
        config/arm/trampolines.S,
        config/i386/trampolines.S,
        config/m68k/trampolines.S,
        config/mips/trampolines.S,
        config/sh/trampolines.S,
        config/sparc/trampolines.S
        (C_FUNC_NAME): Fixed concatenation.

        Reported by Davanum Srinivas <dims at yahoo.com>,
        Dalibor Topic  <robilad at kaffe.org>

Members: 
	ChangeLog:1.4195->1.4196 
	config/alpha/trampolines.S:1.1->1.2 
	config/arm/trampolines.S:1.1->1.2 
	config/i386/trampolines.S:1.1->1.2 
	config/m68k/trampolines.S:1.1->1.2 
	config/mips/trampolines.S:1.2->1.3 
	config/sh/trampolines.S:1.2->1.3 
	config/sparc/trampolines.S:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4195 kaffe/ChangeLog:1.4196
--- kaffe/ChangeLog:1.4195	Wed Jun 29 09:42:27 2005
+++ kaffe/ChangeLog	Wed Jun 29 11:37:45 2005
@@ -1,3 +1,17 @@
+2005-06-29  Guilhem Lavaux  <guilhem at kaffe.org>
+
+	* config/alpha/trampolines.S,
+	config/arm/trampolines.S,
+	config/i386/trampolines.S,
+	config/m68k/trampolines.S,
+	config/mips/trampolines.S,
+	config/sh/trampolines.S,
+	config/sparc/trampolines.S
+	(C_FUNC_NAME): Fixed concatenation.
+
+	Reported by Davanum Srinivas <dims at yahoo.com>,
+	Dalibor Topic  <robilad at kaffe.org>
+
 2005-06-28  Dalibor Topic  <robilad at kaffe.org>
 
 	* configure.ac (DLOPEN_JAVA_LIBS): Removed libclasspath and 
Index: kaffe/config/alpha/trampolines.S
diff -u kaffe/config/alpha/trampolines.S:1.1 kaffe/config/alpha/trampolines.S:1.2
--- kaffe/config/alpha/trampolines.S:1.1	Wed Mar 16 10:30:56 2005
+++ kaffe/config/alpha/trampolines.S	Wed Jun 29 11:37:48 2005
@@ -28,7 +28,7 @@
  */
 #if !defined(C_FUNC_NAME)
 #if defined(HAVE_UNDERSCORED_C_NAMES)
-#define C_FUNC_NAME(FUNC) _FUNC
+#define C_FUNC_NAME(FUNC) _ ## FUNC
 #else
 #define C_FUNC_NAME(FUNC) FUNC
 #endif
Index: kaffe/config/arm/trampolines.S
diff -u kaffe/config/arm/trampolines.S:1.1 kaffe/config/arm/trampolines.S:1.2
--- kaffe/config/arm/trampolines.S:1.1	Wed Mar 16 10:30:56 2005
+++ kaffe/config/arm/trampolines.S	Wed Jun 29 11:37:48 2005
@@ -24,7 +24,7 @@
  * Otherwise we'll try to construct one.
  */
 #if defined(HAVE_UNDERSCORED_C_NAMES)
-#define	C_FUNC_NAME(FUNC) _FUNC
+#define	C_FUNC_NAME(FUNC) _ ## FUNC
 #else
 #define	C_FUNC_NAME(FUNC) FUNC
 #endif
Index: kaffe/config/i386/trampolines.S
diff -u kaffe/config/i386/trampolines.S:1.1 kaffe/config/i386/trampolines.S:1.2
--- kaffe/config/i386/trampolines.S:1.1	Wed Mar 16 10:30:56 2005
+++ kaffe/config/i386/trampolines.S	Wed Jun 29 11:37:51 2005
@@ -24,7 +24,7 @@
  * Otherwise we'll try to construct one.
  */
 #if defined(HAVE_UNDERSCORED_C_NAMES)
-#define	C_FUNC_NAME(FUNC) _FUNC
+#define	C_FUNC_NAME(FUNC) _ ## FUNC
 #else
 #define	C_FUNC_NAME(FUNC) FUNC
 #endif
Index: kaffe/config/m68k/trampolines.S
diff -u kaffe/config/m68k/trampolines.S:1.1 kaffe/config/m68k/trampolines.S:1.2
--- kaffe/config/m68k/trampolines.S:1.1	Wed Mar 16 10:30:57 2005
+++ kaffe/config/m68k/trampolines.S	Wed Jun 29 11:37:52 2005
@@ -29,7 +29,7 @@
  * Otherwise we'll try to construct one.
  */
 #if defined(HAVE_UNDERSCORED_C_NAMES)
-#define C_FUNC_NAME(FUNC) _FUNC
+#define C_FUNC_NAME(FUNC) _ ## FUNC
 #else
 #define C_FUNC_NAME(FUNC) FUNC
 #endif
Index: kaffe/config/mips/trampolines.S
diff -u kaffe/config/mips/trampolines.S:1.2 kaffe/config/mips/trampolines.S:1.3
--- kaffe/config/mips/trampolines.S:1.2	Thu Mar 24 23:04:49 2005
+++ kaffe/config/mips/trampolines.S	Wed Jun 29 11:37:52 2005
@@ -24,7 +24,7 @@
  * Otherwise we'll try to construct one.
  */
 #if defined(HAVE_UNDERSCORED_C_NAMES)
-#define C_FUNC_NAME(FUNC) _FUNC
+#define C_FUNC_NAME(FUNC) _ ## FUNC
 #else
 #define C_FUNC_NAME(FUNC) FUNC
 #endif
Index: kaffe/config/sh/trampolines.S
diff -u kaffe/config/sh/trampolines.S:1.2 kaffe/config/sh/trampolines.S:1.3
--- kaffe/config/sh/trampolines.S:1.2	Sat May 28 03:16:38 2005
+++ kaffe/config/sh/trampolines.S	Wed Jun 29 11:37:52 2005
@@ -24,7 +24,7 @@
  * Otherwise we'll try to construct one.
  */
 #if defined(HAVE_UNDERSCORED_C_NAMES)
-#define C_FUNC_NAME(FUNC) _FUNC
+#define C_FUNC_NAME(FUNC) _ ## FUNC
 #else
 #define C_FUNC_NAME(FUNC) FUNC
 #endif
Index: kaffe/config/sparc/trampolines.S
diff -u kaffe/config/sparc/trampolines.S:1.1 kaffe/config/sparc/trampolines.S:1.2
--- kaffe/config/sparc/trampolines.S:1.1	Wed Mar 16 10:30:58 2005
+++ kaffe/config/sparc/trampolines.S	Wed Jun 29 11:37:53 2005
@@ -24,7 +24,7 @@
  * Otherwise we'll try to construct one.
  */
 #if defined(HAVE_UNDERSCORED_C_NAMES)
-#define C_FUNC_NAME(FUNC) _FUNC
+#define C_FUNC_NAME(FUNC) _ ## FUNC
 #else
 #define C_FUNC_NAME(FUNC) FUNC
 #endif