X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fdriver%2Fghc.lprl;h=2541fe1814affa4a5b787df05f3e714b8e982fb6;hb=a279d5ac5490599065e138b497cac6c3794f7a6d;hp=965a8d6d1940576665b20cc75f55cc874688828b;hpb=3680ac56a4095d9756e036276aef5558f5f35648;p=ghc-hetmet.git

diff --git a/ghc/driver/ghc.lprl b/ghc/driver/ghc.lprl
index 965a8d6..2541fe1 100644
--- a/ghc/driver/ghc.lprl
+++ b/ghc/driver/ghc.lprl
@@ -304,6 +304,7 @@ $BuildTag	= ''; # default is sequential build w/ Appel-style GC
 		   '_p',    "Profiling",
 		   '_t',    "Ticky-ticky Profiling",
 		   '_u',    "Unregisterised",
+		   '_s',    "SMP",
 		   '_mp',   "Parallel",
 		   '_mg',   "Gransim",
 		   # system ways end
@@ -351,8 +352,9 @@ $BuildTag	= ''; # default is sequential build w/ Appel-style GC
 	'_p',  "-fscc-profiling -DPROFILING -optc-DPROFILING",
 	'_t',  "-fticky-ticky -DTICKY_TICKY -optc-DTICKY_TICKY",
 	'_u',  "-optc-DNO_REGS -optc-DUSE_MINIINTERPRETER -fno-asm-mangling -funregisterised",
-	'_mp', "-fstack-check -fparallel -D__PARALLEL_HASKELL__ -optc-DPAR",
-	'_mg', "-fstack-check -fconcurrent -fgransim -D__GRANSIM__ -D__CONCURRENT_HASKELL__ -optc-DCONCURRENT -optc-DGRAN");
+	'_s',  "-fparallel -optc-pthread -optl-pthread -optc-DSMP",
+	'_mp', "-fparallel -D__PARALLEL_HASKELL__ -optc-DPAR",
+	'_mg', "-fgransim -D__GRANSIM__ -optc-DGRAN");
 
 # where to look for interface files (system hi's, i.e., prelude and syslibs)
 @SysImport_dir	= ( $INSTALLING )
@@ -901,6 +903,9 @@ sub setupBuildFlags {
 	  exit(1);
       }
 
+  } elsif ( $SMPing eq 's') {
+      $BuildTag = '_s';
+
   } elsif ( $GRANing eq 'g' ) {
       if ($TICKYing eq 't') { print STDERR "$Pgm: Can't mix -gransim with -ticky.\n"; exit 1; }
       $BuildTag = '_mg';
@@ -2943,6 +2948,7 @@ arg: while($_ = $Args[0]) {
     /^-gransim$/    && do { $GRANing   = 'g'; &add_syslib('concurrent'); next arg; }; # GranSim
     /^-ticky$/	    && do { $TICKYing  = 't'; next arg; }; # ticky-ticky
     /^-parallel$/   && do { $PARing    = 'p'; &add_syslib('concurrent'); next arg; }; # parallel Haskell
+    /^-smp$/        && do { $SMPing    = 's'; &add_syslib('concurrent'); next arg; }; # parallel Haskell
 
     #-------------- "user ways" --------------------------------------------