From 9a541235b3a4c2e58c904dfe21e68511fcbdb659 Mon Sep 17 00:00:00 2001 From: obraun Date: Fri, 12 Dec 2003 16:33:17 +0000 Subject: - Fix build on -CURRENT by importing some gcc33 fixes - Fix linker issue on -CURRENT by not using SplitObjs, same as: http://www.haskell.org/pipermail/glasgow-haskell-users/2003-June/005289.html - Use libgmp from ports on -CURRENT (saves further patching) - Bump PORTREVISION PR: ports/60155 Submitted by: Volker Stolz Approved by: maintainer --- ...extra-patch-ghc-compiler-nativeGen-MachMisc.lhs | 15 ++++++++++++ ...a-patch-ghc-compiler-nativeGen-RegAllocInfo.lhs | 28 ++++++++++++++++++++++ lang/ghc/files/extra-patch-ghc-rts-RtsFlags.c | 12 ++++++++++ lang/ghc/files/extra-patch-ghc-rts-rts.conf.in | 10 ++++++++ .../extra-patch-ghc-utils-prof-cgprof-cgprof.c | 20 ++++++++++++++++ 5 files changed, 85 insertions(+) create mode 100644 lang/ghc/files/extra-patch-ghc-compiler-nativeGen-MachMisc.lhs create mode 100644 lang/ghc/files/extra-patch-ghc-compiler-nativeGen-RegAllocInfo.lhs create mode 100644 lang/ghc/files/extra-patch-ghc-rts-RtsFlags.c create mode 100644 lang/ghc/files/extra-patch-ghc-rts-rts.conf.in create mode 100644 lang/ghc/files/extra-patch-ghc-utils-prof-cgprof-cgprof.c (limited to 'lang/ghc/files') diff --git a/lang/ghc/files/extra-patch-ghc-compiler-nativeGen-MachMisc.lhs b/lang/ghc/files/extra-patch-ghc-compiler-nativeGen-MachMisc.lhs new file mode 100644 index 000000000000..a196c68cf817 --- /dev/null +++ b/lang/ghc/files/extra-patch-ghc-compiler-nativeGen-MachMisc.lhs @@ -0,0 +1,15 @@ +--- ghc/compiler/nativeGen/MachMisc.lhs.orig Thu Dec 11 11:42:12 2003 ++++ ghc/compiler/nativeGen/MachMisc.lhs Thu Dec 11 11:44:02 2003 +@@ -71,11 +71,11 @@ + fmtAsmLbl :: String -> String -- for formatting labels + + fmtAsmLbl s +- = IF_ARCH_alpha( + {- The alpha assembler likes temporary labels to look like $L123 + instead of L123. (Don't toss the L, because then Lf28 + turns into $f28.) + -} ++ = IF_ARCH_alpha( + '$' : s + ,{-otherwise-} + '.':'L':s diff --git a/lang/ghc/files/extra-patch-ghc-compiler-nativeGen-RegAllocInfo.lhs b/lang/ghc/files/extra-patch-ghc-compiler-nativeGen-RegAllocInfo.lhs new file mode 100644 index 000000000000..d8862dafbf78 --- /dev/null +++ b/lang/ghc/files/extra-patch-ghc-compiler-nativeGen-RegAllocInfo.lhs @@ -0,0 +1,28 @@ +--- ghc/compiler/nativeGen/RegAllocInfo.lhs.orig Tue Jan 29 17:52:32 2002 ++++ ghc/compiler/nativeGen/RegAllocInfo.lhs Thu Dec 11 13:30:50 2003 +@@ -808,9 +808,9 @@ + + {-I386: spill above stack pointer leaving 3 words/spill-} + ,IF_ARCH_i386 ( let off_w = (off-delta) `div` 4 +- in case regClass vreg of +- RcInteger -> MOV L (OpReg dyn) (OpAddr (spRel off_w)) +- _ -> GST F80 dyn (spRel off_w) -- RcFloat/RcDouble ++ in case regClass vreg of { ++ RcInteger -> MOV L (OpReg dyn) (OpAddr (spRel off_w)); ++ _ -> GST F80 dyn (spRel off_w)} -- RcFloat/RcDouble + + {-SPARC: spill below frame pointer leaving 2 words/spill-} + ,IF_ARCH_sparc( +@@ -831,9 +831,9 @@ + IF_ARCH_alpha( LD sz dyn (spRel (- (off `div` 8))) + + ,IF_ARCH_i386 ( let off_w = (off-delta) `div` 4 +- in case regClass vreg of +- RcInteger -> MOV L (OpAddr (spRel off_w)) (OpReg dyn) +- _ -> GLD F80 (spRel off_w) dyn -- RcFloat/RcDouble ++ in case regClass vreg of { ++ RcInteger -> MOV L (OpAddr (spRel off_w)) (OpReg dyn); ++ _ -> GLD F80 (spRel off_w) dyn} -- RcFloat/RcDouble + + ,IF_ARCH_sparc( + let off_w = 1 + (off `div` 4) diff --git a/lang/ghc/files/extra-patch-ghc-rts-RtsFlags.c b/lang/ghc/files/extra-patch-ghc-rts-RtsFlags.c new file mode 100644 index 000000000000..abd3496f68f2 --- /dev/null +++ b/lang/ghc/files/extra-patch-ghc-rts-RtsFlags.c @@ -0,0 +1,12 @@ +--- ghc/rts/RtsFlags.c.orig Thu Dec 11 15:13:07 2003 ++++ ghc/rts/RtsFlags.c Thu Dec 11 15:13:17 2003 +@@ -1383,8 +1383,7 @@ + } else if (RtsFlags.GranFlags.proc > MAX_PROC || + RtsFlags.GranFlags.proc < 1) + { +- fprintf(stderr,"setupRtsFlags: no more than %u processors +-allowed\n", ++ fprintf(stderr,"setupRtsFlags: no more than %u processors allowed\n", + MAX_PROC); + *error = rtsTrue; + } diff --git a/lang/ghc/files/extra-patch-ghc-rts-rts.conf.in b/lang/ghc/files/extra-patch-ghc-rts-rts.conf.in new file mode 100644 index 000000000000..d9679728b591 --- /dev/null +++ b/lang/ghc/files/extra-patch-ghc-rts-rts.conf.in @@ -0,0 +1,10 @@ +--- ghc/rts/rts.conf.in.orig Thu Dec 11 15:53:05 2003 ++++ ghc/rts/rts.conf.in Thu Dec 11 16:08:54 2003 +@@ -134,6 +134,7 @@ + , "-u", "GHCziWeak_runFinalizzerBatch_closure" + , "-u", "__stginit_Prelude" + #endif ++ , "-L%%LOCALBASE%%/lib" + ] + #ifdef HAVE_FRAMEWORK_HASKELLSUPPORT + , extra_frameworks = [ "HaskellSupport" ] diff --git a/lang/ghc/files/extra-patch-ghc-utils-prof-cgprof-cgprof.c b/lang/ghc/files/extra-patch-ghc-utils-prof-cgprof-cgprof.c new file mode 100644 index 000000000000..dce9dc88c24f --- /dev/null +++ b/lang/ghc/files/extra-patch-ghc-utils-prof-cgprof-cgprof.c @@ -0,0 +1,20 @@ +--- ghc/utils/prof/cgprof/cgprof.c.orig Thu Dec 11 11:50:34 2003 ++++ ghc/utils/prof/cgprof/cgprof.c Thu Dec 11 11:51:47 2003 +@@ -1,5 +1,5 @@ + /* ------------------------------------------------------------------------ +- * $Id: cgprof.c,v 1.1 2000/04/05 10:06:36 simonmar Exp $ ++ * $Id: cgprof.c,v 1.2 2002/10/05 22:18:46 panne Exp $ + * + * Copyright (C) 1995-2000 University of Oxford + * +@@ -1183,8 +1183,8 @@ + } /* end of new for loop */ + + *nonodes = symbol_table_next; +- fprintf(log,"%s: read %d lines from profile.Graph contains %i nodes. +- \n",Pgm,nolines,symbol_table_next); ++ fprintf(log,"%s: read %d lines from profile.Graph contains %i nodes.\n", ++ Pgm,nolines,symbol_table_next); + + free_cc_matrix(cc_m); /* be nice and clean up the cost centre matrix */ + } -- cgit