pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/nhc98 Fix multi-line strings and an incorrect fun...
details: https://anonhg.NetBSD.org/pkgsrc/rev/0482efeb7a42
branches: trunk
changeset: 465616:0482efeb7a42
user: kristerw <kristerw%pkgsrc.org@localhost>
date: Sat Jan 03 09:50:39 2004 +0000
description:
Fix multi-line strings and an incorrect function call identified by gcc3.
diffstat:
lang/nhc98/distinfo | 4 +-
lang/nhc98/patches/patch-ab | 11 +
lang/nhc98/patches/patch-ac | 503 ++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 517 insertions(+), 1 deletions(-)
diffs (truncated from 534 to 300 lines):
diff -r 9a195ad39bd8 -r 0482efeb7a42 lang/nhc98/distinfo
--- a/lang/nhc98/distinfo Sat Jan 03 09:40:26 2004 +0000
+++ b/lang/nhc98/distinfo Sat Jan 03 09:50:39 2004 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.8 2003/03/19 23:14:35 kristerw Exp $
+$NetBSD: distinfo,v 1.9 2004/01/03 09:50:39 kristerw Exp $
SHA1 (nhc98src-1.16.tar.gz) = 7ca27c190d06462cab5d642726b7e5e73b61a7e4
Size (nhc98src-1.16.tar.gz) = 5689485 bytes
SHA1 (patch-aa) = ba484e67af2574abda0708f882e4c5f973ef125e
+SHA1 (patch-ab) = 064fe3b954dadf46155a3ddcd1e0ba439ff5167d
+SHA1 (patch-ac) = 5478a4b98583ee2ca165bc460a720d9f2a0742dc
diff -r 9a195ad39bd8 -r 0482efeb7a42 lang/nhc98/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/nhc98/patches/patch-ab Sat Jan 03 09:50:39 2004 +0000
@@ -0,0 +1,11 @@
+$NetBSD: patch-ab,v 1.1 2004/01/03 09:50:39 kristerw Exp $
+
+--- src/runtime/Integer/alloca.c.orig Sat Jan 3 07:32:14 2004
++++ src/runtime/Integer/alloca.c Sat Jan 3 07:31:44 2004
+@@ -4,5 +4,5 @@
+ void *alloca (unsigned size)
+ {
+ fprintf(stderr,"Falilure alloca %d called:-(\n",size);
+- abort(-1);
++ abort();
+ }
diff -r 9a195ad39bd8 -r 0482efeb7a42 lang/nhc98/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/nhc98/patches/patch-ac Sat Jan 03 09:50:39 2004 +0000
@@ -0,0 +1,503 @@
+$NetBSD: patch-ac,v 1.1 2004/01/03 09:50:39 kristerw Exp $
+
+--- src/runtime/Integer/asmlong.h.orig Sat Jan 3 07:16:57 2004
++++ src/runtime/Integer/asmlong.h Sat Jan 3 07:28:52 2004
+@@ -1,13 +1,13 @@
+ #if defined (__a29k__) || defined (___AM29K__)
+ #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+- __asm__ ("add %1,%4,%5
+- addc %0,%2,%3" \
++ __asm__ ("add %1,%4,%5\n\t" \
++ "addc %0,%2,%3" \
+ : "=r" ((unsigned long int)(sh)), "=&r" ((unsigned long int)(sl)) \
+ : "%r" ((unsigned long int)(ah)), "rI" ((unsigned long int)(bh)), \
+ "%r" ((unsigned long int)(al)), "rI" ((unsigned long int)(bl)))
+ #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+- __asm__ ("sub %1,%4,%5
+- subc %0,%2,%3" \
++ __asm__ ("sub %1,%4,%5\n\t" \
++ "subc %0,%2,%3" \
+ : "=r" ((unsigned long int)(sh)), "=&r" ((unsigned long int)(sl)) \
+ : "r" ((unsigned long int)(ah)), "rI" ((unsigned long int)(bh)), \
+ "r" ((unsigned long int)(al)), "rI" ((unsigned long int)(bl)))
+@@ -31,14 +31,14 @@
+
+ #if defined (__arm__)
+ #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+- __asm__ ("adds %1,%4,%5
+- adc %0,%2,%3" \
++ __asm__ ("adds %1,%4,%5\n\t" \
++ "adc %0,%2,%3" \
+ : "=r" ((unsigned long int)(sh)), "=&r" ((unsigned long int)(sl)) \
+ : "%r" ((unsigned long int)(ah)), "rI" ((unsigned long int)(bh)), \
+ "%r" ((unsigned long int)(al)), "rI" ((unsigned long int)(bl)))
+ #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+- __asm__ ("subs %1,%4,%5
+- sbc %0,%2,%3" \
++ __asm__ ("subs %1,%4,%5\n\t" \
++ "sbc %0,%2,%3" \
+ : "=r" ((unsigned long int)(sh)), "=&r" ((unsigned long int)(sl)) \
+ : "r" ((unsigned long int)(ah)), "rI" ((unsigned long int)(bh)), \
+ "r" ((unsigned long int)(al)), "rI" ((unsigned long int)(bl)))
+@@ -46,14 +46,14 @@
+
+ #if defined (__gmicro__)
+ #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+- __asm__ ("add.w %5,%1
+- addx %3,%0" \
++ __asm__ ("add.w %5,%1\n\t" \
++ "addx %3,%0" \
+ : "=g" ((unsigned long int)(sh)), "=&g" ((unsigned long int)(sl))\
+ : "%0" ((unsigned long int)(ah)), "g" ((unsigned long int)(bh)), \
+ "%1" ((unsigned long int)(al)), "g" ((unsigned long int)(bl)))
+ #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+- __asm__ ("sub.w %5,%1
+- subx %3,%0" \
++ __asm__ ("sub.w %5,%1\n\t" \
++ "subx %3,%0" \
+ : "=g" ((unsigned long int)(sh)), "=&g" ((unsigned long int)(sl))\
+ : "0" ((unsigned long int)(ah)), "g" ((unsigned long int)(bh)), \
+ "1" ((unsigned long int)(al)), "g" ((unsigned long int)(bl)))
+@@ -74,14 +74,14 @@
+
+ #if defined (__hppa)
+ #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+- __asm__ ("add %4,%5,%1
+- addc %2,%3,%0" \
++ __asm__ ("add %4,%5,%1\n\t" \
++ "addc %2,%3,%0" \
+ : "=r" ((unsigned long int)(sh)), "=&r" ((unsigned long int)(sl))\
+ : "%r" ((unsigned long int)(ah)), "r" ((unsigned long int)(bh)),\
+ "%r" ((unsigned long int)(al)), "r" ((unsigned long int)(bl)))
+ #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+- __asm__ ("sub %5,%4,%1
+- subb %3,%2,%0" \
++ __asm__ ("sub %5,%4,%1\n\t" \
++ "subb %3,%2,%0" \
+ : "=r" ((unsigned long int)(sh)), "=&r" ((unsigned long int)(sl))\
+ : "r" ((unsigned long int)(ah)), "r" ((unsigned long int)(bh)), \
+ "r" ((unsigned long int)(al)), "r" ((unsigned long int)(bl)))
+@@ -89,14 +89,14 @@
+
+ #if defined (__i386__) || defined (__i486__)
+ #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+- __asm__ ("addl %5,%1
+- adcl %3,%0" \
++ __asm__ ("addl %5,%1\n\t" \
++ "adcl %3,%0" \
+ : "=r" ((unsigned long int)(sh)), "=&r" ((unsigned long int)(sl))\
+ : "%0" ((unsigned long int)(ah)), "g" ((unsigned long int)(bh)), \
+ "%1" ((unsigned long int)(al)), "g" ((unsigned long int)(bl)))
+ #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+- __asm__ ("subl %5,%1
+- sbbl %3,%0" \
++ __asm__ ("subl %5,%1\n\t" \
++ "sbbl %3,%0" \
+ : "=r" ((unsigned long int)(sh)), "=&r" ((unsigned long int)(sl))\
+ : "0" ((unsigned long int)(ah)), "g" ((unsigned long int)(bh)), \
+ "1" ((unsigned long int)(al)), "g" ((unsigned long int)(bl)))
+@@ -157,14 +157,14 @@
+
+ #if defined (___IBMR2__) /* IBM RS6000 */
+ #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+- __asm__ ("a %1,%4,%5
+- ae %0,%2,%3" \
++ __asm__ ("a %1,%4,%5\n\t" \
++ "ae %0,%2,%3" \
+ : "=r" ((unsigned long int)(sh)), "=&r" ((unsigned long int)(sl))\
+ : "%r" ((unsigned long int)(ah)), "r" ((unsigned long int)(bh)),\
+ "%r" ((unsigned long int)(al)), "r" ((unsigned long int)(bl)))
+ #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+- __asm__ ("sf %1,%5,%4
+- sfe %0,%3,%2" \
++ __asm__ ("sf %1,%5,%4\n\t" \
++ "sfe %0,%3,%2" \
+ : "=r" ((unsigned long int)(sh)), "=&r" ((unsigned long int)(sl))\
+ : "r" ((unsigned long int)(ah)), "r" ((unsigned long int)(bh)), \
+ "r" ((unsigned long int)(al)), "r" ((unsigned long int)(bl)))
+@@ -264,32 +264,32 @@
+ : "od" ((unsigned long int)(x)), "n" (0))
+ #else /* not mc68020 */
+ #define umul_ppmm(xh, xl, a, b) \
+- __asm__ ("| Inlined umul_ppmm
+- movel %2,d0
+- movel %3,d1
+- movel d0,d2
+- swap d0
+- movel d1,d3
+- swap d1
+- movew d2,d4
+- mulu d3,d4
+- mulu d1,d2
+- mulu d0,d3
+- mulu d0,d1
+- movel d4,d0
+- eorw d0,d0
+- swap d0
+- addl d0,d2
+- addl d3,d2
+- jcc 1f
+- addl #65536,d1
+-1: swap d2
+- moveq #0,d0
+- movew d2,d0
+- movew d4,d2
+- movel d2,%1
+- addl d1,d0
+- movel d0,%0" \
++ __asm__ ("| Inlined umul_ppmm\n\t" \
++ "movel %2,d0\n\t" \
++ "movel %3,d1\n\t" \
++ "movel d0,d2\n\t" \
++ "swap d0\n\t" \
++ "movel d1,d3\n\t" \
++ "swap d1\n\t" \
++ "movew d2,d4\n\t" \
++ "mulu d3,d4\n\t" \
++ "mulu d1,d2\n\t" \
++ "mulu d0,d3\n\t" \
++ "mulu d0,d1\n\t" \
++ "movel d4,d0\n\t" \
++ "eorw d0,d0\n\t" \
++ "swap d0\n\t" \
++ "addl d0,d2\n\t" \
++ "addl d3,d2\n\t" \
++ "jcc 1f\n\t" \
++ "addl #65536,d1\n"i \
++"1: swap d2\n\t" \
++ "moveq #0,d0\n\t" \
++ "movew d2,d0\n\t" \
++ "movew d4,d2\n\t" \
++ "movel d2,%1\n\t" \
++ "addl d1,d0\n\t" \
++ "movel d0,%0" \
+ : "=g" ((unsigned long int)(xh)), "=g" ((unsigned long int)(xl)) \
+ :"g" ((unsigned long int)(a)), "g" ((unsigned long int)(b)) \
+ : "d0", "d1", "d2", "d3", "d4")
+@@ -298,14 +298,14 @@
+
+ #if defined (__m88000__)
+ #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+- __asm__ ("addu.co %1,%r4,%r5
+- addu.ci %0,%r2,%r3" \
++ __asm__ ("addu.co %1,%r4,%r5\n\t" \
++ "addu.ci %0,%r2,%r3" \
+ : "=r" ((unsigned long int)(sh)), "=&r" ((unsigned long int)(sl))\
+ : "%rJ" ((unsigned long int)(ah)), "rJ" ((unsigned long int)(bh)),\
+ "%rJ" ((unsigned long int)(al)), "rJ" ((unsigned long int)(bl)))
+ #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+- __asm__ ("subu.co %1,%r4,%r5
+- subu.ci %0,%r2,%r3" \
++ __asm__ ("subu.co %1,%r4,%r5\n\t" \
++ "subu.ci %0,%r2,%r3" \
+ : "=r" ((unsigned long int)(sh)), "=&r" ((unsigned long int)(sl))\
+ : "rJ" ((unsigned long int)(ah)), "rJ" ((unsigned long int)(bh)),\
+ "rJ" ((unsigned long int)(al)), "rJ" ((unsigned long int)(bl)))
+@@ -322,9 +322,9 @@
+
+ #if defined (__mips__)
+ #define umul_ppmm(w1, w0, u, v) \
+- __asm__ ("multu %2,%3
+- mflo %0
+- mfhi %1" \
++ __asm__ ("multu %2,%3\n\t" \
++ "mflo %0\n\t" \
++ "mfhi %1" \
+ : "=r" ((unsigned long int)(w0)), "=r" ((unsigned long int)(w1))\
+ : "r" ((unsigned long int)(u)), "r" ((unsigned long int)(v)))
+ #define UMUL_TIME 5
+@@ -338,11 +338,11 @@
+ : "%0" ((unsigned long int)(u)), "g" ((unsigned long int)(v))); \
+ __w; })
+ #define div_qrnnd(q, r, n1, n0, d) \
+- __asm__ ("movd %2,r0
+- movd %3,r1
+- deid %4,r0
+- movd r1,%0
+- movd r0,%1" \
++ __asm__ ("movd %2,r0\n\t" \
++ "movd %3,r1\n\t" \
++ "deid %4,r0\n\t" \
++ "movd r1,%0\n\t" \
++ "movd r0,%1" \
+ : "=g" ((unsigned long int)(q)), "=g" ((unsigned long int)(r)) \
+ : "g" ((unsigned long int)(n0)), "g" ((unsigned long int)(n1)), \
+ "g" ((unsigned long int)(d)) : "r0", "r1")
+@@ -350,23 +350,23 @@
+
+ #if defined (__pyr__)
+ #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+- __asm__ ("addw %5,%1
+- addwc %3,%0" \
++ __asm__ ("addw %5,%1\n\t" \
++ "addwc %3,%0" \
+ : "=r" ((unsigned long int)(sh)), "=&r" ((unsigned long int)(sl))\
+ : "%0" ((unsigned long int)(ah)), "g" ((unsigned long int)(bh)),\
+ "%1" ((unsigned long int)(al)), "g" ((unsigned long int)(bl)))
+ #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+- __asm__ ("subw %5,%1
+- subwb %3,%0" \
++ __asm__ ("subw %5,%1\n\t" \
++ "subwb %3,%0" \
+ : "=r" ((unsigned long int)(sh)), "=&r" ((unsigned long int)(sl))\
+ : "0" ((unsigned long int)(ah)), "g" ((unsigned long int)(bh)), \
+ "1" ((unsigned long int)(al)), "g" ((unsigned long int)(bl)))
+ /* This insn doesn't work on ancient pyramids. */
+ #define umul_ppmm(w1, w0, u, v) \
+- __asm__ ("movw %2,tr11
+- uemul %3,tr10
+- movw tr10,%0
+- movw tr11,%1" \
++ __asm__ ("movw %2,tr11\n\t" \
++ "uemul %3,tr10\n\t" \
++ "movw tr10,%0\n\t" \
++ "movw tr11,%1" \
+ : "=r" ((unsigned long int)(w1)), "=r" ((unsigned long int)(w0))\
+ : "r" ((unsigned long int)(u)), "r" ((unsigned long int)(v)) \
+ : "tr10", "tr11")
+@@ -374,14 +374,14 @@
+
+ #if defined (__ibm032__) /* RT/ROMP */
+ #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+- __asm__ ("a %1,%5
+- ae %0,%3" \
++ __asm__ ("a %1,%5\n\t" \
++ "ae %0,%3" \
+ : "=r" ((unsigned long int)(sh)), "=&r" ((unsigned long int)(sl))\
+ : "%0" ((unsigned long int)(ah)), "r" ((unsigned long int)(bh)),\
+ "%1" ((unsigned long int)(al)), "r" ((unsigned long int)(bl)))
+ #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
Home |
Main Index |
Thread Index |
Old Index