diff options
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 10 | ||||
| -rwxr-xr-x | nt/configure.bat | 18 | ||||
| -rw-r--r-- | nt/gmake.defs | 4 |
3 files changed, 29 insertions, 3 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 4e51ec03bca..84fe115ce50 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,13 @@ +2008-06-23 Juanma Barranquero <lekktu@gmail.com> + Eli Zaretskii <eliz@gnu.org> + + * gmake.defs (DEBUG_FLAG, DEBUG_LINK) [!NODEBUG]: + Don't hardcode -gstabs+, use DEBUG_INFO. + + * configure.bat (gccdebug): Check for DWARF-2 support in GCC. + Default to stabs if the compiler does not support DWARF-2. + (genmakefiles): Write new variable DEBUG_INFO to config.settings. + 2008-05-14 Jason Rumney <jasonr@gnu.org> * configure.bat: Remove code dealing with --disable-font-backend. diff --git a/nt/configure.bat b/nt/configure.bat index 957ed14b949..3dd9a7fcc24 100755 --- a/nt/configure.bat +++ b/nt/configure.bat @@ -319,11 +319,26 @@ echo The failed program was: >>config.log type junk.c >>config.log
set mf=-mcpu=i686
rm -f junk.c junk.o
-goto compilercheckdone
+goto gccdebug
:gccMtuneOk
echo GCC supports -mtune=pentium4 >>config.log
set mf=-mtune=pentium4
rm -f junk.c junk.o
+:gccdebug
+rem Check for DWARF-2 debug info support, else default to stabs
+echo main(){} >junk.c
+echo gcc -c -gdwarf-2 -g3 junk.c >>config.log
+gcc -c -gdwarf-2 -g3 junk.c >>config.log 2>&1
+if not errorlevel 1 goto gccdwarf
+echo The failed program was: >>config.log
+type junk.c >>config.log
+set dbginfo=-gstabs+
+rm -f junk.c junk.o
+goto compilercheckdone
+:gccdwarf
+echo GCC supports DWARF-2 >>config.log
+set dbginfo=-gdwarf-2 -g3
+rm -f junk.c junk.o
goto compilercheckdone
:clOk
@@ -474,6 +489,7 @@ rem echo # Start of settings from configure.bat >config.settings
echo COMPILER=%COMPILER%>>config.settings
if not "(%mf%)" == "()" echo MCPU_FLAG=%mf%>>config.settings
+if not "(%dbginfo%)" == "()" echo DEBUG_INFO=%dbginfo%>>config.settings
if (%nodebug%) == (Y) echo NODEBUG=1 >>config.settings
if (%noopt%) == (Y) echo NOOPT=1 >>config.settings
if (%nocygwin%) == (Y) echo NOCYGWIN=1 >>config.settings
diff --git a/nt/gmake.defs b/nt/gmake.defs index 00ae686c3fa..7afbf099622 100644 --- a/nt/gmake.defs +++ b/nt/gmake.defs @@ -262,8 +262,8 @@ ifdef NODEBUG DEBUG_FLAG = DEBUG_LINK = else -DEBUG_FLAG = -gstabs+ -g3 -DEBUG_LINK = -gstabs+ -g3 +DEBUG_FLAG = $(DEBUG_INFO) +DEBUG_LINK = $(DEBUG_INFO) endif ifdef NOCYGWIN |