X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FMain.hs;h=7a2ae0c67f85d253e69a4531dd0d922b345c7f39;hb=423d477bfecd490de1449c59325c8776f91d7aac;hp=535cbe41a530a233281ab662c79de2d1a2ef80be;hpb=98688c6e8fd33f31c51218cf93cbf03fe3a5e73d;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs
index 535cbe4..7a2ae0c 100644
--- a/ghc/compiler/main/Main.hs
+++ b/ghc/compiler/main/Main.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS -fno-warn-incomplete-patterns -optc-DNON_POSIX_SOURCE #-}
 
 -----------------------------------------------------------------------------
--- $Id: Main.hs,v 1.134 2003/10/09 11:58:57 simonpj Exp $
+-- $Id: Main.hs,v 1.138 2004/08/13 13:07:05 simonmar Exp $
 --
 -- GHC Driver program
 --
@@ -10,7 +10,7 @@
 -----------------------------------------------------------------------------
 
 -- with path so that ghc -M can find config.h
-#include "../includes/config.h"
+#include "../includes/ghcconfig.h"
 
 module Main (main) where
 
@@ -44,7 +44,7 @@ import DriverFlags	( buildStaticHscOpts,
 			  dynamic_flags, processArgs, static_flags)
 
 import DriverMkDepend	( beginMkDependHS, endMkDependHS )
-import DriverPhases	( isSourceFile )
+import DriverPhases	( isSourceFilename )
 
 import DriverUtil	( add, handle, handleDyn, later, unknownFlagsErr )
 import CmdLineOpts	( dynFlag, restoreDynFlags,
@@ -99,8 +99,7 @@ main =
 		-- an IO exception probably isn't our fault, so don't panic
 		IOException _ ->  hPutStrLn stderr (show exception)
 		AsyncException StackOverflow ->
-			hPutStrLn stderr "stack overflow: use +RTS -K<size> \ 
-					 \to increase it"
+			hPutStrLn stderr "stack overflow: use +RTS -K<size> to increase it"
 		_other ->  hPutStr stderr (show (Panic (show exception)))
 	   exitWith (ExitFailure 1)
          ) $ do
@@ -169,14 +168,10 @@ main =
    -- by module basis, using only the -fvia-C and -fasm flags.  If the global
    -- HscLang is not HscC or HscAsm, -fvia-C and -fasm have no effect.
    dyn_flags <- getDynFlags
-   build_tag <- readIORef v_Build_tag
    let lang = case mode of 
 		 DoInteractive  -> HscInterpreted
 		 DoEval _	-> HscInterpreted
-		 _other | build_tag /= "" -> HscC
-			| otherwise       -> hscLang dyn_flags
-		-- for ways other that the normal way, we must 
-		-- compile via C.
+		 _other		-> hscLang dyn_flags
 
    setDynFlags (dyn_flags{ stgToDo  = stg_todo,
                   	   hscLang  = lang,
@@ -212,7 +207,7 @@ main =
       Everything else is considered to be a linker object, and passed
       straight through to the linker.
     -}
-    looks_like_an_input m =  isSourceFile m 
+    looks_like_an_input m =  isSourceFilename m 
 			  || looksLikeModuleName m
 			  || '.' `notElem` m
 
@@ -222,7 +217,9 @@ main =
     normal_fileish_paths = map normalisePath fileish_args
     (srcs, objs)         = partition looks_like_an_input normal_fileish_paths
 
-   mapM_ (add v_Ld_inputs) objs
+    -- Note: have v_Ld_inputs maintain the order in which 'objs' occurred on 
+    --       the command-line.
+   mapM_ (add v_Ld_inputs) (reverse objs)
 
 	---------------- Display banners and configuration -----------
    showBanners mode conf_file static_opts