[MLton-commit] r7020

[Ville Laurikari]

Changed "-debug true" to pass just "-g" to gcc by default.  The old
default of "-gstabs+" does not work on HP-UX, and on large programs
gives zillions of warnings like this at least on Linux and Windows:

  /tmp/fileZtnL5W.0.s:73800: Warning: .stabn: description field '12048' too big, try a different debug format

Added a new option "-debug-format" to choose the debug symbol format
to use, so use "-debug-format stabs+" to get the old behavior if you
need it.

----------------------------------------------------------------------

U   mlton/trunk/mlton/main/main.fun

----------------------------------------------------------------------

Modified: mlton/trunk/mlton/main/main.fun
===================================================================
--- mlton/trunk/mlton/main/main.fun	2009-03-06 08:42:36 UTC (rev 7019)
+++ mlton/trunk/mlton/main/main.fun	2009-03-06 09:14:40 UTC (rev 7020)
@@ -1,4 +1,4 @@
-(* Copyright (C) 1999-2008 Henry Cejtin, Matthew Fluet, Suresh
+(* Copyright (C) 1999-2009 Henry Cejtin, Matthew Fluet, Suresh
  *    Jagannathan, and Stephen Weeks.
  * Copyright (C) 1997-2000 NEC Research Institute.
  *
@@ -60,6 +60,8 @@
 
 val buildConstants: bool ref = ref false
 val debugRuntime: bool ref = ref false
+datatype debugFormat = Dwarf | DwarfPlus | Dwarf2 | Stabs | StabsPlus
+val debugFormat: debugFormat option ref = ref NONE
 val expert: bool ref = ref false
 val explicitAlign: Control.align option ref = ref NONE
 val explicitChunk: Control.chunk option ref = ref NONE
@@ -297,6 +299,18 @@
                        ; debugRuntime := b))),
        (Expert, "debug-runtime", " {false|true}", "produce executable with debug info",
         boolRef debugRuntime),
+       (Expert, "debug-format", " {default|dwarf|dwarf+|drwaf2|stabs|stabs+}",
+        "choose debug symbol format",
+        SpaceString (fn s =>
+                        debugFormat :=
+                        (case s of
+                            "default" => NONE
+                          | "dwarf" => SOME Dwarf
+                          | "dwarf+" => SOME DwarfPlus
+                          | "dwarf2" => SOME Dwarf2
+                          | "stabs" => SOME Stabs
+                          | "stabs+" => SOME StabsPlus
+                          | _ => usage (concat ["invalid -debug-format flag: ", s])))),
        let
           val flag = "default-ann"
        in
@@ -1185,20 +1199,18 @@
                         atMLtons :=
                         Vector.fromList
                         (maybeOut "" :: tokenize (rev ("--" :: (!runtimeArgs))))
-                     datatype debugFormat =
-                        Dwarf | DwarfPlus | Dwarf2 | Stabs | StabsPlus
                      (* The -Wa,--gstabs says to pass the --gstabs option to the
                       * assembler. This tells the assembler to generate stabs
                       * debugging information for each assembler line.
                       *)
-                     val debugFormat = StabsPlus
                      val (gccDebug, asDebug) =
-                        case debugFormat of
-                           Dwarf => (["-gdwarf", "-g2"], "-Wa,--gdwarf2")
-                         | DwarfPlus => (["-gdwarf+", "-g2"], "-Wa,--gdwarf2")
-                         | Dwarf2 => (["-gdwarf-2", "-g2"], "-Wa,--gdwarf2")
-                         | Stabs => (["-gstabs", "-g2"], "-Wa,--gstabs")
-                         | StabsPlus => (["-gstabs+", "-g2"], "-Wa,--gstabs")
+                        case !debugFormat of
+                           NONE => (["-g"], "-Wa,-g")
+                         | SOME Dwarf => (["-gdwarf", "-g2"], "-Wa,--gdwarf2")
+                         | SOME DwarfPlus => (["-gdwarf+", "-g2"], "-Wa,--gdwarf2")
+                         | SOME Dwarf2 => (["-gdwarf-2", "-g2"], "-Wa,--gdwarf2")
+                         | SOME Stabs => (["-gstabs", "-g2"], "-Wa,--gstabs")
+                         | SOME StabsPlus => (["-gstabs+", "-g2"], "-Wa,--gstabs")
                      fun compileO (inputs: File.t list): unit =
                         let
                            val output =