From 65ee4e4fe803f6e259fdfa5ad07d315b1891ec7b Mon Sep 17 00:00:00 2001 From: andre Date: Mon, 21 Jul 1997 11:31:43 +0000 Subject: [PATCH] [project @ 1997-07-21 11:31:42 by andre] Parallel 2.04 patches --- ghc/driver/Makefile | 3 ++- ghc/driver/ghc-asm.lprl | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ghc/driver/Makefile b/ghc/driver/Makefile index 49ce72d..8db4b8d 100644 --- a/ghc/driver/Makefile +++ b/ghc/driver/Makefile @@ -1,5 +1,5 @@ #----------------------------------------------------------------------------- -# $Id: Makefile,v 1.6 1997/05/19 06:02:14 sof Exp $ +# $Id: Makefile,v 1.7 1997/07/21 11:31:42 andre Exp $ TOP=.. CURRENT_DIR=ghc/driver @@ -137,6 +137,7 @@ WAY_mt_HC_OPTS+=-fstack-check -fconcurrent -fticky-ticky -D__CONCURRENT_HASKELL_ # Way `mp': WAY_mp_NAME=parallel WAY_mp_HC_OPTS+=-fstack-check -fconcurrent -D__PARALLEL_HASKELL__ -DPAR -optcpp-D__PARALLEL_HASKELL__ -optc-DPAR -optc-DCONCURRENT +# try WAY_mp_HC_OPTS+=-fstack-check -fconcurrent -D__PARALLEL_HASKELL__ -DPAR -optcpp-D__CONCURRENT_HASKELL__ -optc-DPAR -optc-DCONCURRENT # # Way `mg': diff --git a/ghc/driver/ghc-asm.lprl b/ghc/driver/ghc-asm.lprl index 0b6ec0c..65519e7 100644 --- a/ghc/driver/ghc-asm.lprl +++ b/ghc/driver/ghc-asm.lprl @@ -605,6 +605,7 @@ sub mangle_asm { $chk[$i] =~ s/\.tc EnterNodeCode\[TC\],EnterNodeCode/\.tc EnterNodeCode\[TC\],\.EnterNodeCode/; #CONC $chk[$i] =~ s/\.tc StackUnderflowEnterNode\[TC\],StackUnderflowEnterNode/\.tc StackUnderflowEnterNode\[TC\],\.StackUnderflowEnterNode/; #CONC $chk[$i] =~ s/\.tc stopThreadDirectReturn\[TC\],stopThreadDirectReturn/\.tc stopThreadDirectReturn\[TC\],\.stopThreadDirectReturn/; #CONC + $chk[$i] =~ s/\.tc CommonUnderflow\[TC\],CommonUnderflow/\.tc CommonUnderflow\[TC\],\.CommonUnderflow/; #PAR $chk[$i] =~ s/\.tc IndUpdRetDir\[TC\],IndUpdRetDir/\.tc IndUpdRetDir\[TC\],\.IndUpdRetDir/; $chk[$i] =~ s/\t\.tc (_PRStart_\S+)\[TC\],_PRStart_\S+/\t\.tc \1\[TC\],\.\1/; -- 1.7.10.4