[Pkg-haskell-commits] darcs: ghc: Merge 7.4.1-4 packaging
Joachim Breitner
mail at joachim-breitner.de
Mon Oct 8 12:01:09 UTC 2012
Mon Oct 8 11:35:38 UTC 2012 Joachim Breitner <mail at joachim-breitner.de>
* Merge 7.4.1-4 packaging
Ignore-this: 258903bdd0462263075bf2a3ec6d8745
M ./changelog +36
M ./patches/ARM-VFPv3D16 -4 +4
M ./patches/armhf_llvm_abi -4 +4
R ./patches/fix-ARM-StgCRun-to-not-save-and-restore-r11-fp-regis
R ./patches/fix-ARM-s-StgCRun-clobbered-register-list-for-both-A
R ./patches/fix-PPC-right-shift-bug
R ./patches/fix-ppc-ghci-segfault
M ./patches/haddock-hardcode-ghc-paths -7 +7
R ./patches/memcpy-ffi.patch
R ./patches/no-useless-timer
R ./patches/no_ghci_on_powerpc
M ./patches/series -2 +1
Mon Oct 8 11:35:38 UTC 2012 Joachim Breitner <mail at joachim-breitner.de>
* Merge 7.4.1-4 packaging
Ignore-this: 258903bdd0462263075bf2a3ec6d8745
diff -rN -u old-ghc//changelog new-ghc//changelog
--- old-ghc//changelog 2012-10-08 12:01:09.466720573 +0000
+++ new-ghc//changelog 2012-10-08 12:01:09.494720073 +0000
@@ -1,5 +1,41 @@
+ghc (7.6.1-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ Dropped patches, applied upstream:
+ + Fix-GHCi-segfault-on-linux-powerpc
+ + hurd-is-ELF
+ + use-llvm-3.0
+ + memcpy-ffi
+ + fix-PPC-right-shift-bug
+ + no-useless-time
+ + fix-ppc-ghci-segfault
+
+ -- Joachim Breitner <nomeata at debian.org> Mon, 08 Oct 2012 13:06:13 +0200
+
+ghc (7.4.2-2) experimental; urgency=low
+
+ [ Erik de Castro Lopo ]
+ * Add patch to fix GHCi segfault on startup on PowerPC (Closes: #631073).
+ * Remove patch no_ghci_on_powerpc.
+
+ [ Iain Lane ]
+ * Update Vcs-* to point to experimental branch
+
+ -- Erik de Castro Lopo <erikd at mega-nerd.com> Mon, 6 Aug 2012 20:19:46 +1000
+
ghc (7.4.2-1) experimental; urgency=low
+ * New upstream.
+ * debian/patches/series
+ - Remove patch fix-ARM-s-StgCRun-clobbered-register-list-for-both-A,
+ fix-ARM-StgCRun-to-not-save-and-restore-r11-fp-regis and memcpy-ffi.patch
+ (in upstream).
+ - Refresh other patches.
+
+ -- Erik de Castro Lopo <erikd at mega-nerd.com> Mon, 11 Jun 2012 15:21:26 +1000
+
+ghc (7.4.1-4) unstable; urgency=low
+
[ Erik de Castro Lopo ]
* Add debian/patches/fix-PPC-right-shift-bug which fixes upstream GHC bug:
http://hackage.haskell.org/trac/ghc/ticket/6156 (Closes: #677591)
diff -rN -u old-ghc//patches/armhf_llvm_abi new-ghc//patches/armhf_llvm_abi
--- old-ghc//patches/armhf_llvm_abi 2012-10-08 12:01:09.454721951 +0000
+++ new-ghc//patches/armhf_llvm_abi 2012-10-08 12:01:09.550722508 +0000
@@ -3,10 +3,10 @@
bug #5914.
Author: Iain Lane <laney at debian.org>
-Index: ghc-7.4.2/compiler/main/DriverPipeline.hs
+Index: ghc-7.6.1/compiler/main/DriverPipeline.hs
===================================================================
---- ghc-7.4.2.orig/compiler/main/DriverPipeline.hs 2012-06-07 03:10:25.000000000 +1000
-+++ ghc-7.4.2/compiler/main/DriverPipeline.hs 2012-06-11 15:25:32.000000000 +1000
+--- ghc-7.6.1.orig/compiler/main/DriverPipeline.hs 2012-10-08 13:11:54.371876293 +0200
++++ ghc-7.6.1/compiler/main/DriverPipeline.hs 2012-10-08 13:12:20.927875333 +0200
@@ -1,5 +1,5 @@
{-# OPTIONS -fno-cse #-}
-{-# LANGUAGE NamedFieldPuns #-}
@@ -14,7 +14,7 @@
-- -fno-cse is needed for GLOBAL_VAR's to behave properly
-----------------------------------------------------------------------------
-@@ -1382,6 +1382,9 @@
+@@ -1393,6 +1393,9 @@
then ["-mattr=+v7,+vfp3"]
else if (elem VFPv3D16 ext)
then ["-mattr=+v7,+vfp3,+d16"]
diff -rN -u old-ghc//patches/ARM-VFPv3D16 new-ghc//patches/ARM-VFPv3D16
--- old-ghc//patches/ARM-VFPv3D16 2012-10-08 12:01:09.454721951 +0000
+++ new-ghc//patches/ARM-VFPv3D16 2012-10-08 12:01:09.546722249 +0000
@@ -1,11 +1,11 @@
Description: Use VFPv3-D16 FPU for ARM builds
Author: Jani Monoses <jani at ubuntu.com>
-Index: ghc-7.4.2/aclocal.m4
+Index: ghc-7.6.1/aclocal.m4
===================================================================
---- ghc-7.4.2.orig/aclocal.m4 2012-06-07 03:10:25.000000000 +1000
-+++ ghc-7.4.2/aclocal.m4 2012-06-11 15:25:38.000000000 +1000
-@@ -336,7 +336,7 @@
+--- ghc-7.6.1.orig/aclocal.m4 2012-09-04 19:10:14.000000000 +0200
++++ ghc-7.6.1/aclocal.m4 2012-10-08 13:12:33.055874894 +0200
+@@ -349,7 +349,7 @@
],
[changequote(, )dnl
ARM_ISA=ARMv7
diff -rN -u old-ghc//patches/fix-ARM-s-StgCRun-clobbered-register-list-for-both-A new-ghc//patches/fix-ARM-s-StgCRun-clobbered-register-list-for-both-A
--- old-ghc//patches/fix-ARM-s-StgCRun-clobbered-register-list-for-both-A 2012-10-08 12:01:09.442724510 +0000
+++ new-ghc//patches/fix-ARM-s-StgCRun-clobbered-register-list-for-both-A 1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-From 957f778cb971d63cbbea0c71c727c94474b1b905 Mon Sep 17 00:00:00 2001
-From: Karel Gardas <karel.gardas at centrum.cz>
-Date: Tue, 14 Feb 2012 08:01:47 +0100
-Subject: [PATCH 1/2] fix ARM's StgCRun clobbered register list for both ARM and Thumb modes
-
----
- rts/StgCRun.c | 16 +++++++++++++++-
- 1 files changed, 15 insertions(+), 1 deletions(-)
-
---- a/rts/StgCRun.c
-+++ b/rts/StgCRun.c
-@@ -672,7 +672,21 @@
- "ldmfd sp!, {r4-r11, fp, ip, lr}\n\t"
- : "=r" (r)
- : "r" (f), "r" (basereg), "i" (RESERVED_C_STACK_BYTES)
-- : "%r4", "%r5", "%r6", "%r8", "%r9", "%r10", "%r11", "%fp", "%ip", "%lr"
-+#if !defined(__thumb__)
-+ /* In ARM mode, r11/fp is frame-pointer and so we cannot mark
-+ it as clobbered. If we do so, GCC complains with error. */
-+ : "%r4", "%r5", "%r6", "%r7", "%r8", "%r9", "%r10", "%ip", "%lr"
-+#else
-+ /* In Thumb mode r7 is frame-pointer and so we cannot mark it
-+ as clobbered. On the other hand we mark as clobbered also
-+ those regs not used in Thumb mode. Hard to judge if this is
-+ needed, but certainly Haskell code is using them for
-+ placing GHC's virtual registers there. See
-+ includes/stg/MachRegs.h Please note that Haskell code is
-+ compiled by GHC/LLVM into ARM code (not Thumb!), at least
-+ as of February 2012 */
-+ : "%r4", "%r5", "%r6", "%r8", "%r9", "%r10", "%fp", "%ip", "%lr"
-+#endif
- );
- return r;
- }
diff -rN -u old-ghc//patches/fix-ARM-StgCRun-to-not-save-and-restore-r11-fp-regis new-ghc//patches/fix-ARM-StgCRun-to-not-save-and-restore-r11-fp-regis
--- old-ghc//patches/fix-ARM-StgCRun-to-not-save-and-restore-r11-fp-regis 2012-10-08 12:01:09.442724510 +0000
+++ new-ghc//patches/fix-ARM-StgCRun-to-not-save-and-restore-r11-fp-regis 1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-From 1cbf3bcae87dd102942d85ce71ea17d42d4b5f5a Mon Sep 17 00:00:00 2001
-From: Karel Gardas <karel.gardas at centrum.cz>
-Date: Tue, 14 Feb 2012 08:03:07 +0100
-Subject: [PATCH 2/2] fix ARM StgCRun to not save and restore r11/fp register twice
-
----
- rts/StgCRun.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/rts/StgCRun.c
-+++ b/rts/StgCRun.c
-@@ -632,7 +632,7 @@
- /*
- * save callee-saves registers on behalf of the STG code.
- */
-- "stmfd sp!, {r4-r11, fp, ip, lr}\n\t"
-+ "stmfd sp!, {r4-r10, fp, ip, lr}\n\t"
- #if !defined(arm_HOST_ARCH_PRE_ARMv6)
- "vstmdb sp!, {d8-d11}\n\t"
- #endif
-@@ -669,7 +669,7 @@
- #if !defined(arm_HOST_ARCH_PRE_ARMv6)
- "vldmia sp!, {d8-d11}\n\t"
- #endif
-- "ldmfd sp!, {r4-r11, fp, ip, lr}\n\t"
-+ "ldmfd sp!, {r4-r10, fp, ip, lr}\n\t"
- : "=r" (r)
- : "r" (f), "r" (basereg), "i" (RESERVED_C_STACK_BYTES)
- #if !defined(__thumb__)
diff -rN -u old-ghc//patches/fix-ppc-ghci-segfault new-ghc//patches/fix-ppc-ghci-segfault
--- old-ghc//patches/fix-ppc-ghci-segfault 2012-10-08 12:01:09.438722970 +0000
+++ new-ghc//patches/fix-ppc-ghci-segfault 1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-Description: Use contiguous mmap for PowerPC when allocating symbol_extras
-Author: Ben Collins <bcollins at ubuntu.com>
-Bug-GHC: http://hackage.haskell.org/trac/ghc/ticket/2972
-Forwarded: Yes
-
---- ghc-7.4.1.orig/rts/Linker.c
-+++ ghc-7.4.1/rts/Linker.c
-@@ -84,6 +84,11 @@
- #include <fcntl.h>
- #include <sys/mman.h>
-
-+#if defined(powerpc_HOST_ARCH)
-+/* We need to keep image and symbol_extras in the same contiguous space */
-+#define MMAP_CONTIGUOUS
-+#endif
-+
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-@@ -2514,8 +2519,25 @@ static int ocAllocateSymbolExtras( Objec
- */
- if( m > n ) // we need to allocate more pages
- {
-+#if defined(MMAP_CONTIGUOUS)
-+ /* Keep image and symbol_extras contiguous */
-+ void *new = mmapForLinker(n + (sizeof(SymbolExtra) * count),
-+ MAP_ANONYMOUS, -1);
-+ if (new)
-+ {
-+ memcpy(new, oc->image, oc->fileSize);
-+ munmap(oc->image, n);
-+ oc->image = new;
-+ oc->symbol_extras = (SymbolExtra *) (oc->image + n);
-+ }
-+ else
-+ {
-+ oc->symbol_extras = NULL;
-+ }
-+#else
- oc->symbol_extras = mmapForLinker(sizeof(SymbolExtra) * count,
- MAP_ANONYMOUS, -1);
-+#endif
- }
- else
- {
-
diff -rN -u old-ghc//patches/fix-PPC-right-shift-bug new-ghc//patches/fix-PPC-right-shift-bug
--- old-ghc//patches/fix-PPC-right-shift-bug 2012-10-08 12:01:09.438722970 +0000
+++ new-ghc//patches/fix-PPC-right-shift-bug 1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-From: Erik de Castro Lopo <erikd at mega-nerd.com>
-Date: Sat, Jun 16 10:48:05 EST 2012
-Subject: PPC: Handle right shift of > 31 bits. Fix #5900.
-Description: This fixes GHC bug #5900
- http://hackage.haskell.org/trac/ghc/ticket/5900
- which was being triggered when compiling cryptocipher on PowerPC.
- This has been applied upstream and is in GHC 7.4.2.
-
-Index: ghc-7.4.1/compiler/nativeGen/PPC/Ppr.hs
-===================================================================
---- ghc-7.4.1.orig/compiler/nativeGen/PPC/Ppr.hs
-+++ ghc-7.4.1/compiler/nativeGen/PPC/Ppr.hs
-@@ -594,6 +594,13 @@
- pprInstr platform (NOT reg1 reg2) = pprUnary platform (sLit "not") reg1 reg2
-
- pprInstr platform (SLW reg1 reg2 ri) = pprLogic platform (sLit "slw") reg1 reg2 (limitShiftRI ri)
-+
-+pprInstr platform (SRW reg1 reg2 (RIImm (ImmInt i))) | i > 31 || i < 0 =
-+ -- Handle the case where we are asked to shift a 32 bit register by
-+ -- less than zero or more than 31 bits. We convert this into a clear
-+ -- of the destination register.
-+ -- Fixes ticket http://hackage.haskell.org/trac/ghc/ticket/5900
-+ pprInstr platform (XOR reg1 reg2 (RIReg reg2))
- pprInstr platform (SRW reg1 reg2 ri) = pprLogic platform (sLit "srw") reg1 reg2 (limitShiftRI ri)
- pprInstr platform (SRAW reg1 reg2 ri) = pprLogic platform (sLit "sraw") reg1 reg2 (limitShiftRI ri)
- pprInstr platform (RLWINM reg1 reg2 sh mb me) = hcat [
diff -rN -u old-ghc//patches/haddock-hardcode-ghc-paths new-ghc//patches/haddock-hardcode-ghc-paths
--- old-ghc//patches/haddock-hardcode-ghc-paths 2012-10-08 12:01:09.434720829 +0000
+++ new-ghc//patches/haddock-hardcode-ghc-paths 2012-10-08 12:01:09.550722508 +0000
@@ -1,7 +1,7 @@
-Index: ghc-7.4.2/utils/haddock/haddock.cabal
+Index: ghc-7.6.1/utils/haddock/haddock.cabal
===================================================================
---- ghc-7.4.2.orig/utils/haddock/haddock.cabal 2012-06-07 03:10:26.000000000 +1000
-+++ ghc-7.4.2/utils/haddock/haddock.cabal 2012-06-11 15:24:08.000000000 +1000
+--- ghc-7.6.1.orig/utils/haddock/haddock.cabal 2012-09-04 19:10:32.000000000 +0200
++++ ghc-7.6.1/utils/haddock/haddock.cabal 2012-10-08 13:09:31.951881449 +0200
@@ -78,10 +78,6 @@
executable haddock
@@ -31,10 +31,10 @@
if flag(test)
cpp-options: -DTEST
-Index: ghc-7.4.2/utils/haddock/src/Main.hs
+Index: ghc-7.6.1/utils/haddock/src/Main.hs
===================================================================
---- ghc-7.4.2.orig/utils/haddock/src/Main.hs 2012-06-07 03:10:26.000000000 +1000
-+++ ghc-7.4.2/utils/haddock/src/Main.hs 2012-06-11 15:24:08.000000000 +1000
+--- ghc-7.6.1.orig/utils/haddock/src/Main.hs 2012-09-04 19:10:32.000000000 +0200
++++ ghc-7.6.1/utils/haddock/src/Main.hs 2012-10-08 13:09:31.951881449 +0200
@@ -50,7 +50,6 @@
#ifdef IN_GHC_TREE
import System.FilePath
@@ -43,7 +43,7 @@
import Paths_haddock
#endif
-@@ -350,14 +349,14 @@
+@@ -352,14 +351,14 @@
libDir <- getInTreeDir
return (ghcPath, libDir)
#else
diff -rN -u old-ghc//patches/memcpy-ffi.patch new-ghc//patches/memcpy-ffi.patch
--- old-ghc//patches/memcpy-ffi.patch 2012-10-08 12:01:09.406723216 +0000
+++ new-ghc//patches/memcpy-ffi.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,84 +0,0 @@
-commit 40c1106c338e209f07023d165f32bff0f75e2e54
-Author: Paolo Capriotti <p.capriotti at gmail.com>
-Date: Wed May 2 15:24:46 2012 +0100
-Description:
- Cast memory primops in the C backend (#5976)
-
- To prevent conflicts with GCC builtins, generate identical code for
- calls to mem primos and FFI calls.
-
- Based on a patch by Joachim Breitner.
-Bug: http://hackage.haskell.org/trac/ghc/ticket/5967
-Origin: http://hackage.haskell.org/trac/ghc/changeset/40c1106c338e209f07023d165f32bff0f75e2e54
-
-Index: ghc-7.4.1/compiler/cmm/PprC.hs
-===================================================================
---- ghc-7.4.1.orig/compiler/cmm/PprC.hs 2012-02-01 19:10:32.000000000 +0100
-+++ ghc-7.4.1/compiler/cmm/PprC.hs 2012-05-06 21:41:11.000000000 +0200
-@@ -203,9 +203,6 @@
- pprCFunType (pprCLabel platform lbl) cconv results args <>
- noreturn_attr <> semi
-
-- fun_proto lbl = ptext (sLit ";EF_(") <>
-- pprCLabel platform lbl <> char ')' <> semi
--
- noreturn_attr = case ret of
- CmmNeverReturns -> text "__attribute__ ((noreturn))"
- CmmMayReturn -> empty
-@@ -226,31 +223,43 @@
- let myCall = pprCall platform (pprCLabel platform lbl) cconv results args
- in (real_fun_proto lbl, myCall)
- | not (isMathFun lbl) ->
-- let myCall = braces (
-- pprCFunType (char '*' <> text "ghcFunPtr") cconv results args <> semi
-- $$ text "ghcFunPtr" <+> equals <+> cast_fn <> semi
-- $$ pprCall platform (text "ghcFunPtr") cconv results args <> semi
-- )
-- in (fun_proto lbl, myCall)
-+ pprForeignCall platform (pprCLabel platform lbl) cconv results args
- _ ->
- (empty {- no proto -},
- pprCall platform cast_fn cconv results args <> semi)
- -- for a dynamic call, no declaration is necessary.
-
- CmmCall (CmmPrim op) results args _ret ->
-- pprCall platform ppr_fn CCallConv results args'
-- where
-- ppr_fn = pprCallishMachOp_for_C op
-- -- The mem primops carry an extra alignment arg, must drop it.
-- -- We could maybe emit an alignment directive using this info.
-- args' | op == MO_Memcpy || op == MO_Memset || op == MO_Memmove = init args
-- | otherwise = args
-+ proto $$ fn_call
-+ where
-+ cconv = CCallConv
-+ fn = pprCallishMachOp_for_C op
-+ (proto, fn_call)
-+ -- The mem primops carry an extra alignment arg, must drop it.
-+ -- We could maybe emit an alignment directive using this info.
-+ -- We also need to cast mem primops to prevent conflicts with GCC
-+ -- builtins (see bug #5967).
-+ | op `elem` [MO_Memcpy, MO_Memset, MO_Memmove]
-+ = pprForeignCall platform fn cconv results (init args)
-+ | otherwise
-+ = (empty, pprCall platform fn cconv results args)
-
- CmmBranch ident -> pprBranch ident
- CmmCondBranch expr ident -> pprCondBranch platform expr ident
- CmmJump lbl _params -> mkJMP_(pprExpr platform lbl) <> semi
- CmmSwitch arg ids -> pprSwitch platform arg ids
-
-+pprForeignCall :: Platform -> SDoc -> CCallConv -> [HintedCmmFormal] -> [HintedCmmActual] -> (SDoc, SDoc)
-+pprForeignCall platform fn cconv results args = (proto, fn_call)
-+ where
-+ fn_call = braces (
-+ pprCFunType (char '*' <> text "ghcFunPtr") cconv results args <> semi
-+ $$ text "ghcFunPtr" <+> equals <+> cast_fn <> semi
-+ $$ pprCall platform (text "ghcFunPtr") cconv results args <> semi
-+ )
-+ cast_fn = parens (parens (pprCFunType (char '*') cconv results args) <> fn)
-+ proto = ptext (sLit ";EF_(") <> fn <> char ')' <> semi
-+
- pprCFunType :: SDoc -> CCallConv -> [HintedCmmFormal] -> [HintedCmmActual] -> SDoc
- pprCFunType ppr_fn cconv ress args
- = res_type ress <+>
diff -rN -u old-ghc//patches/no_ghci_on_powerpc new-ghc//patches/no_ghci_on_powerpc
--- old-ghc//patches/no_ghci_on_powerpc 2012-10-08 12:01:09.406723216 +0000
+++ new-ghc//patches/no_ghci_on_powerpc 1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-Description: Disable ghci on powerpc
- Despite upstreams make files indicating that it works, we have had too many
- problems with ghci on power, e.g.:
- http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=631073. Erik had tried to fix
- it, but eventually gave up:
- http://lists.debian.org/debian-haskell/2011/10/msg00059.html
-Author: Joachim Breitner <nomeata at debian.org>
-Bug-Debian: http://bugs.debian.org/631073
-
-Index: ghc-7.4.2/mk/config.mk.in
-===================================================================
---- ghc-7.4.2.orig/mk/config.mk.in 2012-06-07 03:10:25.000000000 +1000
-+++ ghc-7.4.2/mk/config.mk.in 2012-06-11 15:25:20.000000000 +1000
-@@ -172,7 +172,7 @@
- # has support for this OS/ARCH combination.
-
- OsSupportsGHCi=$(strip $(patsubst $(HostOS_CPP), YES, $(findstring $(HostOS_CPP), mingw32 cygwin32 linux solaris2 freebsd dragonfly netbsd openbsd darwin kfreebsdgnu)))
--ArchSupportsGHCi=$(strip $(patsubst $(HostArch_CPP), YES, $(findstring $(HostArch_CPP), i386 x86_64 powerpc sparc sparc64 arm)))
-+ArchSupportsGHCi=$(strip $(patsubst $(HostArch_CPP), YES, $(findstring $(HostArch_CPP), i386 x86_64 sparc sparc64 arm)))
-
- ifeq "$(OsSupportsGHCi)$(ArchSupportsGHCi)" "YESYES"
- GhcWithInterpreter=YES
diff -rN -u old-ghc//patches/no-useless-timer new-ghc//patches/no-useless-timer
--- old-ghc//patches/no-useless-timer 2012-10-08 12:01:09.406723216 +0000
+++ new-ghc//patches/no-useless-timer 1970-01-01 00:00:00.000000000 +0000
@@ -1,205 +0,0 @@
-commit a73d0a21c875ff539c2240e431eaf87173a92bd3
-Author: Ian Lynagh <igloo at earth.li>
-Date: Sun Jan 15 19:21:38 2012 +0000
-
- Fix a #define
-
- I don't think it was causing any problems, but
- TimeToUS(x+y)
- would have evaluated to
- x + (y / 1000)
-
- MERGED from commit 54121fffb5ee069d9b7a5628104ff1114ea87182
-
- On the 7.4 branch, this was causing a wrong conversion in
- getDelayTarget.
-
- Signed-off-by: Paolo Capriotti <p.capriotti at gmail.com>
-
-commit 6aee474574e0aff10602a6fd17d37826b04a996d
-Author: Simon Marlow <marlowsd at gmail.com>
-Date: Wed Apr 11 10:12:14 2012 +0100
-
- Disable the timer signal while blocked in select() (#5991)
-
- The threaded RTS had a fix for this a long time ago (#1623) but this
- patch applies a similar fix to the non-threaded RTS.
-
- MERGED from commit dd24d6bc37879c6b32a3d5ac4ee765e59e13501c
-
-commit 27c2f292d23983fac0e1f333a43424264c2e290b
-Author: Simon Marlow <marlowsd at gmail.com>
-Date: Wed Apr 11 11:38:24 2012 +0100
-
- Improve the handling of threadDelay in the non-threaded RTS
-
- Firstly, we were rounding up too much, such that the smallest delay
- was 20ms. Secondly, there is no need to use millisecond resolution on
- a 64-bit machine where we have room in the TSO to use the normal
- nanosecond resolution that we use elsewhere in the RTS.
-
- MERGED from commit 9d26519c20194abc3832578a55fbe31327519eeb
-
-
-Index: ghc-7.4.1/includes/Rts.h
-===================================================================
---- ghc-7.4.1.orig/includes/Rts.h 2012-02-01 19:10:32.000000000 +0100
-+++ ghc-7.4.1/includes/Rts.h 2012-06-16 12:39:21.000000000 +0200
-@@ -166,7 +166,7 @@
-
- #if TIME_RESOLUTION == 1000000000
- // I'm being lazy, but [...incomplete...]
More information about the Pkg-haskell-commits
mailing list