X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fdriver%2Fghc.lprl;fp=ghc%2Fdriver%2Fghc.lprl;h=0568a0d0615490a57e937f0c911094b3cf230f18;hb=c7979ff102f38349df882448b7279ce473a4c465;hp=7badbc483bbf9d63efb857b5ae920cd6d555a876;hpb=05ba5565f3de8fa29e3066d97b6825d93c1f3906;p=ghc-hetmet.git

diff --git a/ghc/driver/ghc.lprl b/ghc/driver/ghc.lprl
index 7badbc4..0568a0d 100644
--- a/ghc/driver/ghc.lprl
+++ b/ghc/driver/ghc.lprl
@@ -233,7 +233,6 @@ These are the default values, which may be changed by user flags.
 \begin{code}
 sub setupOptFlags {
    $Oopt_MaxSimplifierIterations  = '-fmax-simplifier-iterations4';
-   $Oopt_PedanticBottoms	  = '-fpedantic-bottoms'; # ON by default
    $Oopt_FinalStgProfilingMassage = '';
    $Oopt_StgStats		  = '';
    $Oopt_DoSpecialise		  = '-fspecialise';
@@ -719,7 +718,6 @@ sub setupOptimiseFlags {
 	'-fcase-of-case',
  	'-fcase-merge',
 	'-flet-to-case',
-	$Oopt_PedanticBottoms,
 
 	# initial simplify: mk specialiser happy: minimum effort please
 
@@ -820,7 +818,7 @@ sub setupOptimiseFlags {
 
 #	( ($OptLevel != 2)
 #        ? ''
-#	: "-fliberate-case -fsimplify [ $Oopt_FB_Support -ffloat-lets-exposing-whnf -ffloat-primops-ok -fcase-of-case -fdo-case-elim -fcase-merge -fdo-lambda-eta-expansion -freuse-con -flet-to-case $Oopt_PedanticBottoms $Oopt_MaxSimplifierIterations $Oopt_ShowSimplifierProgress ]" ),
+#	: "-fliberate-case -fsimplify [ $Oopt_FB_Support -ffloat-lets-exposing-whnf -ffloat-primops-ok -fcase-of-case -fdo-case-elim -fcase-merge -fdo-lambda-eta-expansion -freuse-con -flet-to-case $Oopt_MaxSimplifierIterations $Oopt_ShowSimplifierProgress ]" ),
 
 #	'-fliberate-case',
 
@@ -1732,12 +1730,6 @@ sub runHscAndProcessInterfaces {
 	}
 
 
-	# if we're going to split up object files,
-	# we inject split markers into the .hc file now
-	if ( $HscLang eq 'C' && $SplitObjFiles ) {
-	    &inject_split_markers ( $hsc_out );
-        }
-
 	# save a copy of the .hc file, even if we are carrying on...
 	if ($HscLang eq 'C' && $do_cc && $Keep_hc_file_too) {
             &saveIntermediate($ifile_root , "hc" , $hsc_out);
@@ -3292,9 +3284,6 @@ arg: while($_ = $Args[0]) {
 		    && do { $Oopt_MaxSimplifierIterations = $1 . &grab_arg_arg(*Args,$1, $2);
 			    next arg; };
 
-    /^-fno-pedantic-bottoms$/
-		    && do { $Oopt_PedanticBottoms = ''; next arg; };
-
     /^-fno-pre-inlining$/
 		    && do { push(@HsC_flags, $_); next arg };