Add support for generating PDB-format debug symbols with MSVC, by setting MOZ_DEBUG_SYMBOLS=1 in the environment. This is to be used in place of MOZ_PROFILE. Bug 244231, r=wtc, dmose, a=asa.

7 files changed, 37 insertions, 9 deletions

diff --git a/security/coreconf/WIN32.mk b/security/coreconf/WIN32.mk
index d275300b2..18a027354 100644
--- a/security/coreconf/WIN32.mk
+++ b/security/coreconf/WIN32.mk
@@ -116,7 +116,12 @@ else # !NS_USE_GCC
 	#
 	ifdef MOZ_PROFILE
 		OPTIMIZER += -Z7
-		DLLFLAGS += -DEBUG -DEBUGTYPE:CV
+	endif
+	ifdef MOZ_DEBUG_SYMBOLS
+		OPTIMIZER += -Zi
+	endif
+	ifneq (,$(MOZ_PROFILE)$(MOZ_DEBUG_SYMBOLS))
+		DLLFLAGS += -DEBUG -OPT:REF
 	endif
     else
 	#
@@ -135,9 +140,9 @@ else # !NS_USE_GCC
 	USERNAME   := $(subst $(SPACE),_,$(USERNAME))
 	USERNAME   := $(subst -,_,$(USERNAME))
 	DEFINES    += -DDEBUG -D_DEBUG -UNDEBUG -DDEBUG_$(USERNAME)
-	DLLFLAGS   += -DEBUG -DEBUGTYPE:CV -OUT:"$@"
+	DLLFLAGS   += -DEBUG -OUT:"$@"
 	# Purify requires /FIXED:NO when linking EXEs.
-	LDFLAGS    += -DEBUG -DEBUGTYPE:CV -PDB:NONE /FIXED:NO
+	LDFLAGS    += -DEBUG -PDB:NONE /FIXED:NO
     endif
 endif # NS_USE_GCC
 
diff --git a/security/coreconf/WIN954.0.mk b/security/coreconf/WIN954.0.mk
index e710f6e2e..50f0cc220 100644
--- a/security/coreconf/WIN954.0.mk
+++ b/security/coreconf/WIN954.0.mk
@@ -58,6 +58,9 @@ else
 endif
 
 ifndef NS_USE_GCC
-OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE
+OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS
+ifndef MOZ_DEBUG_SYMBOLS
+OS_DLLFLAGS += -PDB:NONE
+endif
 endif
 DEFINES += -DWIN95
diff --git a/security/coreconf/WINCE3.0.mk b/security/coreconf/WINCE3.0.mk
index ddf7a4c7b..9f18b7a26 100644
--- a/security/coreconf/WINCE3.0.mk
+++ b/security/coreconf/WINCE3.0.mk
@@ -65,7 +65,7 @@ OS_CFLAGS += -W3 -nologo
 
 OS_DLLFLAGS += -DLL 
 
-LINKFLAGS = -nologo -PDB:NONE -subsystem:windowsce,3.00 \
+LINKFLAGS = -nologo -subsystem:windowsce,3.00 \
  -nodefaultlib:libc.lib \
  -nodefaultlib:libcd.lib \
  -nodefaultlib:libcmt.lib \
@@ -75,6 +75,10 @@ LINKFLAGS = -nologo -PDB:NONE -subsystem:windowsce,3.00 \
  -nodefaultlib:oldnames.lib \
  $(NULL)
 
+ifndef MOZ_DEBUG_SYMBOLS
+LINKFLAGS += -PDB:NONE
+endif
+
 LINK    += $(LINKFLAGS)
 LDFLAGS += $(LINKFLAGS)
 
diff --git a/security/coreconf/WINNT3.51.mk b/security/coreconf/WINNT3.51.mk
index b422b2b56..db504c7ca 100644
--- a/security/coreconf/WINNT3.51.mk
+++ b/security/coreconf/WINNT3.51.mk
@@ -56,7 +56,11 @@ endif
 OS_WIN_CFLAGS += -W3
 OS_CFLAGS     += -nologo $(OS_WIN_CFLAGS) $(OS_PROC_CFLAGS)
 #OS_DLLFLAGS  += -nologo -DLL -PDB:NONE -SUBSYSTEM:WINDOWS
-OS_DLLFLAGS   += -nologo -DLL -PDB:NONE -SUBSYSTEM:WINDOWS
+OS_DLLFLAGS   += -nologo -DLL -SUBSYSTEM:WINDOWS
+ifndef MOZ_DEBUG_SYMBOLS
+OS_DLLFLAGS   += -PDB:NONE
+endif
+
 #
 # Win NT needs -GT so that fibers can work
 #
diff --git a/security/coreconf/WINNT4.0.mk b/security/coreconf/WINNT4.0.mk
index 7fc5a54d6..9720a0724 100644
--- a/security/coreconf/WINNT4.0.mk
+++ b/security/coreconf/WINNT4.0.mk
@@ -55,7 +55,11 @@ else
 	endif
 endif
 
-OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE
+OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS
+ifndef MOZ_DEBUG_SYMBOLS
+OS_DLLFLAGS += -PDB:NONE
+endif
+
 #
 # Win NT needs -GT so that fibers can work
 #
diff --git a/security/coreconf/WINNT5.0.mk b/security/coreconf/WINNT5.0.mk
index 303b98007..e2ea4f178 100644
--- a/security/coreconf/WINNT5.0.mk
+++ b/security/coreconf/WINNT5.0.mk
@@ -55,7 +55,11 @@ else
 	endif
 endif
 
-OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE
+OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS
+ifndef MOZ_DEBUG_SYMBOLS
+OS_DLLFLAGS += -PDB:NONE
+endif
+
 #
 # Win NT needs -GT so that fibers can work
 #
diff --git a/security/coreconf/WINNT5.1.mk b/security/coreconf/WINNT5.1.mk
index f9c7ed1c8..f672d472f 100644
--- a/security/coreconf/WINNT5.1.mk
+++ b/security/coreconf/WINNT5.1.mk
@@ -55,7 +55,11 @@ else
 	endif
 endif
 
-OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE
+OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS
+ifndef MOZ_DEBUG_SYMBOLS
+OS_DLLFLAGS += -PDB:NONE
+endif
+
 #
 # Win NT needs -GT so that fibers can work
 #