X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FSysTools.lhs;h=9c7ddce1e1cbe2d658b298f7388d15edac55aa15;hb=5ee05a2b6c422f9fb4bcec184de9fdb49b82e43f;hp=066ae673ffe77c49fa2c3b6d5124de3904e8d794;hpb=910b485a6769cdd310542e9b3cdc2e5365d6f659;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/SysTools.lhs b/ghc/compiler/main/SysTools.lhs
index 066ae67..9c7ddce 100644
--- a/ghc/compiler/main/SysTools.lhs
+++ b/ghc/compiler/main/SysTools.lhs
@@ -10,7 +10,19 @@
 module SysTools (
 	-- Initialisation
 	initSysTools,
-	setPgm,			-- String -> IO ()
+
+	setPgmL,		-- String -> IO ()
+	setPgmP,
+	setPgmF,
+	setPgmc,
+	setPgmm,
+	setPgms,
+	setPgma,
+	setPgml,
+#ifdef ILX
+	setPgmI,
+	setPgmi,
+#endif
 				-- Command-line override
 	setDryRun,
 
@@ -50,68 +62,58 @@ module SysTools (
 
  ) where
 
+#include "HsVersions.h"
+
 import DriverUtil
 import Config
 import Outputable
 import Panic		( progName, GhcException(..) )
-import Util		( global, dropList )
+import Util		( global, notNull )
 import CmdLineOpts	( dynFlag, verbosity )
 
-import Exception	( throwDyn )
-#if __GLASGOW_HASKELL__ > 408
-import qualified Exception ( catch )
-#else
-import Exception        ( catchAllIO )
-#endif
-import IO
-import Directory	( doesFileExist, removeFile )
-import IOExts		( IORef, readIORef, writeIORef )
+import EXCEPTION	( throwDyn )
+import DATA_IOREF	( IORef, readIORef, writeIORef )
+import DATA_INT
+    
 import Monad		( when, unless )
 import System		( ExitCode(..), exitWith, getEnv, system )
-import CString
-import Int
-import Addr
-    
+import IO		( try, catch,
+			  openFile, hPutChar, hPutStrLn, hPutStr, hClose, hFlush, IOMode(..),
+			  stderr )
+import Directory	( doesFileExist, removeFile )
+
 #include "../includes/config.h"
 
-#ifndef mingw32_TARGET_OS
-import qualified Posix
+-- GHC <= 4.08 didn't have rawSystem, and runs into problems with long command
+-- lines on mingw32, so we disallow it now.
+#if defined(mingw32_HOST_OS) && (__GLASGOW_HASKELL__ <= 408)
+#error GHC <= 4.08 is not supported for bootstrapping GHC on i386-unknown-mingw32
+#endif
+
+#ifndef mingw32_HOST_OS
+#if __GLASGOW_HASKELL__ > 504
+import qualified GHC.Posix
 #else
+import qualified Posix
+#endif
+#else /* Must be Win32 */
 import List		( isPrefixOf )
-import MarshalArray
+import Util		( dropList )
+import Foreign
+import CString		( CString, peekCString )
 #endif
 
--- This is a kludge for bootstrapping with 4.08.X.  Given that
--- all distributed compilers >= 5.0 will be compiled with themselves.
--- I don't think this kludge is a problem.  And we have to start
--- building with >= 5.0 on Win32 anyway.
-#if __GLASGOW_HASKELL__ > 408
--- use the line below when we can be sure of compiling with GHC >=
--- 5.02, and remove the implementation of rawSystem at the end of this
--- file
-# if __GLASGOW_HASKELL__ >= 503
-import GHC.IOBase
-# else
-import PrelIOBase -- this can be removed when SystemExts is used
-# endif
-# ifdef mingw32_TARGET_OS
-import SystemExts       ( rawSystem )
-# endif
+#ifdef mingw32_HOST_OS
+#if __GLASGOW_HASKELL__ > 504
+import System.Cmd       ( rawSystem )
 #else
-import CError           ( throwErrnoIfMinus1 ) -- as can this
-import System		( system )
+import SystemExts       ( rawSystem )
 #endif
 
+#else /* Not Win32 */
 
-#include "HsVersions.h"
-
--- Make catch work on older GHCs
-#if __GLASGOW_HASKELL__ > 408
-myCatch = Exception.catch
-#else
-myCatch = catchAllIO
+import System		( system )
 #endif
-
 \end{code}
 
 
@@ -270,7 +272,7 @@ initSysTools minusB_args
 		| am_installed = installed_bin cGHC_MANGLER_PGM
 		| otherwise    = inplace cGHC_MANGLER_DIR_REL cGHC_MANGLER_PGM
 
-#ifndef mingw32_TARGET_OS
+#ifndef mingw32_HOST_OS
 	-- check whether TMPDIR is set in the environment
 	; IO.try (do dir <- getEnv "TMPDIR" -- fails if not set
 	      	     setTmpDir dir
@@ -288,11 +290,11 @@ initSysTools minusB_args
 		tdir <-
 		  if ret == 0 then do
 		      -- failed, consult TEMP.
- 	             destructArray len buf
+ 	             free buf
 		     getEnv "TMP"
 		   else do
 		     s <- peekCString buf
-		     destructArray len buf
+		     free buf
 		     return s
 		let
 	  	  -- strip the trailing backslash (awful, but 
@@ -312,7 +314,7 @@ initSysTools minusB_args
 	     throwDyn (InstallationError 
 		         ("Can't find package.conf as " ++ pkgconfig_path))
 
-#if defined(mingw32_TARGET_OS)
+#if defined(mingw32_HOST_OS)
 	--		WINDOWS-SPECIFIC STUFF
 	-- On Windows, gcc and friends are distributed with GHC,
 	-- 	so when "installed" we look in TopDir/bin
@@ -349,7 +351,11 @@ initSysTools minusB_args
 	; let split_path  = perl_path ++ " \"" ++ split_script ++ "\""
 	      mangle_path = perl_path ++ " \"" ++ mangle_script ++ "\""
 
-	; let mkdll_path = cMKDLL
+	; let mkdll_path 
+	        | am_installed = pgmPath (installed "gcc-lib/") cMKDLL ++
+				 " --dlltool-name " ++ pgmPath (installed "gcc-lib/") "dlltool" ++
+				 " --driver-name " ++ gcc_path
+		| otherwise    = cMKDLL
 #else
 	--		UNIX-SPECIFIC STUFF
 	-- On Unix, the "standard" tools are assumed to be
@@ -411,32 +417,31 @@ initSysTools minusB_args
 	; return ()
 	}
 
-#if defined(mingw32_TARGET_OS)
-foreign import stdcall "GetTempPathA" unsafe getTempPath :: Int -> CString -> IO Int32
+#if defined(mingw32_HOST_OS)
+foreign import stdcall unsafe "GetTempPathA" getTempPath :: Int -> CString -> IO Int32
 #endif
 \end{code}
 
-setPgm is called when a command-line option like
+The various setPgm functions are called when a command-line option
+like
+
 	-pgmLld
+
 is used to override a particular program with a new one
 
 \begin{code}
-setPgm :: String -> IO ()
--- The string is the flag, minus the '-pgm' prefix
--- So the first character says which program to override
-
-setPgm ('P' : pgm) = writeIORef v_Pgm_P pgm
-setPgm ('F' : pgm) = writeIORef v_Pgm_F pgm
-setPgm ('c' : pgm) = writeIORef v_Pgm_c pgm
-setPgm ('m' : pgm) = writeIORef v_Pgm_m pgm
-setPgm ('s' : pgm) = writeIORef v_Pgm_s pgm
-setPgm ('a' : pgm) = writeIORef v_Pgm_a pgm
-setPgm ('l' : pgm) = writeIORef v_Pgm_l pgm
+setPgmL = writeIORef v_Pgm_L
+setPgmP = writeIORef v_Pgm_P
+setPgmF = writeIORef v_Pgm_F
+setPgmc = writeIORef v_Pgm_c
+setPgmm = writeIORef v_Pgm_m
+setPgms = writeIORef v_Pgm_s
+setPgma = writeIORef v_Pgm_a
+setPgml = writeIORef v_Pgm_l
 #ifdef ILX
-setPgm ('I' : pgm) = writeIORef v_Pgm_I pgm
-setPgm ('i' : pgm) = writeIORef v_Pgm_i pgm
+setPgmI = writeIORef v_Pgm_I
+setPgmi = writeIORef v_Pgm_i
 #endif
-setPgm pgm	   = unknownFlagErr ("-pgm" ++ pgm)
 \end{code}
 
 
@@ -474,7 +479,7 @@ findTopDir minusbs
        }
   where
     -- get_proto returns a Unix-format path (relying on getExecDir to do so too)
-    get_proto | not (null minusbs)
+    get_proto | notNull minusbs
 	      = return (unDosifyPath (drop 2 (last minusbs)))	-- 2 for "-B"
 	      | otherwise	   
 	      = do { maybe_exec_dir <- getExecDir -- Get directory of executable
@@ -512,13 +517,6 @@ showOptions ls = unwords (map (quote.showOpt) ls)
    showOpt (FileOption pre f) = pre ++ dosifyPath f
    showOpt (Option s)     = s
 
-#if defined(mingw32_TARGET_OS)
-   quote "" = ""
-   quote s  = "\"" ++ s ++ "\""
-#else
-   quote = id
-#endif
-
 \end{code}
 
 
@@ -669,7 +667,7 @@ removeTmpFiles verb fs
 	     ("Deleting: " ++ unwords fs)
 	     (mapM_ rm fs)
   where
-    rm f = removeFile f `myCatch` 
+    rm f = removeFile f `IO.catch` 
 		(\_ignored -> 
 		    when (verb >= 2) $
 		      hPutStrLn stderr ("Warning: deleting non-existent " ++ f)
@@ -703,7 +701,7 @@ runSomething :: String		-- For -v message
 runSomething phase_name pgm args
  = traceCmd phase_name cmd_line $
    do   {
-#ifndef mingw32_TARGET_OS
+#ifndef mingw32_HOST_OS
 	  exit_code <- system cmd_line
 #else
           exit_code <- rawSystem cmd_line
@@ -713,14 +711,9 @@ runSomething phase_name pgm args
   	  else return ()
 	}
   where
-    cmd_line = pgm ++ ' ':showOptions args -- unwords (pgm : dosifyPaths (map quote args))
 	-- The pgm is already in native format (appropriate dir separators)
-#if defined(mingw32_TARGET_OS)
-    quote "" = ""
-    quote s  = "\"" ++ s ++ "\""
-#else
-    quote = id
-#endif
+    cmd_line = pgm ++ ' ':showOptions args 
+                -- unwords (pgm : dosifyPaths (map quote args))
 
 traceCmd :: String -> String -> IO () -> IO ()
 -- a) trace the command (at two levels of verbosity)
@@ -736,7 +729,7 @@ traceCmd phase_name cmd_line action
 	; unless n $ do {
 
 	   -- And run it!
-	; action `myCatch` handle_exn verb
+	; action `IO.catch` handle_exn verb
 	}}
   where
     handle_exn verb exn = do { when (verb >= 2) (hPutStr   stderr "\n")
@@ -779,7 +772,7 @@ pgmPath :: String		-- Directory string in Unix format
 
 
 
-#if defined(mingw32_TARGET_OS)
+#if defined(mingw32_HOST_OS)
 
 --------------------- Windows version ------------------
 dosifyPaths xs = map dosifyPath xs
@@ -839,41 +832,39 @@ slash s1 s2 = s1 ++ ('/' : s2)
 -----------------------------------------------------------------------------
 -- Define	getExecDir     :: IO (Maybe String)
 
-#if defined(mingw32_TARGET_OS)
+#if defined(mingw32_HOST_OS)
 getExecDir :: IO (Maybe String)
 getExecDir = do let len = (2048::Int) -- plenty, PATH_MAX is 512 under Win32.
 		buf <- mallocArray len
-		ret <- getModuleFileName nullAddr buf len
-		if ret == 0 then destructArray len buf >> return Nothing
+		ret <- getModuleFileName nullPtr buf len
+		if ret == 0 then free buf >> return Nothing
 		            else do s <- peekCString buf
-				    destructArray len buf
+				    free buf
 				    return (Just (reverse (dropList "/bin/ghc.exe" (reverse (unDosifyPath s)))))
 
 
-foreign import stdcall "GetModuleFileNameA" unsafe getModuleFileName :: Addr -> CString -> Int -> IO Int32
+foreign import stdcall unsafe "GetModuleFileNameA"
+  getModuleFileName :: Ptr () -> CString -> Int -> IO Int32
 #else
 getExecDir :: IO (Maybe String) = do return Nothing
 #endif
 
-#ifdef mingw32_TARGET_OS
-foreign import "_getpid" unsafe getProcessID :: IO Int -- relies on Int == Int32 on Windows
+#ifdef mingw32_HOST_OS
+foreign import ccall unsafe "_getpid" getProcessID :: IO Int -- relies on Int == Int32 on Windows
+#elif __GLASGOW_HASKELL__ > 504
+getProcessID :: IO Int
+getProcessID = GHC.Posix.c_getpid >>= return . fromIntegral
 #else
 getProcessID :: IO Int
 getProcessID = Posix.getProcessID
 #endif
 
-#if defined(mingw32_TARGET_OS) && (__GLASGOW_HASKELL__ <= 408)
-rawSystem :: String -> IO ExitCode
-rawSystem "" = ioException (IOError Nothing InvalidArgument "rawSystem" "null command" Nothing)
-rawSystem cmd =
-  withCString cmd $ \s -> do
-    status <- throwErrnoIfMinus1 "rawSystem" (primRawSystem s)
-    case status of
-        0  -> return ExitSuccess
-        n  -> return (ExitFailure n)
-
-foreign import ccall "rawSystemCmd" unsafe primRawSystem :: CString -> IO Int
+quote :: String -> String
+#if defined(mingw32_HOST_OS)
+quote "" = ""
+quote s  = "\"" ++ s ++ "\""
+#else
+quote s = s
 #endif
 
-
 \end{code}