[kaffe] CVS kaffe (dalibor): Fix for gcc 3.2.3 build error on arm-linux
Kaffe CVS
cvs-commits at kaffe.org
Thu Sep 18 09:49:01 PDT 2003
PatchSet 4046
Date: 2003/09/18 16:46:24
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Fix for gcc 3.2.3 build error on arm-linux
gcc 3.2.3 doesn't like multi-line string literals at all, and
aborts with a parse error. This fixes it for arm linux.
Members:
ChangeLog:1.1642->1.1643
config/arm/trampolines.c:1.4->1.5
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1642 kaffe/ChangeLog:1.1643
--- kaffe/ChangeLog:1.1642 Thu Sep 18 15:26:53 2003
+++ kaffe/ChangeLog Thu Sep 18 16:46:24 2003
@@ -1,3 +1,9 @@
+2003-09-18 Dalibor Topic <robilad at kaffe.org>
+
+ * config/arm/trampolines.c:
+ Fixed multi-line string compiler breakage.
+ Reported by: Arnaud Vandyck <arnaud.vandyck at ulg.ac.be>
+
2003-09-18 Timothy S. Stack <stack at cs.utah.edu>
* libraries/clib/net/NetworkInterface.c:
Index: kaffe/config/arm/trampolines.c
diff -u kaffe/config/arm/trampolines.c:1.4 kaffe/config/arm/trampolines.c:1.5
--- kaffe/config/arm/trampolines.c:1.4 Tue Feb 25 23:06:29 2003
+++ kaffe/config/arm/trampolines.c Thu Sep 18 16:46:25 2003
@@ -46,13 +46,13 @@
#else
C_FUNC_NAME(arm_do_fixup_trampoline) ": \n"
#endif
-" stmdb sp!,{r0,r1,r2,r3,lr}\n
- mov r0,ip\n
- bl " C_FUNC_NAME(soft_fixup_trampoline) " \n
- mov ip, r0\n
- ldmia sp!,{r0,r1,r2,r3,lr}\n
- mov pc, ip\n
-"
+" stmdb sp!,{r0,r1,r2,r3,lr}\n"
+" mov r0,ip\n"
+" bl " C_FUNC_NAME(soft_fixup_trampoline) " \n"
+" mov ip, r0\n"
+" ldmia sp!,{r0,r1,r2,r3,lr}\n"
+" mov pc, ip\n"
+
END_ASM_FUNC()
);
@@ -65,13 +65,13 @@
#else
C_FUNC_NAME(arm_do_fixup_trampoline) ": \n"
#endif
-" stmdb sp!,{r0,r1,r2,r3,lr}\n
- mov r0,ip\n
- bl " C_FUNC_NAME(soft_fixup_trampoline) " (PLT) \n
- mov ip, r0\n
- ldmia sp!,{r0,r1,r2,r3,lr}\n
- mov pc, ip\n
-"
+" stmdb sp!,{r0,r1,r2,r3,lr}\n"
+" mov r0,ip\n"
+" bl " C_FUNC_NAME(soft_fixup_trampoline) " (PLT) \n"
+" mov ip, r0\n"
+" ldmia sp!,{r0,r1,r2,r3,lr}\n"
+" mov pc, ip\n"
+
END_ASM_FUNC()
);
More information about the kaffe
mailing list