pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/nhc98 Add patches from the nhc98 web page:
details: https://anonhg.NetBSD.org/pkgsrc/rev/ed0924698a38
branches: trunk
changeset: 466339:ed0924698a38
user: kristerw <kristerw%pkgsrc.org@localhost>
date: Fri Jan 16 00:59:18 2004 +0000
description:
Add patches from the nhc98 web page:
* A degenerate type synonym like type T a = a in some circumstances
incorrectly caused an occurence check error.
* Several new features in gcc-3.3 cause breakage in the nhc98 build.
This patch fixes many [but ot all] of those problems.
PKGREVISION++.
diffstat:
lang/nhc98/Makefile | 4 +-
lang/nhc98/distinfo | 8 +-
lang/nhc98/patches/patch-ac | 356 +++++++++++++++++++++----------------------
lang/nhc98/patches/patch-ad | 16 +
lang/nhc98/patches/patch-ae | 12 +
lang/nhc98/patches/patch-af | 23 ++
lang/nhc98/patches/patch-ag | 133 ++++++++++++++++
7 files changed, 369 insertions(+), 183 deletions(-)
diffs (truncated from 804 to 300 lines):
diff -r 35b6225629e3 -r ed0924698a38 lang/nhc98/Makefile
--- a/lang/nhc98/Makefile Thu Jan 15 23:04:00 2004 +0000
+++ b/lang/nhc98/Makefile Fri Jan 16 00:59:18 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2003/09/28 09:13:57 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/16 00:59:18 kristerw Exp $
DISTNAME= nhc98src-1.16
PKGNAME= nhc98-1.16
-PKGREVISION= 1
+PKGREVISION= 2
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
CATEGORIES= lang
MASTER_SITES= ftp://ftp.cs.york.ac.uk/pub/haskell/nhc98/
diff -r 35b6225629e3 -r ed0924698a38 lang/nhc98/distinfo
--- a/lang/nhc98/distinfo Thu Jan 15 23:04:00 2004 +0000
+++ b/lang/nhc98/distinfo Fri Jan 16 00:59:18 2004 +0000
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.9 2004/01/03 09:50:39 kristerw Exp $
+$NetBSD: distinfo,v 1.10 2004/01/16 00:59:18 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
+SHA1 (patch-ac) = 514a8e8d74a4efb6149734c95b9b4f0c72678218
+SHA1 (patch-ad) = 53ff3bf9b71810c024df1ed04103964f0d65848f
+SHA1 (patch-ae) = 89a661248bddb6dddbac232fe9abba81cc0db172
+SHA1 (patch-af) = 0036a99ddd54f86679faa2d564fab1297aa00273
+SHA1 (patch-ag) = 613b06d92328ff649ea8d3cd198b058f0354654a
diff -r 35b6225629e3 -r ed0924698a38 lang/nhc98/patches/patch-ac
--- a/lang/nhc98/patches/patch-ac Thu Jan 15 23:04:00 2004 +0000
+++ b/lang/nhc98/patches/patch-ac Fri Jan 16 00:59:18 2004 +0000
@@ -1,22 +1,22 @@
-$NetBSD: patch-ac,v 1.1 2004/01/03 09:50:39 kristerw Exp $
+$NetBSD: patch-ac,v 1.2 2004/01/16 00:59:18 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
+--- src/runtime/Integer/asmlong.h.orig 2003-02-27 10:19:30.000000000 +0000
++++ src/runtime/Integer/asmlong.h 2003-12-16 16:33:42.000000000 +0000
@@ -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" \
++ __asm__ ("add %1,%4,%5\n" \
++" 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" \
++ __asm__ ("sub %1,%4,%5\n" \
++" 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)))
@@ -26,16 +26,16 @@
#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" \
++ __asm__ ("adds %1,%4,%5\n" \
++" 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" \
++ __asm__ ("subs %1,%4,%5\n" \
++" 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)))
@@ -45,16 +45,16 @@
#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" \
++ __asm__ ("add.w %5,%1\n" \
++" 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" \
++ __asm__ ("sub.w %5,%1\n" \
++" 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)))
@@ -64,16 +64,16 @@
#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" \
++ __asm__ ("add %4,%5,%1\n" \
++" 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" \
++ __asm__ ("sub %5,%4,%1\n" \
++" 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)))
@@ -83,16 +83,16 @@
#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" \
++ __asm__ ("addl %5,%1\n" \
++" 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" \
++ __asm__ ("subl %5,%1\n" \
++" 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)))
@@ -102,16 +102,16 @@
#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" \
++ __asm__ ("a %1,%4,%5\n" \
++" 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" \
++ __asm__ ("sf %1,%5,%4\n" \
++" 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)))
@@ -145,68 +145,66 @@
- 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" \
++ __asm__ ("| Inlined umul_ppmm\n" \
++" movel %2,d0\n" \
++" movel %3,d1\n" \
++" movel d0,d2\n" \
++" swap d0\n" \
++" movel d1,d3\n" \
++" swap d1\n" \
++" movew d2,d4\n" \
++" mulu d3,d4\n" \
++" mulu d1,d2\n" \
++" mulu d0,d3\n" \
++" mulu d0,d1\n" \
++" movel d4,d0\n" \
++" eorw d0,d0\n" \
++" swap d0\n" \
++" addl d0,d2\n" \
++" addl d3,d2\n" \
++" jcc 1f\n" \
++" addl #65536,d1\n" \
++"1: swap d2\n" \
++" moveq #0,d0\n" \
++" movew d2,d0\n" \
++" movew d4,d2\n" \
++" movel d2,%1\n" \
++" addl d1,d0\n" \
++" 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 @@
+@@ -298,14 +298,12 @@
#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" \
++ __asm__ ("addu.co %1,%r4,%r5\n\taddu.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" \
++ __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 @@
+@@ -322,9 +320,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" \
++ __asm__ ("multu %2,%3\n" \
++" mflo %0\n" \
++" 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 @@
+@@ -338,11 +336,11 @@
: "%0" ((unsigned long int)(u)), "g" ((unsigned long int)(v))); \
__w; })
#define div_qrnnd(q, r, n1, n0, d) \
@@ -215,30 +213,30 @@
- 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" \
++ __asm__ ("movd %2,r0\n" \
++" movd %3,r1\n" \
++" deid %4,r0\n" \
++" movd r1,%0\n" \
++" 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 @@
+@@ -350,23 +348,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" \
++ __asm__ ("addw %5,%1\n" \
++" addwc %3,%0" \
Home |
Main Index |
Thread Index |
Old Index