X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FSysTools.lhs;h=5ca276583524d65a2292b78dda5ad9bc15b43191;hb=3a47678a35200aa4e225699428823f050b488f27;hp=a108c9e1063f7ef7f4596c91eab64abf90763b50;hpb=d254a44b8392ff0a4327f1916ef921887ce78769;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/SysTools.lhs b/ghc/compiler/main/SysTools.lhs
index a108c9e..5ca2765 100644
--- a/ghc/compiler/main/SysTools.lhs
+++ b/ghc/compiler/main/SysTools.lhs
@@ -11,7 +11,8 @@ module SysTools (
 	-- Initialisation
 	initSysTools,
 
-	setPgmP,		-- String -> IO ()
+	setPgmL,		-- String -> IO ()
+	setPgmP,
 	setPgmF,
 	setPgmc,
 	setPgmm,
@@ -61,60 +62,63 @@ module SysTools (
 
  ) where
 
+#include "HsVersions.h"
+
 import DriverUtil
 import Config
 import Outputable
 import Panic		( progName, GhcException(..) )
-import Util		( global, dropList, notNull )
+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 )
+import List             ( intersperse )
+
 #include "../includes/config.h"
 
+-- 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
-import qualified Posix
+#if __GLASGOW_HASKELL__ > 504
+import qualified System.Posix.Internals
+import System.Posix.Process ( executeFile, getProcessStatus, forkProcess, ProcessStatus(..))
+import System.Posix.Signals ( installHandler, sigCHLD, sigCONT, Handler(..) )
 #else
+import qualified Posix
+import Posix ( executeFile, getProcessStatus, forkProcess, ProcessStatus(..), installHandler,
+               sigCHLD, sigCONT, Handler(..) )
+#endif
+#else /* Must be Win32 */
 import List		( isPrefixOf )
-import MarshalArray
+import Util		( dropList )
 import Foreign
+import CString		( CString, peekCString )
 #endif
 
-#if __GLASGOW_HASKELL__ > 408
-# if __GLASGOW_HASKELL__ >= 503
-import GHC.IOBase
-# else
-# endif
-# ifdef mingw32_HOST_OS
-import SystemExts       ( rawSystem )
-# endif
+#ifdef mingw32_HOST_OS
+#if __GLASGOW_HASKELL__ > 504
+import System.Cmd       ( rawSystem )
 #else
-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}
 
 
@@ -191,7 +195,7 @@ All these pathnames are maintained IN THE NATIVE FORMAT OF THE HOST MACHINE.
 
 \begin{code}
 GLOBAL_VAR(v_Pgm_L,   	error "pgm_L",   String)	-- unlit
-GLOBAL_VAR(v_Pgm_P,   	error "pgm_P",   String)	-- cpp
+GLOBAL_VAR(v_Pgm_P,   	error "pgm_P",   (String,[Option]))	-- cpp
 GLOBAL_VAR(v_Pgm_F,   	error "pgm_F",   String)	-- pp
 GLOBAL_VAR(v_Pgm_c,   	error "pgm_c",   String)	-- gcc
 GLOBAL_VAR(v_Pgm_m,   	error "pgm_m",   String)	-- asm code mangler
@@ -352,7 +356,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
@@ -371,7 +379,9 @@ initSysTools minusB_args
 #endif
 
 	-- cpp is derived from gcc on all platforms
-        ; let cpp_path  = gcc_path ++ " -E " ++ cRAWCPP_FLAGS
+        -- HACK, see setPgmP below. We keep 'words' here to remember to fix
+        -- Config.hs one day.
+        ; let cpp_path  = (gcc_path, (Option "-E"):(map Option (words cRAWCPP_FLAGS)))
 
 	-- For all systems, copy and remove are provided by the host
 	-- system; architecture-specific stuff is done when building Config.hs
@@ -427,7 +437,10 @@ like
 is used to override a particular program with a new one
 
 \begin{code}
-setPgmP = writeIORef v_Pgm_P
+setPgmL = writeIORef v_Pgm_L
+-- XXX HACK: Prelude> words "'does not' work" ===> ["'does","not'","work"]
+-- Config.hs should really use Option.
+setPgmP arg = let (pgm:args) = words arg in writeIORef v_Pgm_P (pgm,map Option args)
 setPgmF = writeIORef v_Pgm_F
 setPgmc = writeIORef v_Pgm_c
 setPgmm = writeIORef v_Pgm_m
@@ -509,9 +522,10 @@ data Option
  
 showOptions :: [Option] -> String
 showOptions ls = unwords (map (quote.showOpt) ls)
- where
-   showOpt (FileOption pre f) = pre ++ dosifyPath f
-   showOpt (Option s)     = s
+
+showOpt (FileOption pre f) = pre ++ dosifyPath f
+showOpt (Option "") = ""
+showOpt (Option s)  = s
 
 \end{code}
 
@@ -529,8 +543,8 @@ runUnlit args = do p <- readIORef v_Pgm_L
 		   runSomething "Literate pre-processor" p args
 
 runCpp :: [Option] -> IO ()
-runCpp args =   do p <- readIORef v_Pgm_P
-		   runSomething "C pre-processor" p args
+runCpp args =   do (p,baseArgs) <- readIORef v_Pgm_P
+		   runSomething "C pre-processor" p (baseArgs ++ args)
 
 runPp :: [Option] -> IO ()
 runPp args =   do p <- readIORef v_Pgm_F
@@ -663,7 +677,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)
@@ -695,21 +709,33 @@ runSomething :: String		-- For -v message
 	     -> IO ()
 
 runSomething phase_name pgm args
- = traceCmd phase_name cmd_line $
-   do   {
+ = traceCmd phase_name (concat (intersperse " " (pgm:quoteargs))) $
+   do
 #ifndef mingw32_HOST_OS
-	  exit_code <- system cmd_line
+          installHandler sigCHLD Ignore Nothing
+          -- avoid strange interaction with waitpid():
+          installHandler sigCONT Ignore Nothing
+          mpid <- forkProcess
+          exit_code <- case mpid of
+            Nothing -> do -- Child
+	      executeFile pgm True quoteargs Nothing
+              exitWith (ExitFailure 127)
+	      -- NOT REACHED
+              return ExitSuccess
+            Just child -> do -- Parent
+              Just (Exited res) <- getProcessStatus True True child
+              return res
 #else
           exit_code <- rawSystem cmd_line
 #endif
-	; if exit_code /= ExitSuccess
-	  then throwDyn (PhaseFailed phase_name exit_code)
-  	  else return ()
-	}
+	  when (exit_code /= ExitSuccess)
+	    $ throwDyn (PhaseFailed phase_name exit_code)
+          return ()	
   where
 	-- The pgm is already in native format (appropriate dir separators)
-    cmd_line = pgm ++ ' ':showOptions args 
+    cmd_line = pgm ++ ' ':showOptions args
                 -- unwords (pgm : dosifyPaths (map quote args))
+    quoteargs = filter (not.null) (map showOpt args)
 
 traceCmd :: String -> String -> IO () -> IO ()
 -- a) trace the command (at two levels of verbosity)
@@ -725,11 +751,11 @@ 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")
-			     ; when (verb >= 3) (hPutStrLn stderr ("Failed: " ++ cmd_line))
+			     ; when (verb >= 3) (hPutStrLn stderr ("Failed: " ++ cmd_line ++ (show exn)))
 	          	     ; throwDyn (PhaseFailed phase_name (ExitFailure 1)) }
 \end{code}
 
@@ -832,41 +858,31 @@ slash s1 s2 = s1 ++ ('/' : s2)
 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
+		ret <- getModuleFileName nullPtr buf len
 		if ret == 0 then free buf >> return Nothing
 		            else do s <- peekCString 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 "GetModuleFileNameA" unsafe
+  getModuleFileName :: Ptr () -> CString -> Int -> IO Int32
 #else
 getExecDir :: IO (Maybe String) = do return Nothing
 #endif
 
 #ifdef mingw32_HOST_OS
-foreign import "_getpid" unsafe getProcessID :: IO Int -- relies on Int == Int32 on Windows
+foreign import ccall "_getpid" unsafe getProcessID :: IO Int -- relies on Int == Int32 on Windows
+#elif __GLASGOW_HASKELL__ > 504
+getProcessID :: IO Int
+getProcessID = System.Posix.Internals.c_getpid >>= return . fromIntegral
 #else
 getProcessID :: IO Int
 getProcessID = Posix.getProcessID
 #endif
 
-#if defined(mingw32_HOST_OS) && (__GLASGOW_HASKELL__ <= 408)
-rawSystem :: String -> IO ExitCode
-rawSystem cmd = system cmd
- -- mingw only: if you try to build a stage2 compiler with a stage1
- -- that has been bootstrapped with 4.08 (or earlier), this will run
- -- into problems with limits on command-line lengths with the std.
- -- Win32 command interpreters. So don't this - use 5.00 or later
- -- to compile up the GHC sources.
-#endif
-
 quote :: String -> String
-#if defined(mingw32_HOST_OS)
 quote "" = ""
 quote s  = "\"" ++ s ++ "\""
-#else
-quote s = s
-#endif
 
 \end{code}