diff options
author | jmmv <jmmv> | 2003-09-16 20:15:29 +0000 |
---|---|---|
committer | jmmv <jmmv> | 2003-09-16 20:15:29 +0000 |
commit | 833192aa0dac8d5efb1a6c87872ac165d58baac9 (patch) | |
tree | d2b7698aee637f160ac63734c52bbbe7d9152fb9 /lang | |
parent | 7f6f6bb2be245386dbe62b1820f533821e5b91e9 (diff) | |
download | pkgsrc-833192aa0dac8d5efb1a6c87872ac165d58baac9.tar.gz |
Fix build with gcc3. From Jonathan Perkin in PR pkg/22437.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/kaffe/distinfo | 10 | ||||
-rw-r--r-- | lang/kaffe/patches/patch-ad | 13 | ||||
-rw-r--r-- | lang/kaffe/patches/patch-ae | 134 | ||||
-rw-r--r-- | lang/kaffe/patches/patch-af | 48 | ||||
-rw-r--r-- | lang/kaffe/patches/patch-ag | 47 | ||||
-rw-r--r-- | lang/kaffe/patches/patch-ah | 38 | ||||
-rw-r--r-- | lang/kaffe/patches/patch-ai | 99 | ||||
-rw-r--r-- | lang/kaffe/patches/patch-aj | 27 | ||||
-rw-r--r-- | lang/kaffe/patches/patch-ak | 15 |
9 files changed, 430 insertions, 1 deletions
diff --git a/lang/kaffe/distinfo b/lang/kaffe/distinfo index 62b57c17c8b..9187a3d2031 100644 --- a/lang/kaffe/distinfo +++ b/lang/kaffe/distinfo @@ -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 --git a/lang/kaffe/patches/patch-ad b/lang/kaffe/patches/patch-ad new file mode 100644 index 00000000000..5cb9807d3e8 --- /dev/null +++ b/lang/kaffe/patches/patch-ad @@ -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 --git a/lang/kaffe/patches/patch-ae b/lang/kaffe/patches/patch-ae new file mode 100644 index 00000000000..c9e3cc20c4a --- /dev/null +++ b/lang/kaffe/patches/patch-ae @@ -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 --git a/lang/kaffe/patches/patch-af b/lang/kaffe/patches/patch-af new file mode 100644 index 00000000000..8f9a2510dbe --- /dev/null +++ b/lang/kaffe/patches/patch-af @@ -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 --git a/lang/kaffe/patches/patch-ag b/lang/kaffe/patches/patch-ag new file mode 100644 index 00000000000..4278bed9ecb --- /dev/null +++ b/lang/kaffe/patches/patch-ag @@ -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 --git a/lang/kaffe/patches/patch-ah b/lang/kaffe/patches/patch-ah new file mode 100644 index 00000000000..bed61d76b3c --- /dev/null +++ b/lang/kaffe/patches/patch-ah @@ -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" + END_ASM_FUNC() + ); + +@@ -52,11 +52,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" + END_ASM_FUNC() + ); + diff --git a/lang/kaffe/patches/patch-ai b/lang/kaffe/patches/patch-ai new file mode 100644 index 00000000000..9df61945c1d --- /dev/null +++ b/lang/kaffe/patches/patch-ai @@ -0,0 +1,99 @@ +$NetBSD: patch-ai,v 1.4 2003/09/16 20:15:38 jmmv Exp $ + +--- config/mips/trampolines.c.orig 1999-10-09 03:03:14.000000000 +0100 ++++ config/mips/trampolines.c 2003-08-11 13:16:03.787618000 +0100 +@@ -31,50 +31,50 @@ + #define C_FUNC_NAME(FUNC) #FUNC + #endif + +-asm(" +- .text \n +- .align 4 \n +- sw $31, 0($sp) \n +-l1: .word " C_FUNC_NAME(soft_fixup_trampoline) " \n +- .globl mips_do_fixup_trampoline \n +- .ent mips_do_fixup_trampoline \n +-mips_do_fixup_trampoline: \n +- addi $sp, $sp, -48 \n +- # needed by the backtracer \n +- sw $31, 0($sp) \n +- sw $2, 0($sp) \n +- sw $4, 8($sp) \n +- sw $5, 12($sp) \n +- sw $6, 16($sp) \n +- sw $7, 20($sp) \n +- swc1 $f13, 24($sp) \n +- swc1 $f12, 28($sp) \n +- swc1 $f15, 32($sp) \n +- swc1 $f14, 36($sp) \n +- sw $30, 40($sp) \n +- sw $gp, 4($sp) \n +- # $fp = $sp \n +- move $30, $sp \n +- lw $4, 0($31) \n +- lw $5, 4($31) \n +- lw $25, -4($25) \n +- jalr $25 \n +- nop \n +- lw $30, 40($sp) \n +- lwc1 $f14, 36($sp) \n +- lwc1 $f15, 32($sp) \n +- lwc1 $f12, 28($sp) \n +- lwc1 $f13, 24($sp) \n +- lw $7, 20($sp) \n +- lw $6, 16($sp) \n +- lw $5, 12($sp) \n +- lw $4, 8($sp) \n +- lw $gp, 4($sp) \n +- lw $31, 0($sp) \n +- addi $sp, $sp, 48 \n +- move $25, $2 \n +- jr $2 \n +- .end mips_do_fixup_trampoline" ++asm("\n" ++" .text \n" ++" .align 4 \n" ++" sw $31, 0($sp) \n" ++"l1: .word " C_FUNC_NAME(soft_fixup_trampoline) " \n" ++" .globl mips_do_fixup_trampoline \n" ++" .ent mips_do_fixup_trampoline \n" ++"mips_do_fixup_trampoline: \n" ++" addi $sp, $sp, -48 \n" ++" # needed by the backtracer \n" ++" sw $31, 0($sp) \n" ++" sw $2, 0($sp) \n" ++" sw $4, 8($sp) \n" ++" sw $5, 12($sp) \n" ++" sw $6, 16($sp) \n" ++" sw $7, 20($sp) \n" ++" swc1 $f13, 24($sp) \n" ++" swc1 $f12, 28($sp) \n" ++" swc1 $f15, 32($sp) \n" ++" swc1 $f14, 36($sp) \n" ++" sw $30, 40($sp) \n" ++" sw $gp, 4($sp) \n" ++" # $fp = $sp \n" ++" move $30, $sp \n" ++" lw $4, 0($31) \n" ++" lw $5, 4($31) \n" ++" lw $25, -4($25) \n" ++" jalr $25 \n" ++" nop \n" ++" lw $30, 40($sp) \n" ++" lwc1 $f14, 36($sp) \n" ++" lwc1 $f15, 32($sp) \n" ++" lwc1 $f12, 28($sp) \n" ++" lwc1 $f13, 24($sp) \n" ++" lw $7, 20($sp) \n" ++" lw $6, 16($sp) \n" ++" lw $5, 12($sp) \n" ++" lw $4, 8($sp) \n" ++" lw $gp, 4($sp) \n" ++" lw $31, 0($sp) \n" ++" addi $sp, $sp, 48 \n" ++" move $25, $2 \n" ++" jr $2 \n" ++" .end mips_do_fixup_trampoline" + ); + + #endif diff --git a/lang/kaffe/patches/patch-aj b/lang/kaffe/patches/patch-aj new file mode 100644 index 00000000000..840f5d67803 --- /dev/null +++ b/lang/kaffe/patches/patch-aj @@ -0,0 +1,27 @@ +$NetBSD: patch-aj,v 1.4 2003/09/16 20:15:39 jmmv Exp $ + +--- config/sparc/trampolines.c.orig 1999-11-04 20:48:40.000000000 +0000 ++++ config/sparc/trampolines.c 2003-08-11 13:08:18.711843000 +0100 +@@ -33,14 +33,14 @@ + + asm( + START_ASM_FUNC() C_FUNC_NAME(sparc_do_fixup_trampoline) "\n" +-C_FUNC_NAME(sparc_do_fixup_trampoline) ": \n +- save %sp,-64,%sp \n +- ld [%i7+8],%o0 \n +- ld [%i7+12],%o1 \n +- call " C_FUNC_NAME(soft_fixup_trampoline) " \n +- mov %g1,%i7 \n +- jmp %o0 \n +- restore" ++C_FUNC_NAME(sparc_do_fixup_trampoline) ": \n" ++" save %sp,-64,%sp \n" ++" ld [%i7+8],%o0 \n" ++" ld [%i7+12],%o1 \n" ++" call " C_FUNC_NAME(soft_fixup_trampoline) " \n" ++" mov %g1,%i7 \n" ++" jmp %o0 \n" ++" restore" + END_ASM_FUNC() + ); + diff --git a/lang/kaffe/patches/patch-ak b/lang/kaffe/patches/patch-ak new file mode 100644 index 00000000000..a5205da5ae0 --- /dev/null +++ b/lang/kaffe/patches/patch-ak @@ -0,0 +1,15 @@ +$NetBSD: patch-ak,v 1.3 2003/09/16 20:15:40 jmmv Exp $ + +--- kaffe/kaffevm/jit3/machine.h.orig 2000-12-20 03:42:38.000000000 +0100 ++++ kaffe/kaffevm/jit3/machine.h +@@ -148,8 +148,8 @@ typedef struct _nativeCodeInfo { + 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); |