pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/kaffe Fix build with gcc3. From Jonathan Perkin ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/194ac3756964
branches: trunk
changeset: 461491:194ac3756964
user: jmmv <jmmv%pkgsrc.org@localhost>
date: Tue Sep 16 20:15:29 2003 +0000
description:
Fix build with gcc3. From Jonathan Perkin in PR pkg/22437.
diffstat:
lang/kaffe/distinfo | 10 ++-
lang/kaffe/patches/patch-ad | 13 ++++
lang/kaffe/patches/patch-ae | 134 ++++++++++++++++++++++++++++++++++++++++++++
lang/kaffe/patches/patch-af | 48 +++++++++++++++
lang/kaffe/patches/patch-ag | 47 +++++++++++++++
lang/kaffe/patches/patch-ah | 38 ++++++++++++
lang/kaffe/patches/patch-ai | 99 ++++++++++++++++++++++++++++++++
lang/kaffe/patches/patch-aj | 27 ++++++++
lang/kaffe/patches/patch-ak | 15 ++++
9 files changed, 430 insertions(+), 1 deletions(-)
diffs (truncated from 473 to 300 lines):
diff -r 312c98838ee8 -r 194ac3756964 lang/kaffe/distinfo
--- a/lang/kaffe/distinfo Tue Sep 16 20:12:53 2003 +0000
+++ b/lang/kaffe/distinfo Tue Sep 16 20:15:29 2003 +0000
@@ -1,7 +1,15 @@
-$NetBSD: distinfo,v 1.6 2003/01/29 10:58:50 jlam Exp $
+$NetBSD: distinfo,v 1.7 2003/09/16 20:15:29 jmmv Exp $
SHA1 (kaffe-1.0.7.tar.gz) = 4f839362b9e1fbdb6c7af8f69663e5b0bf922e8e
Size (kaffe-1.0.7.tar.gz) = 4248252 bytes
SHA1 (patch-aa) = 66da985c6ba6891adca4c73351f990081e24e4e4
SHA1 (patch-ab) = 5b68b671ed1a455cbe76bc316d9ea278fdf67349
SHA1 (patch-ac) = 5947ff51d8db1988b57a609febf19c9d74d4c614
+SHA1 (patch-ad) = 9d8e61a6c3a73af6a50b20ac7e28911b63c2e566
+SHA1 (patch-ae) = f7d6ff1e9356f6ba00c23c2ab0a1682aa9ccc003
+SHA1 (patch-af) = 649f2c4c2f57331324e9c93bb1a2838476f49b77
+SHA1 (patch-ag) = 8a936289c45969e71f1bf475b0ccb6ec5701e202
+SHA1 (patch-ah) = 63c7229616a63179cc7dcbdb0f03d555c3682b44
+SHA1 (patch-ai) = 0533725771ab9bdfc4a922a41d3ac63e5facae9b
+SHA1 (patch-aj) = b2c5604c4fddf54c381ccd627ec69259f7735d24
+SHA1 (patch-ak) = cec9b6745efde3388b49a82cfd4e5b570f4208fe
diff -r 312c98838ee8 -r 194ac3756964 lang/kaffe/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/kaffe/patches/patch-ad Tue Sep 16 20:15:29 2003 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.3 2003/09/16 20:15:31 jmmv Exp $
+
+--- kaffe/kaffevm/systems/unix-jthreads/jthread.c.orig 2002-06-01 04:27:22.000000000 +0100
++++ kaffe/kaffevm/systems/unix-jthreads/jthread.c 2003-08-11 12:21:55.382934000 +0100
+@@ -135,7 +135,7 @@
+
+ /* A signal context pointer type, used in parameter lists/declarations */
+ #ifndef SIGNAL_CONTEXT_POINTER
+-#define SIGNAL_CONTEXT_POINTER(x) void *##x
++#define SIGNAL_CONTEXT_POINTER(x) void *x
+ #endif
+
+ /* Get the PC from a signal context pointer */
diff -r 312c98838ee8 -r 194ac3756964 lang/kaffe/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/kaffe/patches/patch-ae Tue Sep 16 20:15:29 2003 +0000
@@ -0,0 +1,134 @@
+$NetBSD: patch-ae,v 1.3 2003/09/16 20:15:33 jmmv Exp $
+
+--- config/alpha/trampolines.c.orig 2001-06-18 11:39:22.000000000 +0100
++++ config/alpha/trampolines.c 2003-08-11 13:10:17.142991000 +0100
+@@ -32,11 +32,11 @@
+
+ #if !defined(START_ASM_FUNC)
+ #define START_ASM_FUNC(FUNC) \
+- ".text \n\
+- .align 3 \n\
+- .globl " C_FUNC_NAME(FUNC) " \n\
+- .ent " C_FUNC_NAME(FUNC) " \n\
+-" C_FUNC_NAME(FUNC) ":"
++ ".text \n"\
++ ".align 3 \n"\
++ ".globl " C_FUNC_NAME(FUNC) " \n"\
++ ".ent " C_FUNC_NAME(FUNC) " \n"\
++ C_FUNC_NAME(FUNC) ":"
+ #endif
+ #if !defined(END_ASM_FUNC)
+ #define END_ASM_FUNC(FUNC) \
+@@ -44,59 +44,59 @@
+ #endif
+
+ asm(
+- START_ASM_FUNC(alpha_do_fixup_trampoline) " \n\
+- .frame $30,14*8,$26,0 \n\
+- .mask 0x04000000,-14*8 \n\
+- ldgp $29,0($27) \n\
+- lda $30,-14*8($30) # reserve 14 on stack \n\
+- \n\
+- # Save frame registers \n\
+- stq $26,0*8($30) # ra \n\
+- .prologue 1 \n\
+- \n\
+- # Save register arguments as local variables \n\
+- stq $16,1*8($30) # a0 \n\
+- stq $17,2*8($30) # a1 \n\
+- stq $18,3*8($30) # a2 \n\
+- stq $19,4*8($30) # a3 \n\
+- stq $20,5*8($30) # a4 \n\
+- stq $21,6*8($30) # a5 \n\
+- stt $f16,7*8($30) \n\
+- stt $f17,8*8($30) \n\
+- stt $f18,9*8($30) \n\
+- stt $f19,10*8($30) \n\
+- stt $f20,11*8($30) \n\
+- stt $f21,12*8($30) \n\
+- \n\
+- # Compute the address of methodTrampoline.method \n\
+- lda $16,8($1) \n\
+- # Call C to do the fixup \n\
+- jsr $26," C_FUNC_NAME(soft_fixup_trampoline) " \n\
+- ldgp $29,0($26) \n\
+- mov $0,$27 \n\
+- \n\
+- # Reload register arguments \n\
+- ldq $16,1*8($30) # a0 \n\
+- ldq $17,2*8($30) # a1 \n\
+- ldq $18,3*8($30) # a2 \n\
+- ldq $19,4*8($30) # a3 \n\
+- ldq $20,5*8($30) # a4 \n\
+- ldq $21,6*8($30) # a5 \n\
+- ldt $f16,7*8($30) \n\
+- ldt $f17,8*8($30) \n\
+- ldt $f18,9*8($30) \n\
+- ldt $f19,10*8($30) \n\
+- ldt $f20,11*8($30) \n\
+- ldt $f21,12*8($30) \n\
+- \n\
+- ldq $26,0*8($30) # ra \n\
+- lda $30,14*8($30) # release stack \n\
+- \n\
+- # Jump to translated method \n\
+- jmp $31,($27),0 \n\
+- \n\
+- # for __alpha_nextFrame() \n\
+- ret $31,($26),1 \n"
++ START_ASM_FUNC(alpha_do_fixup_trampoline) " \n"
++" .frame $30,14*8,$26,0 \n"
++" .mask 0x04000000,-14*8 \n"
++" ldgp $29,0($27) \n"
++" lda $30,-14*8($30) # reserve 14 on stack \n"
++" \n"
++" # Save frame registers \n"
++" stq $26,0*8($30) # ra \n"
++" .prologue 1 \n"
++" \n"
++" # Save register arguments as local variables \n"
++" stq $16,1*8($30) # a0 \n"
++" stq $17,2*8($30) # a1 \n"
++" stq $18,3*8($30) # a2 \n"
++" stq $19,4*8($30) # a3 \n"
++" stq $20,5*8($30) # a4 \n"
++" stq $21,6*8($30) # a5 \n"
++" stt $f16,7*8($30) \n"
++" stt $f17,8*8($30) \n"
++" stt $f18,9*8($30) \n"
++" stt $f19,10*8($30) \n"
++" stt $f20,11*8($30) \n"
++" stt $f21,12*8($30) \n"
++" \n"
++" # Compute the address of methodTrampoline.method \n"
++" lda $16,8($1) \n"
++" # Call C to do the fixup \n"
++" jsr $26," C_FUNC_NAME(soft_fixup_trampoline) " \n"
++" ldgp $29,0($26) \n"
++" mov $0,$27 \n"
++" \n"
++" # Reload register arguments \n"
++" ldq $16,1*8($30) # a0 \n"
++" ldq $17,2*8($30) # a1 \n"
++" ldq $18,3*8($30) # a2 \n"
++" ldq $19,4*8($30) # a3 \n"
++" ldq $20,5*8($30) # a4 \n"
++" ldq $21,6*8($30) # a5 \n"
++" ldt $f16,7*8($30) \n"
++" ldt $f17,8*8($30) \n"
++" ldt $f18,9*8($30) \n"
++" ldt $f19,10*8($30) \n"
++" ldt $f20,11*8($30) \n"
++" ldt $f21,12*8($30) \n"
++" \n"
++" ldq $26,0*8($30) # ra \n"
++" lda $30,14*8($30) # release stack \n"
++" \n"
++" # Jump to translated method \n"
++" jmp $31,($27),0 \n"
++" \n"
++" # for __alpha_nextFrame() \n"
++" ret $31,($26),1 \n"
+ END_ASM_FUNC(alpha_do_fixup_trampoline)
+ );
+
diff -r 312c98838ee8 -r 194ac3756964 lang/kaffe/patches/patch-af
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/kaffe/patches/patch-af Tue Sep 16 20:15:29 2003 +0000
@@ -0,0 +1,48 @@
+$NetBSD: patch-af,v 1.3 2003/09/16 20:15:34 jmmv Exp $
+
+--- config/arm/trampolines.c.orig 2001-05-14 23:24:39.000000000 +0100
++++ config/arm/trampolines.c 2003-08-11 13:11:53.259056000 +0100
+@@ -35,14 +35,13 @@
+
+ asm(
+ START_ASM_FUNC() C_FUNC_NAME(arm_do_fixup_trampoline) "\n"
+-C_FUNC_NAME(arm_do_fixup_trampoline) ": \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
+-"
++C_FUNC_NAME(arm_do_fixup_trampoline) ": \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()
+ );
+
+@@ -50,14 +49,13 @@
+
+ asm(
+ START_ASM_FUNC() C_FUNC_NAME(arm_do_fixup_trampoline) "\n"
+-C_FUNC_NAME(arm_do_fixup_trampoline) ": \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
+-"
++C_FUNC_NAME(arm_do_fixup_trampoline) ": \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()
+ );
+
diff -r 312c98838ee8 -r 194ac3756964 lang/kaffe/patches/patch-ag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/kaffe/patches/patch-ag Tue Sep 16 20:15:29 2003 +0000
@@ -0,0 +1,47 @@
+$NetBSD: patch-ag,v 1.3 2003/09/16 20:15:35 jmmv Exp $
+
+--- config/i386/trampolines.c.orig 2003-08-11 13:01:10.966139000 +0100
++++ config/i386/trampolines.c 2003-08-11 13:13:31.960345000 +0100
+@@ -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\n"
++" add -4(%eax), %eax # add jump relative offset from previous instr.\n"
++" # this points at at jmp *$off(%ebx) instr.\n"
++" mov 2(%eax), %eax # extract 'off'\n"
++" add %ebx, %eax # compute $off(%ebx)\n"
++" pushl %eax # pass as first argument\n"
++" call " C_FUNC_NAME(gcj_fixup_trampoline) " # returns target\n"
++" addl $4, %esp # remove argument\n"
++" jmp *%eax # jump to target\n"
+ END_ASM_FUNC()
+ );
+
diff -r 312c98838ee8 -r 194ac3756964 lang/kaffe/patches/patch-ah
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/kaffe/patches/patch-ah Tue Sep 16 20:15:29 2003 +0000
@@ -0,0 +1,38 @@
+$NetBSD: patch-ah,v 1.3 2003/09/16 20:15:37 jmmv Exp $
+
+--- config/m68k/trampolines.c.orig 2003-08-11 13:03:10.712387000 +0100
++++ config/m68k/trampolines.c 2003-08-11 13:14:50.602283000 +0100
+@@ -40,11 +40,11 @@
+
+ asm (
+ START_ASM_FUNC() C_FUNC_NAME(m68k_do_fixup_trampoline) "\n"
+-C_FUNC_NAME(m68k_do_fixup_trampoline) ":
+- jbsr " C_FUNC_NAME(soft_fixup_trampoline) "
+- addqw #4,%sp
+- movel %d0,%a0
+- jmp %a0@"
++C_FUNC_NAME(m68k_do_fixup_trampoline) ":\n"
++" jbsr " C_FUNC_NAME(soft_fixup_trampoline) "\n"
++" addqw #4,%sp\n"
++" movel %d0,%a0\n"
++" jmp %a0@\n"
Home |
Main Index |
Thread Index |
Old Index