X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FDynFlags.hs;h=1721b4c0b36a8198f8fe5d4eb4d59f991c1db48b;hp=be14a5bdee9e777a31ab1e3e8d8603259f05f9ad;hb=2ebe8addfaae2bc65e6b87ad369928b02053014f;hpb=0f7d268d00795a58a06ae3c92ebbd14571295b84

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index be14a5b..1721b4c 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -323,7 +323,6 @@ data DynFlags = DynFlags {
   opt_m			:: [String],
   opt_a			:: [String],
   opt_l			:: [String],
-  opt_dll		:: [String],
   opt_dep		:: [String],
 
   -- commands for particular phases
@@ -471,13 +470,14 @@ defaultDynFlags =
         hpcDir		        = ".hpc",
 
 	opt_L			= [],
-	opt_P			= [],
+	opt_P			= (if opt_PIC
+				   then ["-D__PIC__"]
+				   else []),
 	opt_F			= [],
 	opt_c			= [],
 	opt_a			= [],
 	opt_m			= [],
 	opt_l			= [],
-	opt_dll			= [],
 	opt_dep			= [],
 	
 	extraPkgConfs		= [],
@@ -569,7 +569,6 @@ addOptc   f d = d{ opt_c   = f : opt_c d}
 addOptm   f d = d{ opt_m   = f : opt_m d}
 addOpta   f d = d{ opt_a   = f : opt_a d}
 addOptl   f d = d{ opt_l   = f : opt_l d}
-addOptdll f d = d{ opt_dll = f : opt_dll d}
 addOptdep f d = d{ opt_dep = f : opt_dep d}
 
 addCmdlineFramework f d = d{ cmdlineFrameworks = f : cmdlineFrameworks d}
@@ -919,7 +918,6 @@ dynamic_flags = [
   ,  ( "optm"		, HasArg (upd . addOptm) )  
   ,  ( "opta"		, HasArg (upd . addOpta) )  
   ,  ( "optl"		, HasArg (upd . addOptl) )  
-  ,  ( "optdll"		, HasArg (upd . addOptdll) )  
   ,  ( "optdep"		, HasArg (upd . addOptdep) )
 
   ,  ( "split-objs"	, NoArg (if can_split
@@ -933,8 +931,7 @@ dynamic_flags = [
 
 	------- Libraries ---------------------------------------------------
   ,  ( "L"		, Prefix addLibraryPath )
-  ,  ( "l"		, AnySuffix (\s -> do upd (addOptl s)
-					      upd (addOptdll s)))
+  ,  ( "l"		, AnySuffix (\s -> do upd (addOptl s)))
 
 	------- Frameworks --------------------------------------------------
         -- -framework-path should really be -F ...
@@ -1518,6 +1515,18 @@ setOptHpcDir arg  = upd $ \ d -> d{hpcDir = arg}
 -----------------------------------------------------------------------------
 -- Via-C compilation stuff
 
+-- There are some options that we need to pass to gcc when compiling
+-- Haskell code via C, but are only supported by recent versions of
+-- gcc.  The configure script decides which of these options we need,
+-- and puts them in the file "extra-gcc-opts" in $topdir, which is
+-- read before each via-C compilation.  The advantage of having these
+-- in a separate file is that the file can be created at install-time
+-- depending on the available gcc version, and even re-generated  later
+-- if gcc is upgraded.
+--
+-- The options below are not dependent on the version of gcc, only the
+-- platform.
+
 machdepCCOpts :: DynFlags -> ([String], -- flags for all C compilations
 			      [String]) -- for registerised HC compilations
 machdepCCOpts dflags
@@ -1560,20 +1569,6 @@ machdepCCOpts dflags
 --                    , if "mingw32" `isSuffixOf` cTARGETPLATFORM then "-mno-cygwin" else "" 
 		      ],
 		      [ "-fno-defer-pop",
-#ifdef HAVE_GCC_MNO_OMIT_LFPTR
-			-- Some gccs are configured with
-			-- -momit-leaf-frame-pointer on by default, and it
-			-- apparently takes precedence over 
-			-- -fomit-frame-pointer, so we disable it first here.
-			"-mno-omit-leaf-frame-pointer",
-#endif
-#ifdef HAVE_GCC_HAS_NO_UNIT_AT_A_TIME
-		 	"-fno-unit-at-a-time",
-			-- unit-at-a-time doesn't do us any good, and screws
-			-- up -split-objs by moving the split markers around.
-			-- It's only turned on with -O2, but put it here just
-			-- in case someone uses -optc-O2.
-#endif
 			"-fomit-frame-pointer",
 			-- we want -fno-builtin, because when gcc inlines
 			-- built-in functions like memcpy() it tends to
@@ -1592,13 +1587,6 @@ machdepCCOpts dflags
 			-- and get in the way of -split-objs.  Another option
 			-- would be to throw them away in the mangler, but this
 			-- is easier.
-#ifdef HAVE_GCC_HAS_NO_UNIT_AT_A_TIME
-		 "-fno-unit-at-a-time",
-			-- unit-at-a-time doesn't do us any good, and screws
-			-- up -split-objs by moving the split markers around.
-			-- It's only turned on with -O2, but put it here just
-			-- in case someone uses -optc-O2.
-#endif
 		 "-fno-builtin"
 			-- calling builtins like strlen() using the FFI can
 			-- cause gcc to run out of regs, so use the external
@@ -1633,15 +1621,18 @@ picCCOpts dflags
       --     in dynamic libraries.
 
     | opt_PIC
-        = ["-fno-common"]
+        = ["-fno-common", "-D__PIC__"]
     | otherwise
         = ["-mdynamic-no-pic"]
 #elif mingw32_TARGET_OS
       -- no -fPIC for Windows
+    | opt_PIC
+        = ["-D__PIC__"]
+    | otherwise
         = []
 #else
     | opt_PIC
-        = ["-fPIC"]
+        = ["-fPIC", "-D__PIC__"]
     | otherwise
         = []
 #endif