X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fdriver%2Fghc.lprl;h=e68881d54eda0c2ad52b11317891035753774a84;hb=ef62a97ed0cdc33f4f8892561fb37682e8769044;hp=83bc180f02bcd8d4961ccbf8a08190b9a7120968;hpb=fb49b1af911ded218b3b3a84c784be2542c53e86;p=ghc-hetmet.git diff --git a/ghc/driver/ghc.lprl b/ghc/driver/ghc.lprl index 83bc180..e68881d 100644 --- a/ghc/driver/ghc.lprl +++ b/ghc/driver/ghc.lprl @@ -1,4 +1,3 @@ -% % (c) The GRASP/AQUA Project, Glasgow University, 1992-1997 % @@ -13,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" . < produce code for DLLs (when compiling & linking.) +$Static = 1; +$Static = 0 if ($EnableWin32DLLs eq 'YES'); + +# Output language $HaveNativeCodeGen = $GhcWithNativeCodeGen; -$HscOut = '-C='; # '-C=' ==> .hc output; '-S=' ==> .s output; '-N=' ==> neither -$HscOut = '-S=' - if $HaveNativeCodeGen && $TargetPlatform =~ /^(alpha|sparc)-/; -# TEMP: disable x86 if $HaveNativeCodeGen && $TargetPlatform =~ /^(i386|alpha|sparc)-/; +$HscLang = 'C'; # 'C' ==> .hc output; + # 'asm' ==> .s output; + # 'java' ==> .java output + # 'none' ==> no code output +$HscLang = 'asm' + if ($HaveNativeCodeGen eq 'YES') && $TargetPlatform =~ /^(i386)-/; + $ProduceHi = '-hifile='; $HiOnStdout = 0; $HiWith = ''; @@ -482,16 +488,15 @@ $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 $PROFignore_scc = ''; # set to relevant parser flag if explicit sccs ignored $UNPROFscc_auto = ''; # set to relevant hsc flag if forcing auto sccs without profiling $TICKYing = ''; # set to t if compiling for ticky-ticky profiling $PARing = ''; # set to p if compiling for PAR -$CONCURing = ''; # set to c if compiling for CONCURRENT $GRANing = ''; # set to g if compiling for GRAN -$StkChkByPageFaultOK = 1; # may be set to 0 (false) for some builds +$UNREGing = ($GhcWithRegisterised eq 'YES') ? '' : 'u'; $Specific_hi_file = ''; # set by -ohi ; "-" for stdout $Specific_dump_file = ''; # set by -odump ; "-" for stdout $Using_dump_file = 0; @@ -499,7 +504,8 @@ $Isuffix = ''; $Osuffix = ''; # default: use the normal suffix for that kind of output $HiSuffix = 'hi'; $HiSuffix_prelude = ''; -$Do_recomp_chkr = 0; # don't use the recompilatio checker unless asked +$CompilingPrelude=0; +$Do_recomp_chkr = 1; # Use the recompilation checker by default $Do_cc = -1; # a MAGIC indeterminate value; will be set to 1 or 0. $Do_as = 1; @@ -507,12 +513,15 @@ $Keep_hc_file_too = 0; $Keep_s_file_too = 0; $UseGhcInternals = 0; # if 1, may use GHC* modules $SplitObjFiles = 0; +$DoAsmMangling = 1; # on by default, off by -fno-asm-mangling $NoOfSplitFiles = 0; $Dump_parser_output = 0; $Dump_raw_asm = 0; $Dump_asm_splitting_info = 0; $NoImplicitPrelude = 0; - +# 1 => don't tell the linker to hoist in PrelMain.Main, as an +# external main is provided instead. +$NoHaskellMain=0; } # end of initDriverGlobals (Sigh) @@ -540,7 +549,7 @@ linking.) The checking is done by introducing/munging \tr{what(1)}-style strings. Anyway, here are the relevant global variables and their defaults: \begin{code} -$LinkChk = 1; # set to 0 if the link check should *not* be done +$LinkChk = 0; # set to 0 if the link check should *not* be done # major & minor version numbers; major numbers must always agree; # minor disagreements yield a warning. @@ -575,17 +584,22 @@ Now slurp through the arguments. if ( $Status == 0 && $Only_generate_deps ) { push (@MkDependHS_flags, "-o$Osuffix") if $Osuffix; - push (@MkDependHS_flags, "-s$BuildTag") if $BuildTag; - push (@MkDependHS_flags, "-D__HASKELL1__=$Haskell1Version"); # They're not (currently) needed, but we need to quote any -#include options foreach (@Cmd_opts) { s/-#include.*$/'$&'/g; }; - local($to_do) = "$MkDependHS @MkDependHS_flags -- @Cmd_opts -- @Input_file" ; + local($to_do) = "$MkDependHS @MkDependHS_flags @HsSourceCppOpts -- @Cmd_opts -- @Input_file" ; &run_something($to_do, 'Haskell dependencies'); exit $Status; } +# ..or just to construct a (Haskell) DLL. +if ( $Status == 0 && $Only_generate_dll && $EnableWin32DLLs ) { + + &createWin32DLL(); + exit $Status; +} + # if there are several input files, # we don't allow \tr{-o } or \tr{-ohi } options... # (except if linking, of course) @@ -673,216 +687,127 @@ The (outwards-)let-floater should be the {\em last} Core-to-Core pass that's run. (Um, well, howzabout the simplifier just once more...) \end{description} -STG-TO-STG PASSES: -\begin{description} -\item[\tr{-fupdate-analysis}:] -It really really wants to be the last STG-to-STG pass that is run. -\end{description} - \begin{code} sub setupOptimiseFlags { + # this pass-ordering sequence was agreed by Simon and Andr\'e + # (WDP 94/07, 94/11). + @HsC_minusNoO_flags - = ( '-fsimplify', - '[', - $Oopt_FB_Support, - '-ffloat-lets-exposing-whnf', - '-ffloat-primops-ok', - '-fcase-of-case', - '-fdo-case-elim', -# '-fdo-lambda-eta-expansion', # too complicated - '-freuse-con', -# '-flet-to-case', # no strictness analysis, so... - $Oopt_PedanticBottoms, -# $Oopt_MonadEtaExpansion, # no thanks - -# These two work fine, if you really want no simplification at all, -# for bizarre test reasons. But you get really terrible code if you use them, -# for example: let x = e in x -# with dozens of redundant thunks etc. So I'm leaving them out. -# -# '-fsimpl-uf-use-threshold0', -# '-fessential-unfoldings-only', - - # - # The presence of -fclone-binds is *temporary* to work around - # the fact that the desugarer in 3.0{2.3} does generate - # bindings with identical ids, and the type checker doesn't perform - # properly cloned type substitutions. Instead, we make sure that all - # binders are cloned first time through the simplifier. - # - # Will be properly fixed in the `new compiler` I hear, at which point - # the cloning can be turned off here. - '-fclone-binds', - - $Oopt_MaxSimplifierIterations, - $Oopt_ShowSimplifierProgress, + = ( + '-fsimplify', + '[', + $Oopt_MaxSimplifierIterations, ']', + $Oopt_AddAutoSccs, -# '-ffull-laziness', # removed 95/04 WDP following Andr\'e's lead - $Oopt_FinalStgProfilingMassage ); @HsC_minusO_flags # NOTE: used for *both* -O and -O2 (some conditional bits) = ( + '-ffoldr-build-on', + '-fdo-eta-reduction', + '-fdo-lambda-eta-expansion', + '-fcase-of-case', + '-fcase-merge', + '-flet-to-case', + $Oopt_PedanticBottoms, # initial simplify: mk specialiser happy: minimum effort please + '-fsimplify', '[', - $Oopt_FB_Support, - '-fkeep-spec-pragma-ids', # required before specialisation - -# I don't understand why we want -fessential-unfoldings-only here -# If we have it, the following nasty thing happens: -# f = E -# g* = f -# ...g... -# where "*" means exported. -# In the essential-unfoldings pass we still substitute f for g -# but we don't substitute E for f first. So we get -# f = E -# g* = f -# ...f... -# The g=f will get reverse-substituted later, but it's untidy. -# -# '-fessential-unfoldings-only', -# '-fsimpl-uf-use-threshold0', + '-finline-phase0', # Don't inline anything till full laziness has bitten + # In particular, inlining wrappers inhibits floating + # e.g. ...(case f x of ...)... + # ==> ...(case (case x of I# x# -> fw x#) of ...)... + # ==> ...(case x of I# x# -> case fw x# of ...)... + # and now the redex (f x) isn't floatable any more - # See remark re: cloning in defn of minusnotO - '-fclone-binds', + '-fno-rules', # Similarly, don't apply any rules until after full laziness + # Notably, list fusion can prevent floating. - '-fmax-simplifier-iterations1', - $Oopt_PedanticBottoms, + '-fno-case-of-case', # Don't do case-of-case transformations. + # This makes full laziness work better + + '-fmax-simplifier-iterations2', ']', - ($Oopt_DoSpecialise) ? ( - '-fspecialise-overloaded', - $Oopt_SpecialiseUnboxed, - $Oopt_DoSpecialise, - ) : (), + # Specialisation is best done before full laziness + # so that overloaded functions have all their dictionary lambdas manifest + ($Oopt_DoSpecialise) ? ( $Oopt_DoSpecialise, ) : (), + '-ffloat-outwards', + '-ffloat-inwards', - '-fsimplify', # need dependency anal after specialiser ... - '[', # need tossing before calc-inlinings ... - $Oopt_FB_Support, - '-ffloat-lets-exposing-whnf', - '-ffloat-primops-ok', - '-fcase-of-case', - '-fdo-case-elim', - '-fcase-merge', -# '-fdo-eta-reduction', - '-fdo-lambda-eta-expansion', - '-freuse-con', - $Oopt_PedanticBottoms, - $Oopt_MonadEtaExpansion, - $Oopt_MaxSimplifierIterations, - $Oopt_ShowSimplifierProgress, - # - # The presence of -fclone-binds is *crucial* here as - # -ffull-laziness (which we're about to do next) floats - # bindings outwards, so we better make sure that this - # doesn't result in the floating out of bindings - # with identical uniques, i.e., -ffull-laziness needs - # to be preceeded by a simplifier pass with -fclone-binds - # set. - '-fclone-binds', + '-fsimplify', + '[', + '-finline-phase1', + # Want to run with inline phase 1 after the specialiser to give + # maximum chance for fusion to work before we inline build/augment + # in phase 2. This made a difference in 'ansi' where an overloaded + # function wasn't inlined till too late. + $Oopt_MaxSimplifierIterations, ']', -#LATER: '-fcalc-inlinings1', -- pointless for 2.01 - -# ($Oopt_FoldrBuildWW) ? ( -# '-ffoldr-build-ww-anal', -# '-ffoldr-build-worker-wrapper', -# '-fsimplify', -# '[', -# $Oopt_FB_Support, -# '-ffloat-lets-exposing-whnf', -# '-ffloat-primops-ok', -# '-fcase-of-case', -# '-fdo-case-elim', -# '-fcase-merge', -# '-fdo-eta-reduction', -# '-fdo-lambda-eta-expansion', -# '-freuse-con', -# $Oopt_PedanticBottoms, -# $Oopt_MonadEtaExpansion, -# $Oopt_MaxSimplifierIterations, -# $Oopt_ShowSimplifierProgress, -# ']', -# ) : (), + $Oopt_UsageSPInf, # infer usage information here in case we need it later. + # (add more of these where you need them --KSW 1999-04) - # this pass-ordering sequence was agreed by Simon and Andr\'e - # (WDP 94/07, 94/11). - '-ffull-laziness', - - ($Oopt_FoldrBuild) ? ( - '-ffoldr-build-on', # desugar list comprehensions for foldr/build - - '-fsimplify', - '[', - '-fignore-inline-pragma', # **** NB! - '-fdo-foldr-build', # NB - $Oopt_FB_Support, - '-ffloat-lets-exposing-whnf', - '-ffloat-primops-ok', - '-fcase-of-case', - '-fdo-case-elim', - '-fcase-merge', -# '-fdo-eta-reduction', - '-fdo-lambda-eta-expansion', # After full laziness - '-freuse-con', - $Oopt_PedanticBottoms, - $Oopt_MonadEtaExpansion, - $Oopt_MaxSimplifierIterations, - $Oopt_ShowSimplifierProgress, - ']', - ) : (), + '-fsimplify', + '[', + # Need inline-phase2 here so that build/augment get + # inlined. I found that spectral/hartel/genfft lost some useful + # strictness in the function sumcode' if augment is not inlined + # before strictness analysis runs + + '-finline-phase2', + '-fmax-simplifier-iterations2', + ']', - '-ffloat-inwards', '-fsimplify', '[', - $Oopt_FB_Support, - '-ffloat-lets-exposing-whnf', - '-ffloat-primops-ok', - '-fcase-of-case', - '-fdo-case-elim', - '-fcase-merge', - '-fdo-eta-reduction', - '-fdo-lambda-eta-expansion', - '-freuse-con', - ($Oopt_FoldrBuildInline), - # you need to inline foldr and build - ($Oopt_FoldrBuild) ? ('-fdo-foldr-build') : (), - # but do reductions if you see them! - $Oopt_PedanticBottoms, - $Oopt_MonadEtaExpansion, - $Oopt_MaxSimplifierIterations, - $Oopt_ShowSimplifierProgress, + '-fmax-simplifier-iterations2', + # No -finline-phase: allow all Ids to be inlined now + # This gets foldr inlined before strictness analysis ']', '-fstrictness', + '-fcpr-analyse', + '-fworker-wrapper', '-fsimplify', '[', - $Oopt_FB_Support, - '-ffloat-lets-exposing-whnf', - '-ffloat-primops-ok', - '-fcase-of-case', - '-fdo-case-elim', - '-fcase-merge', -# '-fdo-eta-reduction', - '-fdo-lambda-eta-expansion', - '-freuse-con', - '-flet-to-case', # Aha! Only done after strictness analysis - $Oopt_PedanticBottoms, - $Oopt_MonadEtaExpansion, - $Oopt_MaxSimplifierIterations, - $Oopt_ShowSimplifierProgress, + $Oopt_MaxSimplifierIterations, + # No -finline-phase: allow all Ids to be inlined now ']', + '-ffloat-outwards', # nofib/spectral/hartel/wang doubles in speed if you + # do full laziness late in the day. It only happens + # after fusion and other stuff, so the early pass doesn't + # catch it. For the record, the redex is + # f_el22 (f_el21 r_midblock) + +# Leave out lambda lifting for now +# '-fsimplify', # Tidy up results of full laziness +# '[', +# '-fmax-simplifier-iterations2', +# ']', +# '-ffloat-outwards-full', + + # We want CSE to follow the final full-laziness pass, because it may + # succeed in commoning up things floated out by full laziness. + # + # CSE must immediately follow a simplification pass, because it relies + # on the no-shadowing invariant. See comments at the top of CSE.lhs + # So it must NOT follow float-inwards, which can give rise to shadowing, + # even if its input doesn't have shadows. Hence putting it between + # the two passes. + '-fcse', + + '-ffloat-inwards', # Case-liberation for -O2. This should be after @@ -890,38 +815,22 @@ 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-eta-reduction -fdo-lambda-eta-expansion -freuse-con -flet-to-case $Oopt_PedanticBottoms $Oopt_MonadEtaExpansion $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_PedanticBottoms $Oopt_MaxSimplifierIterations $Oopt_ShowSimplifierProgress ]" ), + +# '-fliberate-case', # Final clean-up simplification: '-fsimplify', '[', - $Oopt_FB_Support, - '-ffloat-lets-exposing-whnf', - '-ffloat-primops-ok', - '-fcase-of-case', - '-fdo-case-elim', - '-fcase-merge', -# '-fdo-eta-reduction', - '-fdo-lambda-eta-expansion', - '-freuse-con', - '-flet-to-case', - '-fignore-inline-pragma', # **** NB! - $Oopt_FoldrBuildInline, - ($Oopt_FoldrBuild) ? ('-fdo-foldr-build') : (), - # but still do reductions if you see them! - $Oopt_PedanticBottoms, - $Oopt_MonadEtaExpansion, - $Oopt_MaxSimplifierIterations, - $Oopt_ShowSimplifierProgress, + $Oopt_MaxSimplifierIterations, + # No -finline-phase: allow all Ids to be inlined now ']', # '-fstatic-args', -#LATER: '-fcalc-inlinings2', -- pointless for 2.01 - # stg2stg passes - '-flambda-lift', +# '-flambda-lift', $Oopt_FinalStgProfilingMassage, $Oopt_StgStats, @@ -930,8 +839,7 @@ sub setupOptimiseFlags { # SPECIAL FLAGS for -O2 ($OptLevel == 2) ? ( - '-fupdate-analysis', # virtually useless; relegated to -O2 - '-fsemi-tagging', + # none at the present time ) : (), ); @@ -955,8 +863,7 @@ if ( $OptLevel <= 0 ) { &add_Hsc_flags( @HsC_minusO_flags ); push(@CcBoth_flags, ($MinusO2ForC || $OptLevel == 2) ? '-O2' : '-O'); # not optional! # -O? to GCC is not optional! -O2 probably isn't worth it generally, - # but it *is* useful in compiling the garbage collectors (so said - # Patrick many moons ago...). + # but it *is* useful in compiling the garbage collector. } else { # -Ofile, then... @@ -976,43 +883,28 @@ if ( $OptLevel <= 0 ) { %* * %************************************************************************ -Sort out @$BuildTag@, @$PROFing@, @$CONCURing@, @$PARing@, -@$GRANing@, @$TICKYing@: +Sort out @$BuildTag@, @$PROFing@, @$PARing@, +@$GRANing@, @$TICKYing@, @UNREGing@: \begin{code} sub setupBuildFlags { - # PROFILING stuff after argv mangling: if ( ! $PROFing ) { - # warn about any scc exprs found (in case scc used as identifier) - push(@HsP_flags, '-W'); - # add -auto sccs even if not profiling ! push(@HsC_flags, $UNPROFscc_auto) if $UNPROFscc_auto; } else { push(@HsC_flags, $PROFauto) if $PROFauto; push(@HsC_flags, $PROFcaf) if $PROFcaf; - #push(@HsC_flags, $PROFdict) if $PROFdict; + push(@HsC_flags, $PROFdict) if $PROFdict; $Oopt_FinalStgProfilingMassage = '-fmassage-stg-for-profiling'; # Ignore user sccs when auto annotating, but warn when doing so. $PROFignore_scc = '-W' if $PROFauto; - - push(@HsP_flags, (($PROFignore_scc) ? $PROFignore_scc : '-S')); - - if ( $SplitObjFiles ) { - # can't split with cost centres -- would need global and externs - print STDERR "$Pgm: WARNING: splitting objects when profiling will *BREAK* if any _scc_s are present!\n"; - # (but it's fine if there aren't any _scc_s around...) -# $SplitObjFiles = 0; # unset - #not an error: for now: $Status++; - } } #if ( $BuildTag ne '' ) { # local($b) = $BuildDescr{$BuildTag}; - # if ($CONCURing eq 'c') { print STDERR "$Pgm: Can't mix $b with -concurrent.\n"; exit 1; } # if ($PARing eq 'p') { print STDERR "$Pgm: Can't mix $b with -parallel.\n"; exit 1; } # if ($GRANing eq 'g') { print STDERR "$Pgm: Can't mix $b with -gransim.\n"; exit 1; } # if ($TICKYing eq 't') { print STDERR "$Pgm: Can't mix $b with -ticky.\n"; exit 1; } @@ -1025,13 +917,7 @@ sub setupBuildFlags { if ($PARing eq 'p') { print STDERR "$Pgm: Can't do profiling with -parallel.\n"; exit 1; } if ($GRANing eq 'g') { print STDERR "$Pgm: Can't do profiling with -gransim.\n"; exit 1; } if ($TICKYing eq 't') { print STDERR "$Pgm: Can't do profiling with -ticky.\n"; exit 1; } - $BuildTag = ($CONCURing eq 'c') ? '_mr' : '_p' ; # possibly "profiled concurrent"... - - } elsif ( $CONCURing eq 'c' ) { - if ($PARing eq 'p') { print STDERR "$Pgm: Can't mix -concurrent with -parallel.\n"; exit 1; } - if ($GRANing eq 'g') { print STDERR "$Pgm: Can't mix -concurrent with -gransim.\n"; exit 1; } - $BuildTag = ($TICKYing eq 't') ? '_mt' : '_mc' ; # possibly "ticky concurrent"... - # "profiled concurrent" already acct'd for... + $BuildTag = '_p' ; } elsif ( $PARing eq 'p' ) { if ($GRANing eq 'g') { print STDERR "$Pgm: Can't mix -parallel with -gransim.\n"; exit 1; } @@ -1043,14 +929,21 @@ 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'; } elsif ( $TICKYing eq 't' ) { $BuildTag = '_t'; - } + } elsif ( $UNREGing eq 'u' ) { + if ($GhcWithRegisterised eq 'YES') { + $BuildTag = '_u'; + } + } \end{code} After the sanity checks, add flags to the necessary parts of the driver pipeline: @@ -1059,9 +952,9 @@ After the sanity checks, add flags to the necessary parts of the driver pipeline if ( $BuildTag ne '' ) { # something other than normal sequential... local($Tag) = "${BuildTag}"; - $Tag =~ s/_//; # move the underscore to the back + $Tag =~ s/_//; # move the underscore to the back - $HscOut = '-C='; # must go via C + $HscLang = 'C'; # must go via C &processArgs(split(' ', $SetupOpts{$BuildTag})); # eval($EvaldSetupOpts{$BuildTag}); } @@ -1077,14 +970,17 @@ Decide what the consistency-checking options are in force for this run: # Funny place to put it, but why not. # if ( $HiSuffix_prelude eq '' ) { - local($Tag) = "${BuildTag}"; - $Tag =~ s/_//; - $Tag = "${Tag}_" if $Tag ne ''; - $HiSuffix_prelude="${Tag}hi"; - } - #push(@HsC_flags, "-hisuf-prelude=.${HiSuffix_prelude}"); # use appropriate Prelude .hi files - #push(@HsC_flags, "-hisuf=.${HiSuffix}"); + if ($CompilingPrelude) { + $HiSuffix_prelude = "$HiSuffix" if $CompilingPrelude; + } else { + local($Tag) = "${BuildTag}"; + + $Tag =~ s/_//; + $Tag = "${Tag}_" if $Tag ne ''; + $HiSuffix_prelude="${Tag}hi"; + } + } } # setupBuildFlags \end{code} @@ -1104,14 +1000,9 @@ Note: a few ``always apply'' flags were set at the very beginning. sub setupMachOpts { if ($TargetPlatform =~ /^alpha-/) { - # we know how to *mangle* asm for alpha - unshift(@CcRegd_flags, ('-D__STG_REV_TBLS__')); - unshift(@CcRegd_flags, ('-DSTACK_CHECK_BY_PAGE_FAULT=1')) if $StkChkByPageFaultOK; unshift(@CcBoth_flags, ('-static')); } elsif ($TargetPlatform =~ /^hppa/) { - # we know how to *mangle* asm for hppa - unshift(@CcRegd_flags, ('-D__STG_REV_TBLS__')); unshift(@CcBoth_flags, ('-static')); # # We don't put in '-mlong-calls', because it's only @@ -1126,31 +1017,18 @@ sub setupMachOpts { # (very nice, but too bad the HP /usr/include files don't agree.) } elsif ($TargetPlatform =~ /^i386-/) { - # we know how to *mangle* asm for X86 - unshift(@CcRegd_flags, ('-D__STG_REV_TBLS__')); - unshift(@CcRegd_flags, ('-DSTACK_CHECK_BY_PAGE_FAULT=1')) if $StkChkByPageFaultOK && $TargetPlatform !~ /nextstep/; - # I do not know how to do STACK_CHECK_BY_PAGE_FAULT - # on NeXTs (my fault, not theirs), so I don't. - # CaS - # -fno-defer-pop : basically the same game as for m68k # - # -fomit-frame-pointer : *must* ; because we're stealing - # the fp (%ebp) for our register maps. *All* register - # maps (in MachRegs.lh) must steal it. + # -fomit-frame-pointer : *must* in .hc files; because we're stealing + # the fp (%ebp) for our register maps. unshift(@CcRegd_flags_hc, '-fno-defer-pop'); - unshift(@CcRegd_flags, '-fomit-frame-pointer'); + unshift(@CcRegd_flags_hc, '-fomit-frame-pointer'); unshift(@CcRegd_flags, "-DSTOLEN_X86_REGS=$StolenX86Regs"); + + unshift(@CcBoth_flags, ('-DDONT_WANT_WIN32_DLL_SUPPORT')) if ($Static); } elsif ($TargetPlatform =~ /^m68k-/) { - # we know how to *mangle* asm for m68k - unshift (@CcRegd_flags, ('-D__STG_REV_TBLS__')); - unshift (@CcRegd_flags, ('-DSTACK_CHECK_BY_PAGE_FAULT=1')) if $StkChkByPageFaultOK && $TargetPlatform !~ /nextstep/; - # I do not know how to do STACK_CHECK_BY_PAGE_FAULT - # on NeXTs (my fault, not theirs), so I don't. - # CaS - # -fno-defer-pop : for the .hc files, we want all the pushing/ # popping of args to routines to be explicit; if we let things # be deferred 'til after an STGJUMP, imminent death is certain! @@ -1167,22 +1045,12 @@ sub setupMachOpts { # also: -fno-defer-pop is not sufficiently well-behaved without it } elsif ($TargetPlatform =~ /^mips-/) { - # we (hope to) know how to *mangle* asm for MIPSen - unshift(@CcRegd_flags, ('-D__STG_REV_TBLS__')); - unshift(@CcRegd_flags, ('-DSTACK_CHECK_BY_PAGE_FAULT=1')) if $StkChkByPageFaultOK; unshift(@CcBoth_flags, ('-static')); } elsif ($TargetPlatform =~ /^powerpc-|^rs6000-/) { - # we know how to *mangle* asm for PowerPC -# :-( unshift(@CcRegd_flags, ('-D__STG_REV_TBLS__')); - unshift(@CcRegd_flags, ('-DSTACK_CHECK_BY_PAGE_FAULT=1')) if $StkChkByPageFaultOK; unshift(@CcBoth_flags, ('-static')); # always easier to start with unshift(@CcRegd_flags, ('-finhibit-size-directive')); # avoids traceback tables } elsif ($TargetPlatform =~ /^sparc-/) { - # we know how to *mangle* asm for SPARC - unshift(@CcRegd_flags, ('-D__STG_REV_TBLS__')); - unshift(@CcRegd_flags, ('-DSTACK_CHECK_BY_PAGE_FAULT=1')) if $StkChkByPageFaultOK; - } } # end of setupMachOpts \end{code} @@ -1217,19 +1085,49 @@ sub setupLinkOpts { unshift(@Ld_flags, (($Ld_main) ? ( '-u', "${uscore}Main_" . $Ld_main . '_closure' ) : ())); + + # things that are referenced by the RTS - make sure that we pull 'em in unshift(@Ld_flags, - ( '-u', "${uscore}PrelBase_Z91Z93_closure" # i.e., [] - ,'-u', "${uscore}PrelBase_IZh_static_info" - ,'-u', "${uscore}PrelBase_CZh_static_info" - ,'-u', "${uscore}PrelBase_False_inregs_info" - ,'-u', "${uscore}PrelBase_True_inregs_info" - ,'-u', "${uscore}DEBUG_REGS" + ( '-u', "${uscore}PrelBase_Izh_static_info" + ,'-u', "${uscore}PrelBase_Czh_static_info" + ,'-u', "${uscore}PrelFloat_Fzh_static_info" + ,'-u', "${uscore}PrelFloat_Dzh_static_info" + ,'-u', "${uscore}PrelAddr_Azh_static_info" + ,'-u', "${uscore}PrelAddr_Wzh_static_info" + ,'-u', "${uscore}PrelAddr_I64zh_static_info" + ,'-u', "${uscore}PrelAddr_W64zh_static_info" + ,'-u', "${uscore}PrelStable_StablePtr_static_info" + ,'-u', "${uscore}PrelBase_Izh_con_info" + ,'-u', "${uscore}PrelBase_Czh_con_info" + ,'-u', "${uscore}PrelFloat_Fzh_con_info" + ,'-u', "${uscore}PrelFloat_Dzh_con_info" + ,'-u', "${uscore}PrelAddr_Azh_con_info" + ,'-u', "${uscore}PrelAddr_Wzh_con_info" + ,'-u', "${uscore}PrelAddr_I64zh_con_info" + ,'-u', "${uscore}PrelAddr_W64zh_con_info" + ,'-u', "${uscore}PrelStable_StablePtr_con_info" + ,'-u', "${uscore}PrelBase_False_closure" + ,'-u', "${uscore}PrelBase_True_closure" + ,'-u', "${uscore}PrelPack_unpackCString_closure" + ,'-u', "${uscore}PrelException_stackOverflow_closure" + ,'-u', "${uscore}PrelException_heapOverflow_closure" + ,'-u', "${uscore}PrelException_NonTermination_closure" + ,'-u', "${uscore}PrelException_PutFullMVar_closure" + ,'-u', "${uscore}PrelException_BlockedOnDeadMVar_closure" + ,'-u', "${uscore}__init_Prelude" + ,'-u', "${uscore}__init_PrelMain" )); + if (!$NoHaskellMain) { + unshift (@Ld_flags,'-u', "${uscore}PrelMain_mainIO_closure"); + } if ($TargetPlatform =~ /^powerpc-|^rs6000-/) { # sometimes we have lots of toc entries... # unshift(@Ld_flags, ('-Xlinker -bbigtoc -Xlinker -bnoquiet')); unshift(@Ld_flags, ('-Xlinker -bbigtoc')); } + if ($TargetPlatform =~ /^hppa/) { + unshift(@Ld_flags, ('-Xlinker +vnocompatwarnings')); + } } # end of setupLinkOpts @@ -1252,14 +1150,13 @@ sub setupIncPaths { push (@Include_dir, "$TopPwd/${CURRENT_DIR}/${GHC_INCLUDE_DIR}"); } else { push (@Include_dir, "$InstLibDirGhc/includes"); - push (@Include_dir, "$InstLibDirGhc/includes"); } } # end of setupIncPaths \end{code} \begin{code} sub setupSyslibs { - push(@SysLibrary, ( '-lHS', '-lHS_cbits' )); # basic I/O and prelude stuff + push(@SysLibrary, ( '-lHSstd', '-lHSstd_cbits' )); # basic I/O and prelude stuff local($f); foreach $f (@SysLibrary) { @@ -1267,23 +1164,23 @@ sub setupSyslibs { $f .= $BuildTag if $f =~ /^-lHS/; } - # fiddle the TopClosure file name... - $TopClosureFile =~ s/XXXX//; - # Push library HSrts, plus boring clib bit push(@SysLibrary, "-lHSrts${BuildTag}"); - push(@SysLibrary, '-lHSclib'); + # # RTS compiled with cygwin32, uses the WinMM API # to implement the itimers, since cygwin.dll does not # support it. Only reqd. for `ways' that use itimers. # - push(@SysLibrary, '-lwinmm') if $BuildTag ne '' && $TargetPlatform eq 'i386-unknown-cygwin32'; + push(@SysLibrary, '-lwinmm') if ($TargetPlatform =~ /-(mingw32|cygwin32)$/); + # Note: currently only tested with mingw, may cause conflicts when linking + # with libcygwin.a + push(@SysLibrary, '-lwsock32') if ($TargetPlatform =~ /-(mingw32|cygwin32)$/); # Push the pvm libraries if ($BuildTag eq '_mp') { $pvmlib = "$ENV{'PVM_ROOT'}/lib/$ENV{'PVM_ARCH'}"; - push(@SysLibrary, "-L$pvmlib", '-lpvm3', '-lgpvm3'); + push(@SysLibrary, "-L$pvmlib", '-lgpvm3', '-lpvm3'); if ( $ENV{'PVM_ARCH'} eq 'SUNMP' ) { push(@SysLibrary, '-lthread', '-lsocket', '-lnsl'); } elsif ( $ENV{'PVM_ARCH'} eq 'SUN4SOL2' ) { @@ -1292,8 +1189,17 @@ sub setupSyslibs { } # Push the GNU multi-precision arith lib; and the math library -push(@SysLibrary, '-lgmp'); -push(@SysLibrary, '-lm'); + +# If this machine has GMP already installed, then we'll get the installed +# lib here, because presumably the one in the tree won't have been built. + +if ($LibGmp eq 'not-installed') { + push(@SysLibrary, "-lgmp"); +} else { + push(@SysLibrary, "-l$LibGmp"); +} + +push(@SysLibrary, '-lm') if !( $TargetPlatform =~ /^.*(cygwin32|mingw32)$/ ); \end{code} %************************************************************************ @@ -1353,8 +1259,7 @@ if ($#Input_file < 0 && $#Link_file < 0) { Tell the world who we are, if they asked. \begin{code} -print STDERR "${ProjectName}, version ${ProjectVersion}, patchlevel ${ProjectPatchLevel}\n" - if $Verbose; +print STDERR "${ProjectName}, version ${ProjectVersion}\n" if $Verbose; \end{code} %************************************************************************ @@ -1370,135 +1275,15 @@ foreach $ifile (@Input_file) { &ProcessInputFile($ifile); } -if ( $Status > 0 ) { # don't link if there were errors... +# don't link if there were errors... +if ( $Status > 0 ) { print STDERR $ShortUsage; &tidy_up(); exit $Status; } -# append last minute flags linker and consistency flags -&setupBuildFlags(); -&setupSyslibs(); -&setupLinkOpts(); - -\end{code} - -Link if appropriate. -\begin{code} -if ($Do_lnkr) { - local($libdirs) = ''; - - # glue them together: - push(@UserLibrary_dir, @SysLibrary_dir); - - $libdirs = '-L' . join(' -L',@UserLibrary_dir) if $#UserLibrary_dir >= 0; - - # for a linker, use an explicitly given one, or the going C compiler ... - local($lnkr) = ( $Lnkr ) ? $Lnkr : $CcRegd; - - if ( ($Specific_output_file eq '') && - ($TargetPlatform eq 'i386-unknown-cygwin32') ) { - $Specific_output_file = 'main.exe'; - print STDERR "Output file not specified, defaulting to \"main.exe\"\n"; - } - - local($output) = ($Specific_output_file ne '') ? "-o $Specific_output_file" : ''; - @Files_to_tidy = ($Specific_output_file ne '') ? $Specific_output_file : 'a.out'; - - local($to_do) = "$lnkr $Verbose @Ld_flags $output @Link_file $TopClosureFile $libdirs @UserLibrary @SysLibrary"; - &run_something($to_do, 'Linker'); - - # finally, check the consistency info in the binary - local($executable) = $Files_to_tidy[0]; - @Files_to_tidy = (); # reset; we don't want to nuke it if it's inconsistent - - if ( $LinkChk ) { - # dynamically load consistency-chking code; then do it. - require('ghc-consist.prl') - || &tidy_up_and_die(1,"$Pgm: panic: can't load ghc-consist.prl!\n"); - - &chk_consistency_info ( $executable ); - } - - # if PVM parallel stuff, we do truly weird things. - # Essentially: (1) move the executable over to where PVM expects - # to find it. (2) create a script in place of the executable - # which will cause the program to be run, via SysMan. - if ( $PARing eq 'p' ) { - local($pvm_executable) = $executable; - local($pvm_executable_base); - - if ( $pvm_executable !~ /^\// ) { # a relative path name: make absolute - local($pwd) = `pwd`; - chop($pwd); - $pwd =~ s/^\/tmp_mnt//; - $pvm_executable = "$pwd/$pvm_executable"; - } - - $pvm_executable =~ s|/|=|g; # make /s into =s - $pvm_executable_base = $pvm_executable; - - $pvm_executable = $ENV{'PVM_ROOT'} . '/bin/' . $ENV{'PVM_ARCH'} - . "/$pvm_executable"; - - &run_something("$Rm -f $pvm_executable; $Cp -p $executable $pvm_executable && $Rm -f $executable", 'Moving binary to PVM land'); - - # OK, now create the magic script for "$executable" - open(EXEC, "> $executable") || &tidy_up_and_die(1,"$Pgm: couldn't open $executable to write!\n"); - print EXEC <"@. \begin{code} - local($going_interactive) = $HscOut eq '-N=' || $ifile_root eq '_stdin'; + local($going_interactive) = $HscLang eq 'none' || $ifile_root eq '_stdin'; # # Warning issued if -keep-hc-file-too is used without # -fvia-C (or the equivalent) # - if ( $HscOut ne '-C=' && $Keep_hc_file_too ) { + if ( $HscLang ne 'C' && $Keep_hc_file_too ) { print STDERR "$Pgm: warning: Native code generator to be used, -keep-hc-file-too will be ignored\n"; } if (! $do_cc && ! $do_as) { # stopping after hsc $hsc_out = ($Specific_output_file ne '') ? $Specific_output_file - : &odir_ify($ifile_root, ($HscOut eq '-C=') ? 'hc' : 's'); + : &odir_ify($ifile_root, $hsc_out_suffix); $ofile_target = $hsc_out; # reset } @@ -1708,14 +1498,32 @@ Now the Haskell compiler, C compiler, and assembler $going_interactive); } - if (-f $hsc_out_c_stub) { - &run_something("cp $hsc_out_c_stub $ofile_c_stub_target", 'Copy foreign export C stubs'); - } - if (-f $hsc_out_h_stub) { &run_something("cp $hsc_out_h_stub $ofile_h_stub_target", 'Copy foreign export header file'); } + if (-f $hsc_out_c_stub) { + &run_something("rm -f $ofile_c_stub_target && echo '#include \"${ofile_h_stub_target}\"' > $ofile_c_stub_target && cat $hsc_out_c_stub >> $ofile_c_stub_target", 'Copy foreign export C stubs'); + local ($hsc_out_s_stub); + local ($hsc_out_o_stub); + ($ofile_s_stub_target = $ofile_c_stub_target) =~ s/\.(.*)$/\.s/; + ($ofile_o_stub_target = $ofile_c_stub_target) =~ s/\.(.*)$//; + + $ofile_o_stub_target = &osuf_ify($ofile_o_stub_target, "o"); + if ($do_cc) { + &runGcc (0, $ofile_c_stub_target, $ofile_s_stub_target); + &runAs ($ofile_o_stub_target, $ofile_s_stub_target); + } + # + # Bring the C stub protos into scope when compiling the .hc file. + # + push (@CcInjects, "#include \"${hsc_out_h_stub}\"\n"); + # Hack - ensure that the stub .h file is included in the OPTIONS section + # if the .hc file is saved. + push (@File_options, "-#include \"${ofile_h_stub_target}\"\n"); + + } + if ($do_cc) { &runGcc ($is_hc_file, $hsc_out, $cc_as_o); &runMangler($is_hc_file, $cc_as_o, $cc_as, $ifile_root) if ! $Only_preprocess_hc; @@ -1735,8 +1543,7 @@ Finally, decide what to queue up for linker input. #ToDo: local($or_isuf) = ($Isuffix eq '') ? '' : "|$Isuffix"; - - if ( $ifile !~ /\.(lhs|hs|hc|c|s|a)$/ && $ifile !~ /_hc$/ ) { + if ( $ifile !~ /\.(lhs|hs|hc|c|s|a|S)$/ && $ifile !~ /_hc$/ ) { # There's sometimes confusion regarding .hi files; users # supplying them on the command line. if ( $ifile =~ /\.hi$/ ) { @@ -1794,7 +1601,7 @@ sub runHscpp { &run_something($to_do, 'Ineffective C pre-processor'); } else { local($includes) = '-I' . join(' -I',@Include_dir); - $to_do .= "$HsCpp $Verbose @HsCpp_flags -D__HASKELL1__=$Haskell1Version -D__GLASGOW_HASKELL__=$ProjectVersionInt $includes $lit2pgm_hscpp >> $hscpp_hsc"; + $to_do .= "$HsCpp $Verbose @HsCpp_flags @HsSourceCppOpts $includes $lit2pgm_hscpp >> $hscpp_hsc"; push(@Files_to_tidy, $hscpp_hsc ); &run_something($to_do, 'Haskellised C pre-processor'); } @@ -1860,6 +1667,10 @@ sub runHscAndProcessInterfaces { push(@HsC_flags, '-fsource-unchanged'); } + # Indicate whether we're static or not. + # This will only ever + push(@HsC_flags, '-static') if $Static; + # Run the compiler &runHsc($ifile_root, $hsc_out, $hsc_hi, $hsc_out_c_stub, $hsc_out_h_stub, $going_interactive); @@ -1872,23 +1683,12 @@ sub runHscAndProcessInterfaces { # Tell the C compiler and assembler not to run $do_cc = 0; $do_as = 0; - # Update dependency info, touch both object file and - # interface file, so that the following invariant is - # maintained: - # - # a dependent module's interface file should after recompilation - # checking be newer than the interface files of its imports. - # - # That is, if module A's interface file changes, then module B - # (which import from A) needs to be checked. - # If A's change does not affect B, which causes the compiler to bail - # out early, we still need to touch the interface file of B. The reason - # for this is that B may export A's interface. + # Update dependency info, by touching the object file + # This records in the file system that the work of + # recompiling this module has been done # &run_something("touch $ofile_target", - "Touch $ofile_target, to propagate dependencies") if $HscOut ne '-N='; - &run_something("touch $hifile_target", - "Touch $hifile_target, to propagate dependencies") if $ProduceHi =~ /-nohifile=/ ; + "Touch $ofile_target, to propagate dependencies") if $HscLang ne 'none'; } else { @@ -1897,18 +1697,20 @@ sub runHscAndProcessInterfaces { # If non-interactive, heave in the consistency info at the end # NB: pretty hackish (depends on how $output is set) if ( ! $going_interactive ) { - if ( $HscOut eq '-C=' ) { - $to_do = "echo 'static char ghc_hsc_ID[] = \"\@(#)hsc $ifile\t$HsC_major_version.$HsC_minor_version,$HsC_consist_options\";' >> $hsc_out"; + if ( $HscLang eq 'C' ) { + $to_do = "echo 'static char ghc_hsc_ID[] = \"\@(#)hsc $ifile\t$HsC_major_version.$HsC_minor_version,$HsC_consist_options\";' >> $hsc_out"; - } elsif ( $HscOut eq '-S=' ) { + &run_something($to_do, 'Pin on Haskell consistency info'); + } elsif ( $HscLang eq 'asm' ) { local($consist) = "hsc.$ifile.$HsC_major_version.$HsC_minor_version.$HsC_consist_options"; $consist =~ s/,/./g; $consist =~ s/\//./g; $consist =~ s/-/_/g; $consist =~ s/[^A-Za-z0-9_.]/ZZ/g; # ToDo: properly? $to_do = "echo '\n\t.text\n$consist:' >> $hsc_out"; + &run_something($to_do, 'Pin on Haskell consistency info'); } - &run_something($to_do, 'Pin on Haskell consistency info'); + # no consistency info for Java output files } @@ -1919,12 +1721,12 @@ sub runHscAndProcessInterfaces { } # if we're going to split up object files, # we inject split markers into the .hc file now - if ( $HscOut eq '-C=' && $SplitObjFiles ) { + if ( $HscLang eq 'C' && $SplitObjFiles ) { &inject_split_markers ( $hsc_out ); } # save a copy of the .hc file, even if we are carrying on... - if ($HscOut eq '-C=' && $do_cc && $Keep_hc_file_too) { + if ($HscLang eq 'C' && $do_cc && $Keep_hc_file_too) { &saveIntermediate($ifile_root , "hc" , $hsc_out); } @@ -1937,11 +1739,9 @@ sub runHscAndProcessInterfaces { sub runHsc { local($ifile_root, $hsc_out, $hsc_hi, $hsc_out_c_stub, $hsc_out_h_stub, $going_interactive) = @_; - # prepend comma to HsP flags (so hsc can tell them apart...) - foreach $a ( @HsP_flags ) { $a = ",$a" unless $a =~ /^,/; } - &makeHiMap() unless $HiMapDone; - push(@HsC_flags, "-himap=$HiIncludeString"); + push(@HsC_flags, "\"-himap=$HiIncludeString\""); + push(@HsC_flags, "\"-himap-sep=${SplitMarker}\""); # here, we may produce .hc/.s and/or .hi files local($output) = ''; @@ -1949,13 +1749,14 @@ sub runHsc { if ( $going_interactive ) { # don't need .hi unless we're going to show it on stdout: - $ProduceHi = '-nohifile=' if ! $HiOnStdout; + $ProduceHi = '-nohifile=' if ! ($HiOnStdout || $Specific_hi_file ne '' ); $do_cc = 0; $do_as = 0; $Do_lnkr = 0; # and we won't go any further... } # set up for producing output/.hi; note that flag twiddling # may mean that nothing will actually be produced: - $output = "$ProduceHi$hsc_hi $HscOut$hsc_out -F=$hsc_out_c_stub -FH=$hsc_out_h_stub"; + $oflags = ( $HscLang eq 'none' ? "" : "-olang=$HscLang -ofile=$hsc_out" ) ; + $output = "$ProduceHi$hsc_hi $oflags -F=$hsc_out_c_stub -FH=$hsc_out_h_stub"; push(@Files_to_tidy, $hsc_hi, $hsc_out, $hsc_out_c_stub, $hsc_out_h_stub ); # if we're compiling foo.hs, we want the GC stats to end up in foo.stat @@ -1968,7 +1769,7 @@ sub runHsc { # emit nofibbish time/bytes-alloc stats to stderr; # see later .stat file post-processing print STDERR "warning: both -Rgc-stats and -Rghc-timing used, -Rghc-timing wins." if $CollectingGCstats; - push(@HsC_rts_flags, "-s$Tmp_prefix.stat"); + push(@HsC_rts_flags, "-S$Tmp_prefix.stat"); push(@Files_to_tidy, "$Tmp_prefix.stat"); } @@ -1993,13 +1794,13 @@ sub runHsc { local($to_do_opts) = "$Tmp_prefix.opts"; open(OPTS, "> $Tmp_prefix.opts") || &tidy_up_and_die(1,"Can't open $Tmp_prefix.opts\n"); - print OPTS "$dump @HsC_flags $CoreLint $StgLint $Verbose"; + print OPTS "$dump @HsC_flags $CoreLint $USPLint $StgLint $Verbose"; close(OPTS); - $to_do = "$HsC @HsP_flags ,$hscpp_hsc \@$Tmp_prefix.opts $output +RTS @HsC_rts_flags"; + $to_do = "$HsC $hscpp_hsc \@$Tmp_prefix.opts $output +RTS @HsC_rts_flags"; } else { - $to_do = "$HsC @HsP_flags ,$hscpp_hsc $dump @HsC_flags $CoreLint $StgLint $Verbose $output +RTS @HsC_rts_flags"; + $to_do = "$HsC $hscpp_hsc $dump @HsC_flags $CoreLint $USPLint $StgLint $Verbose $output +RTS @HsC_rts_flags"; } &run_something($to_do, 'Haskell compiler'); @@ -2026,7 +1827,7 @@ sub makeHiMap { foreach $d ( @Import_dir ) { if ($HiIncludeString) { - $HiIncludeString = "$HiIncludeString:${d}%.${HiSuffix}"; + $HiIncludeString = "$HiIncludeString${SplitMarker}${d}%.${HiSuffix}"; } else { $HiIncludeString = "$d%.${HiSuffix}"; } @@ -2035,7 +1836,7 @@ sub makeHiMap { foreach $d ( @SysImport_dir ) { if ($HiIncludeString) { - $HiIncludeString = "$HiIncludeString:${d}%.${HiSuffix_prelude}"; + $HiIncludeString = "$HiIncludeString${SplitMarker}${d}%.${HiSuffix_prelude}"; } else { $HiIncludeString = "${d}%.${HiSuffix_prelude}"; } @@ -2046,6 +1847,212 @@ sub makeHiMap { \end{code} +Invoke the 'linker' - either the standard linker or the one used to build +a (Win32) DLL. + +\begin{code} +sub runLinker +{ + local($libdirs) = ''; + + # append last minute flags linker and consistency flags + &setupBuildFlags(); + &setupSyslibs(); + &setupLinkOpts(); + + # glue them together: + push(@UserLibrary_dir, @SysLibrary_dir); + + $libdirs = '-L' . join(' -L',@UserLibrary_dir) if $#UserLibrary_dir >= 0; + + # for a linker, use an explicitly given one, or the going C compiler ... + local($lnkr) = ( $Lnkr ) ? $Lnkr : $CcRegd; + + if ( ($Specific_output_file eq '') && + ( ($TargetPlatform eq 'i386-unknown-cygwin32') || + ($TargetPlatform eq 'i386-unknown-mingw32')) ) { + $Specific_output_file = 'main.exe'; + print STDERR "Output file not specified, defaulting to \"main.exe\"\n"; + } + + local($output) = ($Specific_output_file ne '') ? "-o $Specific_output_file" : ''; + @Files_to_tidy = ($Specific_output_file ne '') ? $Specific_output_file : 'a.out'; + + &prepareWin32DllLink(1); + + local($to_do) = "$lnkr $Verbose @Ld_flags $output @Link_file $libdirs @UserLibrary @SysLibrary"; + &run_something($to_do, 'Linker'); + + # finally, check the consistency info in the binary + local($executable) = $Files_to_tidy[0]; + @Files_to_tidy = (); # reset; we don't want to nuke it if it's inconsistent + + if ( $LinkChk ) { + # dynamically load consistency-chking code; then do it. + require('ghc-consist.prl') + || &tidy_up_and_die(1,"$Pgm: panic: can't load ghc-consist.prl!\n"); + + &chk_consistency_info ( $executable ); + } + + # if PVM parallel stuff, we do truly weird things. + # Essentially: (1) move the executable over to where PVM expects + # to find it. (2) create a script in place of the executable + # which will cause the program to be run, via SysMan. + if ( $PARing eq 'p' ) { + local($pvm_executable) = $executable; + local($pvm_executable_base); + + if ( $pvm_executable !~ /^\// ) { # a relative path name: make absolute + local($pwd) = `pwd`; + chop($pwd); + $pwd =~ s/^\/tmp_mnt//; + $pvm_executable = "$pwd/$pvm_executable"; + } + + $pvm_executable =~ s|/|=|g; # make /s into =s + $pvm_executable_base = $pvm_executable; + + $pvm_executable = $ENV{'PVM_ROOT'} . '/bin/' . $ENV{'PVM_ARCH'} + . "/$pvm_executable"; + + &run_something("$Rm -f $pvm_executable; $Cp -p $executable $pvm_executable && $Rm -f $executable", 'Moving binary to PVM land'); + + # OK, now create the magic script for "$executable" + open(EXEC, "> $executable") || &tidy_up_and_die(1,"$Pgm: couldn't open $executable to write!\n"); + print EXEC <= 0; + + &prepareWin32DllLink(0); + + local ($bld_dll) = "dllwrap"; + + local ($output) = ($Specific_output_file ne '') ? "$Specific_output_file" : 'HSdll.dll'; + local ($output_dir); + local ($output_file); + local ($output_lib, $output_def); + + ($output_dir = $output) =~ s|(.*/)[^/]+$|$1|; + $output_dir = "" if ($output_dir eq $output); + ($output_file = $output) =~ s|.*/([^/]+)$|$1|; + + ($output_lib = $output_file) =~ s|(.+)\.[^\.]*$|${output_dir}lib$1_imp.a|; + ($output_def = $output_file) =~ s|(.+)\.[^\.]*$|${output_dir}$1.def|; + + push (@Dll_flags, "-mno-cygwin --target=i386-mingw32") if ($TargetPlatform =~ /^.*mingw32$/); + push (@Dll_flags, "--output-lib $output_lib"); + # If the "--def " option hasn't been supplied, assume everything + # is going to be exported via the DLL.." + if (!grep(/--def/, @Dll_flags)) { + push (@Dll_flags, "--export-all --output-def $output_def"); + } + + local($to_do) = "$bld_dll @Dll_flags -o $output @Link_file $libdirs @UserLibrary @SysLibrary"; + # Make sure the user sees this piece of magic. + print STDERR "$to_do\n" if (!$Verbose); + &run_something($to_do, 'DLL creator'); +} + +sub prepareWin32DllLink +{ + local($linking_main) = @_; + + # + # Win32 DLLs - link with import libraries, not the real archives. + # + if ( $TargetPlatform =~ /-mingw32$/ ) { + if (!$Static) { + # + # If the libraries have the form libHSfoo.a, we + # transform that into libHSfoo_imp.a - the import + # library of the DLL. + # + foreach $a ( @SysLibrary ) { + $a = "${a}_imp" if ($a =~ /^-lHS/); + } + foreach $a ( @UserLibrary ) { + $a = "${a}_imp" if ($a =~ /^-lHS/); + } + push(@Link_file, ( $INSTALLING ) ? "$InstLibDirGhc/Main.dll_o" + : "$TopPwd/$CURRENT_DIR/$GHC_RUNTIME_DIR/Main.dll_o") if $linking_main; + push(@Link_file, ( $INSTALLING ) ? "$InstLibDirGhc/PrelMain.dll_o" + : "$TopPwd/$CURRENT_DIR/$GHC_LIB_DIR/std/PrelMain.dll_o") if $linking_main; + } + push(@Ld_flags, "-mno-cygwin"); + } +} +\end{code} + + %************************************************************************ %* * \section[Driver-misc-utils]{Miscellaneous utilities} @@ -2087,13 +2094,15 @@ sub runGcc { local($c_flags) = "@CcBoth_flags"; local($ddebug_flag) = ( $DEBUGging ) ? '-DDEBUG' : ''; + $c_flags .= " -mno-cygwin" if ( $TargetPlatform =~ /-mingw32$/ ); + # "input" files to use that are not in some weird directory; # to help C compilers grok .hc files [ToDo: de-hackify] local($cc_help) = "ghc$$.c"; local($cc_help_s) = "ghc$$.s"; $cc = $CcRegd; - $s_output = ($is_hc_file || $TargetPlatform =~ /^(powerpc|rs6000|hppa|i386)/) ? $cc_as_o : $cc_as; + $s_output = (($is_hc_file && $DoAsmMangling) || $TargetPlatform =~ /^(powerpc|rs6000|hppa)/) ? $cc_as_o : $cc_as; $c_flags .= " @CcRegd_flags"; $c_flags .= ($is_hc_file) ? " @CcRegd_flags_hc" : " @CcRegd_flags_c"; @@ -2102,12 +2111,7 @@ sub runGcc { open(TMP, "> $cc_help") || &tidy_up_and_die(1,"$Pgm: failed to open `$cc_help' (to write)\n"); if ( $is_hc_file ) { print TMP <= 0; @@ -2124,8 +2128,7 @@ EOINCL # Don't redirect stderr into intermediate file if slamming output onto stdout (e.g., with -E) local($fuse_stderr) = "2>&1" if ! $Only_preprocess_hc; - local($to_do) = "$cc $Verbose $ddebug_flag $c_flags @Cpp_define -D__HASKELL1__=$Haskell1Version $includes $cc_help > $Tmp_prefix.ccout $fuse_stderr && ( if [ $cc_help_s != $s_output ] ; then mv $cc_help_s $s_output ; else exit 0 ; fi )"; - # note: __GLASGOW_HASKELL__ is pointedly *not* #defined at the C level. + local($to_do) = "$cc $Verbose $ddebug_flag $c_flags @Cpp_define $includes $cc_help > $Tmp_prefix.ccout $fuse_stderr && ( if [ $cc_help_s != $s_output ] ; then mv $cc_help_s $s_output ; else exit 0 ; fi )"; if ( $Only_preprocess_hc ) { # HACK ALERT! $to_do =~ s/ -S\b//g; @@ -2145,38 +2148,15 @@ EOINCL sub runMangler { local($is_hc_file, $cc_as_o, $cc_as, $ifile_root) = @_; - if ( $is_hc_file ) { - # dynamically load assembler-fiddling code, which we are about to use: - require('ghc-asm.prl') - || &tidy_up_and_die(1,"$Pgm: panic: can't load ghc-asm.prl!\n"); - } - print STDERR `cat $cc_as_o` if $Dump_raw_asm; # to stderr, before mangling - if ($is_hc_file) { + if ($is_hc_file && $DoAsmMangling) { + # dynamically load assembler-fiddling code, which we are about to use: + require('ghc-asm.prl') + || &tidy_up_and_die(1,"$Pgm: panic: can't load ghc-asm.prl!\n"); # post-process the assembler [.hc files only] &mangle_asm($cc_as_o, $cc_as); - -#OLD: for sanity: -#OLD: local($target) = 'oops'; -#OLD: $target = '-alpha' if $TargetPlatform =~ /^alpha-/; -#OLD: $target = '-hppa' if $TargetPlatform =~ /^hppa/; -#OLD: $target = '-old-asm' if $TargetPlatform =~ /^i386-/; -#OLD: $target = '-m68k' if $TargetPlatform =~ /^m68k-/; -#OLD: $target = '-mips' if $TargetPlatform =~ /^mips-/; -#OLD: $target = '' if $TargetPlatform =~ /^powerpc-/; -#OLD: $target = '-solaris' if $TargetPlatform =~ /^sparc-sun-solaris2/; -#OLD: $target = '-sparc' if $TargetPlatform =~ /^sparc-sun-sunos4/; -#OLD: -#OLD: if ( $target ne '' ) { -#OLD: require("ghc-asm$target.prl") -#OLD: || &tidy_up_and_die(1,"$Pgm: panic: can't load ghc-asm$target.prl!\n"); -#OLD: &mangle_asm($cc_as_o, "$cc_as-2"); # the OLD one! -#OLD: &run_something("$Cmp -s $cc_as-2 $cc_as || $Diff $cc_as-2 $cc_as 1>&2 || exit 0", -#OLD: "Diff'ing old and new mangled .s files"); # NB: to stderr -#OLD: } - } elsif ($TargetPlatform =~ /^hppa/) { # minor mangling of non-threaded files for hp-pa only require('ghc-asm.prl') @@ -2188,11 +2168,6 @@ sub runMangler { require('ghc-asm.prl') || &tidy_up_and_die(1,"$Pgm: panic: can't load ghc-asm-powerpc.prl!\n"); &mini_mangle_asm_powerpc($cc_as_o, $cc_as); - } elsif ($TargetPlatform =~ /^i386/) { - # extremely-minor OFFENSIVE mangling of non-threaded just one file - require('ghc-asm.prl') - || &tidy_up_and_die(1,"$Pgm: panic: can't load ghc-asm.prl!\n"); - &mini_mangle_asm_i386($cc_as_o, $cc_as); } # save a copy of the .s file, even if we are carrying on... @@ -2208,8 +2183,11 @@ sub runAs { local($asmblr) = ( $As ) ? $As : $CcRegd; - if ( ! $SplitObjFiles ) { - local($to_do) = "$asmblr -o $as_out -c @As_flags $cc_as"; + # need to add the -I flags in case the file is going through cpp (.S files) + local($includes) = '-I' . join(' -I', @Include_dir); + + if ( ! $SplitObjFiles || $ifile_root =~ /_stub\.s$/ ) { + local($to_do) = "$asmblr -o $as_out -c @As_flags $includes $cc_as"; push(@Files_to_tidy, $as_out ); &run_something($to_do, 'Unix assembler'); @@ -2288,16 +2266,10 @@ sub run_something { open(CCOUT, "< $Tmp_prefix.ccout") || &tidy_up_and_die(1,"$Pgm: failed to open `$Tmp_prefix.ccout'\n"); while ( ) { - next if /attribute directive ignored/; next if /call-clobbered/; - next if /from .*COptRegs\.lh/; - next if /from .*(stg|rts)defs\.h:/; + next if /control reaches end/; + next if /from .*Stg\.h:/; next if /from ghc\d+.c:\d+:/; - next if /from .*\.lc/; - next if /from .*SMinternal\.l?h/; - next if /ANSI C does not support \`long long\'/; - next if /warning:.*was declared \`extern\' and later \`static\'/; - next if /warning: assignment discards \`const\' from pointer target type/; next if /: At top level:$/; next if /: In function \`.*\':$/; next if /\`ghc_cc_ID\' defined but not used/; @@ -2306,12 +2278,24 @@ sub run_something { close(CCOUT) || &tidy_up_and_die(1,"$Pgm: failed closing `$Tmp_prefix.ccout'\n"); } + local($signal_num) = $? & 127; + local($dumped_core) = $? & 128; + + if ($signal_num != 0) { + print STDERR "$tidy_name received signal $signal_num"; + if ($dumped_core != 0) { + print STDERR " (core dumped)"; + } + print STDERR "\n"; + } + if ($return_val != 0) { if ($Using_dump_file) { print STDERR "Compilation Errors dumped in $Specific_dump_file\n"; } &tidy_up_and_die($return_val, ''); } + $Using_dump_file = 0; } \end{code} @@ -2335,7 +2319,7 @@ sub process_ghc_timings { local($tot_samples) = 0; while () { - if (! /Minor/ && /^\s*\d+\s+\d+\s+(\d+)\s+\d+\.\d+\%/ ) { + if (! /Gen:\s+0/ && ! /Minor/ && /^\s*\d+\s+\d+\s+(\d+)\s+\d+\.\d+/ ) { $max_live = $1 if $max_live < $1; $tot_live += $1; $tot_samples += 1; @@ -2346,7 +2330,11 @@ sub process_ghc_timings { $MaxResidency = $1; $ResidencySamples = $2; } - $GCs = $1 if /^\s*([0-9,]+) garbage collections? performed/; + $GCs = $1 if /^\s*([0-9,]+) (collections? in generation 0|garbage collections? performed)/; + + if ( /^\s+([0-9]+)\s+Mb total memory/ ) { + $TotMem = $1; + } # The presence of -? in the following pattern is only there to # accommodate 0.29 && <= 2.05 RTS' @@ -2393,7 +2381,7 @@ sub process_ghc_timings { # print out what we found print STDERR "<<$SysSpecificTiming: ", - "$BytesAlloc bytes, $GCs GCs, $AvgResidency/$MaxResidency avg/max bytes residency ($ResidencySamples samples), $InitTime INIT ($InitElapsed elapsed), $MutTime MUT ($MutElapsed elapsed), $GcTime GC ($GcElapsed elapsed)", + "$BytesAlloc bytes, $GCs GCs, $AvgResidency/$MaxResidency avg/max bytes residency ($ResidencySamples samples), ${TotMem}M in use, $InitTime INIT ($InitElapsed elapsed), $MutTime MUT ($MutElapsed elapsed), $GcTime GC ($GcElapsed elapsed)", " :$SysSpecificTiming>>\n"; # OK, party over @@ -2494,27 +2482,262 @@ sub add_Hsc_flags { } \end{code} +To add another system library, you'll need to augment the +Supported_syslibs variable with name and info on your addition +to the syslib family. The info bit consist of the following: + + - interface file directory + see the misc or posix entry for how to distinguish + between using installed and build tree directories. + + - directory location of archives + + - location of (way-independent) C support libs. + not all libraries need this - if you don't, just + give the empty string. + - list of syslibs you depend on. + + - additional ghc command line flags that should be used. + - additional C compiler command line flags that should be used. + - link + + \begin{code} + +# Hash to keep track of +%Syslibs_added = (); + sub add_syslib { local($syslib) = @_; + + # Lifting this out of this sub brings it out of scope - why?? + %Supported_syslibs = + ( lang, + [ # where to slurp interface files from + ( $INSTALLING + ? "$InstLibDirGhc/imports/lang" + : "$TopPwd/hslibs/lang:$TopPwd/hslibs/lang/monads" + ) + , # where to find the archive to use when linking + ( $INSTALLING + ? "$InstLibDirGhc" + : "$TopPwd/hslibs/lang" + ) + , # where to find the cbits archive to use when linking + ( $INSTALLING + ? "$InstLibDirGhc" + : "$TopPwd/hslibs/lang/cbits" + ) + , '' # Syslib dependencies + , '' # extra ghc opts + , '' # extra cc opts + , '' # extra ld opts + ], + + concurrent, + [ # where to slurp interface files from + ( $INSTALLING + ? "$InstLibDirGhc/imports/concurrent" + : "$TopPwd/hslibs/concurrent" + ) + , # where to find the archive to use when linking + ( $INSTALLING + ? "$InstLibDirGhc" + : "$TopPwd/hslibs/concurrent" + ) + , '' # where to find the cbits archive to use when linking + , '' # Syslib dependencies + , '' # extra ghc opts + , '' # extra cc opts + , '' # extra ld opts + ], + + data, + [ # where to slurp interface files from + ( $INSTALLING + ? "$InstLibDirGhc/imports/data" + : "$TopPwd/hslibs/data:$TopPwd/hslibs/data/edison:$TopPwd/hslibs/data/edison/Assoc:$TopPwd/hslibs/data/edison/Coll:$TopPwd/hslibs/data/edison/Seq" + ) + , # where to find the archive to use when linking + ( $INSTALLING + ? "$InstLibDirGhc" + : "$TopPwd/hslibs/data" + ) + , '' # where to find the cbits archive to use when linking + , 'lang' # Syslib dependencies + , '' # extra ghc opts + , '' # extra cc opts + , '' # extra ld opts + ], + + net, + [ # where to slurp interface files from + ( $INSTALLING + ? "$InstLibDirGhc/imports/net" + : "$TopPwd/hslibs/net" + ) + , # where to find the archive to use when linking + ( $INSTALLING + ? "$InstLibDirGhc" + : "$TopPwd/hslibs/net" + ) + , # where to find the cbits archive to use when linking + ( $INSTALLING + ? "$InstLibDirGhc" + : "$TopPwd/hslibs/net/cbits" + ) + , 'lang text' # Syslib dependencies + , '' # extra ghc opts + , '' # extra cc opts + , ( $TargetPlatform =~ /-solaris2$/ ? '-lnsl -lsocket' : '') + ], + + posix, + [ # where to slurp interface files from + ( $INSTALLING + ? "$InstLibDirGhc/imports/posix" + : "$TopPwd/hslibs/posix" + ) + , # where to find the archive to use when linking + ( $INSTALLING + ? "$InstLibDirGhc" + : "$TopPwd/hslibs/posix" + ) + , # where to find the cbits archive to use when linking + ( $INSTALLING + ? "$InstLibDirGhc" + : "$TopPwd/hslibs/posix/cbits" + ) + , 'lang' # Syslib dependencies + , '' # extra ghc opts + , '' # extra cc opts + , '' # extra ld opts + ], + + text, + [ # where to slurp interface files from + ( $INSTALLING + ? "$InstLibDirGhc/imports/text" + : "$TopPwd/hslibs/text:$TopPwd/hslibs/text/html:$TopPwd/hslibs/text/haxml/lib" + ) + , # where to find the archive to use when linking + ( $INSTALLING + ? "$InstLibDirGhc" + : "$TopPwd/hslibs/text" + ) + , # where to find the cbits archive to use when linking + ( $INSTALLING + ? "$InstLibDirGhc" + : "$TopPwd/hslibs/text/cbits" + ) + , 'lang data' # Syslib dependencies + , '' # extra ghc opts + , '' # extra cc opts + , '' # extra ld opts + ], + + util, + [ # where to slurp interface files from + ( $INSTALLING + ? "$InstLibDirGhc/imports/util" + : "$TopPwd/hslibs/util:$TopPwd/hslibs/util/check" + ) + , # where to find the archive to use when linking + ( $INSTALLING + ? "$InstLibDirGhc" + : "$TopPwd/hslibs/util" + ) + , # where to find the cbits archive to use when linking + ( $INSTALLING + ? "$InstLibDirGhc" + : "$TopPwd/hslibs/util/cbits" + ) + , 'lang concurrent posix' # Syslib dependencies + , '' # extra ghc opts + , '' # extra cc opts + , "$LibsReadline" # extra ld opts + ], + + win32, + [ # where to slurp interface files from + ( $INSTALLING + ? "$InstLibDirGhc/imports/win32" + : "$TopPwd/hslibs/win32/src" + ) + , # where to find the archive to use when linking + ( $INSTALLING + ? "$InstLibDirGhc" + : "$TopPwd/hslibs/win32/src" + ) + , '' + , 'lang' # Syslib dependencies + , '' # extra ghc opts + , '' # extra cc opts + , '-luser32 -lgdi32' # extra ld opts + ], + + com, + [ # where to slurp interface files from + ( $INSTALLING + ? "$InstLibDirGhc/imports/com" + : "$TopPwd/hdirect/lib" + ) + , # where to find the archive to use when linking + ( $INSTALLING + ? "$InstLibDirGhc" + : "$TopPwd/hdirect/lib" + ) + , '' + , 'lang' # Syslib dependencies + , '' # extra ghc opts + , '' # extra cc opts + , '-luser32 -lole32 -loleaut32 -ladvapi32' + # extra ld opts + ] + ); + + # check if it's supported.. - # The Win32 lib sources live in hslibs/ - if ( $syslib eq 'win32' && ! $INSTALLING ) { - unshift(@SysImport_dir, "$TopPwd/hslibs/$syslib/src"); - push(@SysLibrary_dir, "$TopPwd/hslibs/$syslib/src"); - } else { - unshift(@SysImport_dir, - $INSTALLING ? "$InstLibDirGhc/imports/$syslib" - : "$TopPwd/$CURRENT_DIR/$GHC_LIB_DIR/$syslib"); - - push(@SysLibrary_dir, - $INSTALLING ? ("$InstLibDirGhc") - : ("$TopPwd/$CURRENT_DIR/$GHC_LIB_DIR/$syslib", - "$TopPwd/$CURRENT_DIR/$GHC_LIB_DIR/$syslib/cbits")); + if ( !exists $Supported_syslibs{$syslib} ) { + print STDERR "$Pgm: no such system library (-syslib): $syslib\n"; + $Status++; + return; } + + # This check is here to avoid syslib loops from + # spoiling the party. A side-effect of it is that + # it disallows multiple mentions of a syslib on a command-line, + # explicit *and* implicit ones (i.e., "-syslib lang -syslib misc" + # is not equal to "-syslib lang -syslib misc -syslib lang", + # which it needs to be) + # + # Since our current collection of syslibs don't have any + # loops, this test is disabled. + # + # ToDo: loop avoidance scheme when the need arises + # + #return if ( exists $Syslibs_added{$syslib} ); + + $Syslibs_added{$syslib} = 1; + + local ($hi_dirs, $lib_dir, $lib_cbits_dir, + $syslib_deps, $syslib_ghc_opts, + $syslib_cc_opts, $syslib_ld_opts) = @{ $Supported_syslibs{$syslib} }; + + foreach(split(':',$hi_dirs)) { + unshift(@SysImport_dir, $_); + } + push(@SysLibrary_dir, $lib_dir); + push(@SysLibrary_dir, $lib_cbits_dir) if ( $lib_cbits_dir ne ''); + push(@SysLibrary, "-lHS$syslib"); - push(@SysLibrary, "-lHS${syslib}_cbits") - unless $syslib =~ /^(contrib|exts|concurrent|win32)$/; #HACK! have no cbits + push(@SysLibrary, "-lHS${syslib}_cbits") if ( $lib_cbits_dir ne ''); + push(@SysLibrary, $syslib_ld_opts) if ($syslib_ld_opts ne ''); + + # Add on any extra dependencies. + foreach $lib (split(' ',$syslib_deps)) { + &add_syslib($lib); + } } \end{code} @@ -2542,7 +2765,7 @@ sub check_for_source_options { open(FILE,$file) || return(1); # No big loss while () { - if ( /^${comment_start} OPTIONS (.*)${comment_end}$/ ) { + if ( /^${comment_start} OPTIONS (.*)${comment_end}/ ) { # add the options found at the back of the command line. local(@entries) = split(/\s+/,$1); print STDERR "Found OPTIONS " . join(' ',@entries) . " in $file\n" if $Verbose; @@ -2584,7 +2807,7 @@ sub splitCmdLine { arg: while($_ = $args[0]) { shift(@args); # sigh, we have to deal with these -option arg specially here. - /^-(tmpdir|odir|ohi|o|isuf|osuf|hisuf|hisuf-prelude|odump|syslib)$/ && + /^-(tmpdir|odir|ohi|o|isuf|osuf|hisuf|odump|syslib|package|package-name)$/ && do { push(@Cmd_opts, $_); push(@Cmd_opts,$args[0]); shift(@args); next arg; }; /^--?./ && do { push(@Cmd_opts, $_); next arg; }; @@ -2612,9 +2835,24 @@ sub saveIntermediate { local ($final,$suffix,$tmp)= @_ ; local ($to_do); + local ($new_suffix); + # $final -- root of where to park ${final}.${suffix} # $tmp -- temporary file where hsc put the intermediate file. + # HWL: use -odir for .hc and .s files, too + if ( $Specific_output_dir ne '' ) { + $final = "${Specific_output_dir}/${final}"; + } + # HWL: use the same suffix as for $Osuffix in generating intermediate file, + # replacing o with hc or s, respectively. + if ( $Osuffix ne '' ) { + ($new_suffix = $Osuffix) =~ s/o$/hc/ if $suffix eq "hc"; + ($new_suffix = $Osuffix) =~ s/o$/s/ if $suffix eq "s"; + $suffix = $new_suffix; + print stderr "HWL says: suffix for intermediate file is $suffix; ${final}.${suffix} overall\n" if $Verbose; + } + # Delete the old file $to_do = "$Rm ${final}.${suffix}"; &run_something($to_do, "Removing old .${suffix} file"); @@ -2648,7 +2886,7 @@ arg: while($_ = $Args[0]) { if (/^-\?$/ || /^--?help$/) { print $LongUsage; exit $Status; } #-----------version ---------------------------------------------------- - /^--version$/ && do { print STDERR "${ProjectName}, version ${ProjectVersion}, patchlevel ${ProjectPatchLevel}\n"; exit $Status; }; + /^--version$/ && do { print STDERR "${ProjectName}, version ${ProjectVersion}\n"; exit $Status; }; #---------- verbosity and such ----------------------------------------- /^-v$/ && do { $Verbose = '-v'; $Time = 'time'; next arg; }; @@ -2660,11 +2898,15 @@ arg: while($_ = $Args[0]) { # change the global default: # we won't run cat; we'll run the real thing - /^-C$/ && do { $Do_cc = 0; $Do_as = 0; $Do_lnkr = 0; $HscOut = '-C='; + /^-C$/ && do { $Do_cc = 0; $Do_as = 0; $Do_lnkr = 0; $HscLang = 'C'; next arg; }; # stop after generating C - /^-noC$/ && do { $HscOut = '-N='; $ProduceHi = '-nohifile='; + /^-J$/ && do { $Do_cc = 0; $Do_as = 0; $Do_lnkr = 0; $HscLang = 'java'; + next arg; }; + # stop after generating Java + + /^-noC$/ && do { $HscLang = 'none'; $ProduceHi = '-nohifile='; $Do_cc = 0; $Do_as = 0; $Do_lnkr = 0; next arg; }; # leave out actual C generation (debugging) [also turns off interface gen] @@ -2691,6 +2933,8 @@ arg: while($_ = $Args[0]) { # stop after preprocessing C /^-M$/ && do { $Only_generate_deps = 1; $Do_as = 0; $Do_lnkr = 0; next arg; }; # only generate dependency information. + /^--mk-dll$/ && do { $Only_generate_dll = 1; $Do_as = 0; $Do_lnkr = 0; next arg; }; + # Build a Win32 DLL (where supported). /^-S$/ && do { $Do_as = 0; $Do_lnkr = 0; next arg; }; # stop after generating assembler @@ -2698,8 +2942,8 @@ arg: while($_ = $Args[0]) { # stop after generating .o files /^-link-chk$/ && do { $LinkChk = 1; next arg; }; - /^-no-link-chk$/ && do { $LinkChk = 0; next arg; }; # don't do consistency-checking after a link + /^-no-link-chk$/ && do { $LinkChk = 0; next arg; }; /^-tmpdir$/ && do { $Tmp_prefix = &grab_arg_arg(*Args,'-tmpdir', ''); $Tmp_prefix = "$Tmp_prefix/ghc$$"; @@ -2760,6 +3004,7 @@ arg: while($_ = $Args[0]) { $Status++; } } + $ProduceHi='-hifile='; next arg; }; # The suffix to use when looking for interface files @@ -2769,13 +3014,6 @@ arg: while($_ = $Args[0]) { $Status++; } next arg; }; - # ToDo: remove, not a `normal' user thing to do (should be automatic) - /^-hisuf-prelude$/ && do { $HiSuffix_prelude = &grab_arg_arg(*Args,'-hisuf-prelude', ''); - if ($HiSuffix =~ /\./ ) { - print STDERR "$Pgm: -hisuf-prelude suffix shouldn't contain a .\n"; - $Status++; - } - next arg; }; /^-odump$/ && do { $Specific_dump_file = &grab_arg_arg(*Args,'-odump', ''); if ($Specific_dump_file =~ /(.*)\/[^\/]*$/) { local($dir_part) = $1; @@ -2790,13 +3028,14 @@ arg: while($_ = $Args[0]) { /^-prof$/ && do { $PROFing = 'p'; next arg; }; # profiling -- details later! - /^-auto/ && do { - # generate auto SCCs on top level bindings - # -auto-all = all top level bindings - # -auto = only top level exported bindings - $PROFauto = ( /-all/ ) - ? '-fauto-sccs-on-all-toplevs' - : '-fauto-sccs-on-exported-toplevs'; + /^-auto-dicts$/ && do { + $PROFdicts = '-fauto-sccs-on-dicts'; + next arg; }; + /^-auto-all$/ && do { + $PROFauto = '-fauto-sccs-on-all-toplevs'; + next arg; }; + /^-auto$/ && do { + $PROFauto = '-fauto-sccs-on-exported-toplevs'; next arg; }; /^-caf-all/ && do { # generate individual CAF SCC annotations @@ -2808,9 +3047,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. @@ -2819,14 +3055,13 @@ arg: while($_ = $Args[0]) { : '-fauto-sccs-on-exported-toplevs'; next arg; }; - #--------- ticky/concurrent/parallel ----------------------------------- + #--------- ticky/parallel ---------------------------------------------- # we sort out the details a bit later on - /^-concurrent$/ && do { $CONCURing = 'c'; &add_syslib('concurrent'); next arg; }; - # concurrent Haskell; implies -syslib conc /^-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" -------------------------------------------- @@ -2852,8 +3087,16 @@ arg: while($_ = $Args[0]) { print STDERR "WARNING: import paths cleared by `-i'\n"; next arg; }; - /^-i(.*)/ && do { local(@new_items) - = split( /:/, &grab_arg_arg(*Args,'-i', $1)); + /^-i(.*)/ && do { local(@new_items); + local($arg) = $1; + + # + if ( $arg =~ /;/ ) { + $SplitMarker=";"; + @new_items = split( /;/, &grab_arg_arg(*Args,'-i', $arg)); + } else { + @new_items = split( /:/, &grab_arg_arg(*Args,'-i', $arg)); + } unshift(@Import_dir, @new_items); next arg; }; @@ -2861,29 +3104,19 @@ arg: while($_ = $Args[0]) { /^-L(.*)/ && do { push(@UserLibrary_dir, &grab_arg_arg(*Args,'-L', $1)); next arg; }; /^-l(.*)/ && do { push(@UserLibrary,'-l'.&grab_arg_arg(*Args,'-l', $1)); next arg; }; + # DEPRECATED: use -package instead /^-syslib(.*)/ && do { local($syslib) = &grab_arg_arg(*Args,'-syslib',$1); - print STDERR "$Pgm: no such system library (-syslib): $syslib\n", - $Status++ unless $syslib =~ /^(exts|misc|posix|concurrent|win32)$/; - - # - # The posix library is a `special' in that it relies on - # the ghc system library (packed strings). Wielding our - # sledgehammer, the problem is solved by silently including - # the ghc system library as well. - # (ToDo: `nub' -syslib list) - # &add_syslib($syslib); - if ( $syslib eq 'posix' ) { - &add_syslib('misc'); - } elsif ( $syslib eq 'misc' && - $TargetPlatform =~ /-solaris2$/ ) { - # needed for Berkeley socket/nwork stuff. - push(@SysLibrary, '-lnsl -lsocket'); - } elsif ( $syslib eq 'win32' && - $TargetPlatform =~ /-cygwin32$/ ) { - # need to get at UI/Graphics functionality. - push(@SysLibrary, '-luser32 -lgdi32'); - } + next arg; }; + + /^-package-name(.*)/ && do + { local($package) = &grab_arg_arg(*Args,'-package-name',$1); + push(@HsC_flags,"-inpackage=$package"); + next arg; + }; + + /^-package(.*)/ && do { local($package) = &grab_arg_arg(*Args,'-package',$1); + &add_syslib($package); next arg; }; #======================================================================= @@ -2907,11 +3140,11 @@ arg: while($_ = $Args[0]) { /^-optP(.*)$/ && do { push(@HsCpp_flags, $1); next arg; }; /^-optCrts(.*)$/&& do { push(@HsC_rts_flags, $1); next arg; }; /^-optC(.*)$/ && do { push(@HsC_flags, $1); next arg; }; - /^-optp(.*)$/ && do { push(@HsP_flags, $1); next arg; }; /^-optcpp(.*)$/ && do { push(@Cpp_define, $1); $Only_preprocess_hc = ($1 eq "-E"); next arg; }; /^-optc(.*)$/ && do { push(@CcBoth_flags, $1); next arg; }; /^-opta(.*)$/ && do { push(@As_flags, $1); next arg; }; /^-optl(.*)$/ && do { push(@Ld_flags, $1); next arg; }; + /^-optdll(.*)$/ && do { push(@Dll_flags, $1); next arg; }; /^-optdep(.*)$/ && do { push(@MkDependHS_flags, $1); next arg; }; #---------- Haskell C pre-processor (hscpp) ---------------------------- @@ -2927,34 +3160,31 @@ arg: while($_ = $Args[0]) { /^-keep-hc-files?-too$/ && do { $Keep_hc_file_too = 1; next arg; }; /^-keep-s-files?-too$/ && do { $Keep_s_file_too = 1; next arg; }; - /^-fhaskell-1\.3$/ && do { next arg; }; # a no-op right now - /^-fignore-interface-pragmas$/ && do { push(@HsC_flags, $_); next arg; }; + /^-fignore-asserts$/ && do { push(@HsC_flags, $_); next arg; }; /^-fno-implicit-prelude$/ && do { $NoImplicitPrelude= 1; push(@HsC_flags, $_); next arg; }; - # don't do stack checking using page fault `trick'. - # (esoteric). - /^-fstack-check$/ && do { $StkChkByPageFaultOK = 0; next arg; }; + # # have the compiler proper generate concurrent code, # really only used when you want to configure your own - # special user compilation way. (Use -concurrent when - # compiling `Concurrent Haskell' programs). + # special user compilation way. # - # (ditto for -fgransim, fscc-profiling and -fticky-ticky) + # (ditto for -fgransim, fscc-profiling, -fparallel and -fticky-ticky) # - /^-fconcurrent$/ && do { push(@HsC_flags,$_); next arg; }; /^-fscc-profiling$/ && do { push(@HsC_flags,$_); next arg; }; /^-fticky-ticky$/ && do { push(@HsC_flags,$_); next arg; }; /^-fgransim$/ && do { push(@HsC_flags,$_); next arg; }; + /^-fparallel$/ && do { push(@HsC_flags,$_); next arg; }; + /^-fsmp$/ && do { push(@HsC_flags,$_); next arg; }; - /^-split-objs/ && do { + /^-split-objs$/ && do { if ( $TargetPlatform !~ /^(alpha|hppa1\.1|i386|m68k|mips|powerpc|rs6000|sparc)-/ ) { $SplitObjFiles = 0; print STDERR "WARNING: don't know how to split objects on this platform: $TargetPlatform\n`-split-objs' option ignored\n"; } else { $SplitObjFiles = 1; - $HscOut = '-C='; + $HscLang = 'C'; push(@HsC_flags, "-fglobalise-toplev-names"); push(@CcBoth_flags, '-DUSE_SPLIT_MARKERS'); @@ -2964,52 +3194,42 @@ arg: while($_ = $Args[0]) { } next arg; }; - /^-fallow-overlapping-instances$/ && do { push(@HsC_flags, $_); - next arg; }; + /^-unreg$/ && do { $UNREGing = 'u'; next arg; }; + /^-funregisterised$/ && do { push(@HsC_flags, $_); next arg; }; + /^-fno-asm-mangling$/ && do { $DoAsmMangling = 0; next arg; }; + + /^-fallow-overlapping-instances$/ && do { push(@HsC_flags, $_); next arg; }; + /^-fallow-undecidable-instances$/ && do { push(@HsC_flags, $_); next arg; }; + /^-fhistory-size.*$/ && do { push(@HsC_flags, $_); next arg; }; + /^-fdicts-strict$/ && do { push(@HsC_flags, $_); next arg; }; /^-fglasgow-exts$/ && do { push(@HsC_flags, $_); - push(@HsP_flags, '-N'); -# push(@HsC_flags, '-fshow-import-specs'); - - # -fglasgow-exts implies -syslib exts - &add_syslib('exts'); + # -fglasgow-exts implies -syslib lang + &add_syslib('lang'); next arg; }; - /^-fspeciali[sz]e-unboxed$/ - && do { $Oopt_DoSpecialise = '-fspecialise'; - $Oopt_SpecialiseUnboxed = '-fspecialise-unboxed'; - next arg; }; /^-fspeciali[sz]e$/ && do { $Oopt_DoSpecialise = '-fspecialise'; next arg; }; /^-fno-speciali[sz]e$/ && do { $Oopt_DoSpecialise = ''; next arg; }; + /^-fusagesp$/ + && do { $Oopt_UsageSPInf = '-fusagesp'; + push (@HsC_flags, '-fusagesp-on'); next arg; }; + + /^-fcompiling-prelude$/ && do { $CompilingPrelude=1; push(@HsC_flags, $_); next arg; }; # Now the foldr/build options, which are *on* by default (for -O). /^-ffoldr-build$/ && do { $Oopt_FoldrBuild = 1; - $Oopt_FB_Support = '-fdo-arity-expand'; #print "Yes F/B\n"; next arg; }; /^-fno-foldr-build$/ && do { $Oopt_FoldrBuild = 0; - $Oopt_FB_Support = ''; - next arg; }; - - /^-fno-foldr-build-rule$/ - && do { $Oopt_FoldrBuild = 0; - next arg; }; - - /^-fno-enable-tech$/ - && do { $Oopt_FB_Support = ''; - next arg; }; - - /^-fno-snapback-to-append$/ - && do { $Oopt_FoldrBuildInline .= ' -fdo-not-fold-back-append '; next arg; }; # --------------- Renamer ------------- @@ -3020,53 +3240,38 @@ arg: while($_ = $Args[0]) { # --------------- - /^-fasm-(.*)$/ && do { $HscOut = '-S='; next arg; }; # force using nativeGen - /^-fvia-[cC]$/ && do { $HscOut = '-C='; next arg; }; # force using C compiler + /^-fasm-(.*)$/ && do { $HscLang = 'asm'; next arg; }; # force using nativeGen + /^-fvia-[cC]$/ && do { $HscLang = 'C'; next arg; }; # force using C compiler # --------------- /^-funfolding-.*$/ && do { push(@HsC_flags, $_); next arg }; + /^-fliberate-case-.*$/ + && do { push(@HsC_flags, $_); next arg }; + /^-funfold-casms-in-hi-file$/ && do { push(@HsC_flags, $_); next arg }; /^(-fmax-simplifier-iterations)(.*)$/ && do { $Oopt_MaxSimplifierIterations = $1 . &grab_arg_arg(*Args,$1, $2); next arg; }; - /^(-fshow-simplifier-progress)/ - && do { $Oopt_ShowSimplifierProgress = $1; - next arg; }; /^-fno-pedantic-bottoms$/ && do { $Oopt_PedanticBottoms = ''; next arg; }; - /^-fdo-monad-eta-expansion$/ - && do { $Oopt_MonadEtaExpansion = $_; next arg; }; + /^-fno-pre-inlining$/ + && do { push(@HsC_flags, $_); next arg }; /^-fno-let-from-(case|app|strict-let)$/ # experimental, really (WDP 95/10) && do { push(@HsC_flags, $_); next arg; }; - /^(-freturn-in-regs-threshold)(.*)$/ - && do { local($what) = $1; - local($num) = &grab_arg_arg(*Args,$what, $2); - if ($num < 2 || $num > 8) { - die "Bad experimental flag: $_\n"; - } else { - $HscOut = '-C='; # force using C compiler - push(@HsC_flags, "$what$num"); - push(@CcRegd_flags, "-D__STG_REGS_AVAIL__=$num"); - } - next arg; }; + /^-funbox-strict-fields$/ + && do { push(@HsC_flags, $_); next arg; }; # --------------- Warnings etc. ------ - /^-fshow-import-specs/ - && do { push(@HsC_flags, $_); next arg; }; - - /^-fsignatures-required/ - && do { push(@HsC_flags, $_); next arg; }; - /^-fwarn-(.*)$/ && do { push(@HsC_flags, $_); next arg; }; /^-fno-(.*)$/ && do { push(@HsC_antiflags, "-f$1"); @@ -3107,6 +3312,9 @@ arg: while($_ = $Args[0]) { # -d(no-)core-lint is done this way so it is turn-off-able. /^-dcore-lint/ && do { $CoreLint = '-dcore-lint'; next arg; }; /^-dno-core-lint/ && do { $CoreLint = ''; next arg; }; + # Ditto for USP lint + /^-dusagesp-lint/ && do { $USPLint = '-dusagesp-lint'; next arg; }; + /^-dno-usagesp-lint/ && do { $USPLint = ''; next arg; }; # Ditto for STG lint /^-dstg-lint/ && do { $StgLint = '-dstg-lint'; next arg; }; /^-dno-stg-lint/ && do { $StgLint = ''; next arg; }; @@ -3143,7 +3351,7 @@ arg: while($_ = $Args[0]) { } elsif ($heap_size >= $Specific_heap_size) { $Specific_heap_size = $heap_size; } else { - print STDERR "$Pgm: ignoring heap-size-setting option ($_)...not the largest seen\n"; + print STDERR "$Pgm: ignoring heap-size-setting option ($_)...not the largest seen\n" if $Verbose; } next arg; }; @@ -3165,7 +3373,7 @@ arg: while($_ = $Args[0]) { } elsif ($stk_size >= $Specific_stk_size) { $Specific_stk_size = $stk_size; } else { - print STDERR "$Pgm: ignoring stack-size-setting option ($flag $stk_size)...not the largest seen\n"; + print STDERR "$Pgm: ignoring stack-size-setting option ($flag $stk_size)...not the largest seen\n" if $Verbose; } next arg; }; @@ -3193,7 +3401,8 @@ arg: while($_ = $Args[0]) { #---------- Linker (gcc, really) --------------------------------------- - /^-static$/ && do { push(@Ld_flags, $_); next arg; }; + /^-static$/ && do { $Static=1; push(@Ld_flags, $_); next arg; }; + /^-no-hs-main$/ && do { $NoHaskellMain=1; next arg; }; #---------- mixed cc and linker magic ---------------------------------- # this optimisation stuff is finally sorted out later on... @@ -3204,7 +3413,7 @@ arg: while($_ = $Args[0]) { local($opt_lev) = ( /^-O2$/ ) ? 2 : 1; # max 'em $OptLevel = ( $opt_lev > $OptLevel ) ? $opt_lev : $OptLevel; - $HscOut = '-C=' if $OptLevel == 2; # force use of C compiler + $HscLang = 'C'; # force use of C compiler next arg; }; /^-Onot$/ && do { $OptLevel = 0; next arg; }; # # set it to