X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fdriver%2Fghc.lprl;h=e3eb56bbe8ed42d93dc15234c00cc8947e6b62a9;hb=de896403dfe48bc999e5501eb8b517624dd2e5d4;hp=e3720e3fe74db2bb5060f8d0cfcb70564cba52b5;hpb=f83a5a68edb4b9dbdff1eebeed84527711efc728;p=ghc-hetmet.git

diff --git a/ghc/driver/ghc.lprl b/ghc/driver/ghc.lprl
index e3720e3..e3eb56b 100644
--- a/ghc/driver/ghc.lprl
+++ b/ghc/driver/ghc.lprl
@@ -12,6 +12,8 @@ It is written in \tr{perl}.  The first section includes a long
 %************************************************************************
 
 \begin{code}
+use 5;   # require Perl version 5 or later.
+
 ($Pgm = $0) =~ s|.*/||;
 $ShortUsage  =  "\nUsage: For basic information, try the `-help' option.\n";
 $LongUsage = "\n" . <<EOUSAGE;
@@ -476,7 +478,6 @@ $CollectingGCstats = 0;
 $CollectGhcTimings = 0;
 $DEBUGging = '';	# -DDEBUG and all that it entails (um... not really)
 $PROFing = '';		# set to p or e if profiling
-$PROFgroup = '';	# set to group if an explicit -Ggroup specified
 $PROFauto = '';	        # set to relevant hsc flag if -auto or -auto-all
 $PROFcaf  = '';	        # set to relevant hsc flag if -caf-all
 $PROFdict = '';		# set to relevant hsc flag if -auto-dicts
@@ -1101,13 +1102,11 @@ sub setupLinkOpts {
           ,'-u', "${uscore}PrelException_stackOverflow_closure"
           ,'-u', "${uscore}PrelException_heapOverflow_closure"
           ,'-u', "${uscore}PrelException_NonTermination_static_closure"
+          ,'-u', "${uscore}__init_Prelude"
 	));
   if (!$NoHaskellMain) {
    unshift (@Ld_flags,'-u', "${uscore}PrelMain_mainIO_closure");
   }
-  if ($PROFing ne '') {
-   unshift (@Ld_flags,'-u', "${uscore}_regPrelude");
-  }
   if ($TargetPlatform =~ /^powerpc-|^rs6000-/) {
     # sometimes we have lots of toc entries...
     #  unshift(@Ld_flags, ('-Xlinker -bbigtoc -Xlinker -bnoquiet')); 
@@ -2608,7 +2607,7 @@ sub add_syslib {
 	[  # where to slurp interface files from
 	  ( $INSTALLING 
 	       ? "$InstLibDirGhc/imports/text"
-	       : "$TopPwd/hslibs/text:$TopPwd/hslibs/text/html:$TopPwd/hslibs/text/haxml"
+	       : "$TopPwd/hslibs/text:$TopPwd/hslibs/text/html:$TopPwd/hslibs/text/haxml/lib"
 	  )
 	, # where to find the archive to use when linking
 	  ( $INSTALLING 
@@ -2620,7 +2619,7 @@ sub add_syslib {
 	       ? "$InstLibDirGhc"
 	       : "$TopPwd/hslibs/text/cbits"
 	  )
-	, 'lang' # Syslib dependencies
+	, 'lang data' # Syslib dependencies
 	, '' # extra ghc opts
 	, '' # extra cc opts
 	, '' # extra ld opts
@@ -3033,9 +3032,6 @@ arg: while($_ = $Args[0]) {
 		$PROFignore_scc = '-W';
 		next arg; };
 
-    /^-G(.*)$/	&& do { push(@HsC_flags, "-G=$1");   # set group for cost centres
-			next arg; };
-
     /^-unprof-scc-auto/ && do {
 		# generate auto SCCs on top level bindings when not profiling.
 		# Used to measure optimisation effects of presence of sccs.