After consultations on the APR list, it was decided that /map files are

  fairly redundant when you retain rich .pdb debugging symbol files.  We
  have rarely used them, and generally .dbg and .pdb files prove much more
  useful for the cases we have.

  While eliminating /map files, we are also shrinking the size of the .dbg
  files by stripping 'private' symbol information.  Really this means less
  rich diagnostics from Dr. Watson on NT or Win9x when they query the .dbg
  symbols in creating a DrWatson log file.  But it's more than compensated
  for on newer OS'es where Dr. Watson will query the .pdb symbols, on all
  Win32 flavors when WinDbg is used with the .pdb symbols, and the fact that
  the distribution of binary symbols will use less bandwidth when less
  information is duplicated from the .pdb format into the .dbg files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98744 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 41 insertions, 41 deletions

diff --git a/server/mpm/winnt/Win9xConHook.dsp b/server/mpm/winnt/Win9xConHook.dsp
index 632ab67583..984dab37eb 100644
--- a/server/mpm/winnt/Win9xConHook.dsp
+++ b/server/mpm/winnt/Win9xConHook.dsp
@@ -52,8 +52,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /base:"0x1c0f0000"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /base:"0x1c0f0000"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no /machine:I386 /base:"0x1c0f0000"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no /machine:I386 /base:"0x1c0f0000"
 
 !ELSEIF  "$(CFG)" == "Win9xConHook - Win32 Debug"
 
@@ -78,8 +78,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:"0x1c0f0000"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:"0x1c0f0000"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /base:"0x1c0f0000"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /base:"0x1c0f0000"
 
 !ENDIF 
 
diff --git a/support/ab.dsp b/support/ab.dsp
index fff0d642c1..9983b2607b 100644
--- a/support/ab.dsp
+++ b/support/ab.dsp
@@ -49,14 +49,14 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /map /machine:I386
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /map /debug /debugtype:both /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /debug /debugtype:both /machine:I386 /pdbtype:sept
 # Begin Custom Build - Extracting .dbg symbols from $(InputPath)
 InputPath=.\Release\ab.so
 SOURCE="$(InputPath)"
 
 ".\Release\ab.dbr" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	rebase -q -b 0x00400000 -x ".\Release" $(InputPath)
+	rebase -q -p -b 0x00400000 -x ".\Release" $(InputPath)
 	echo rebased > ".\Release\ab.dbr"
 
 # End Custom Build
@@ -82,8 +82,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386
 
 !ENDIF 
 
diff --git a/support/abs.dsp b/support/abs.dsp
index fcda7bf576..cca9dd100a 100644
--- a/support/abs.dsp
+++ b/support/abs.dsp
@@ -49,14 +49,14 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib wsock32.lib ws2_32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /map /machine:I386 /libpath:"../srclib/openssl/out32dll"
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /map /debug /debugtype:both /machine:I386 /pdbtype:sept /libpath:"../srclib/openssl/out32dll"
+# ADD BASE LINK32 kernel32.lib user32.lib wsock32.lib ws2_32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /machine:I386 /libpath:"../srclib/openssl/out32dll"
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /debug /debugtype:both /machine:I386 /pdbtype:sept /libpath:"../srclib/openssl/out32dll"
 # Begin Custom Build - Extracting .dbg symbols from $(InputPath)
 InputPath=.\Release\abs.so
 SOURCE="$(InputPath)"
 
 ".\Release\abs.dbr" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	rebase -q -b 0x00400000 -x ".\Release" $(InputPath)
+	rebase -q -p -b 0x00400000 -x ".\Release" $(InputPath)
 	echo rebased > ".\Release\abs.dbr"
 
 # End Custom Build
@@ -82,8 +82,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /libpath:"../srclib/openssl/out32dll"
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /libpath:"../srclib/openssl/out32dll"
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /libpath:"../srclib/openssl/out32dll"
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib ssleay32.lib libeay32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /libpath:"../srclib/openssl/out32dll"
 
 !ENDIF 
 
diff --git a/support/htdbm.dsp b/support/htdbm.dsp
index 4ce9b60e4f..b5657fe3ee 100644
--- a/support/htdbm.dsp
+++ b/support/htdbm.dsp
@@ -49,14 +49,14 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /map /machine:I386
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /map /debug /debugtype:both /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /debug /debugtype:both /machine:I386 /pdbtype:sept
 # Begin Custom Build - Extracting .dbg symbols from $(InputPath)
 InputPath=.\Release\htdbm.so
 SOURCE="$(InputPath)"
 
 ".\Release\htdbm.dbr" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	rebase -q -b 0x00400000 -x ".\Release" $(InputPath)
+	rebase -q -p -b 0x00400000 -x ".\Release" $(InputPath)
 	echo rebased > ".\Release\htdbm.dbr"
 
 # End Custom Build
@@ -82,8 +82,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386
 
 !ENDIF 
 
diff --git a/support/htdigest.dsp b/support/htdigest.dsp
index 299c229d68..786b6820f9 100644
--- a/support/htdigest.dsp
+++ b/support/htdigest.dsp
@@ -49,14 +49,14 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /map /machine:I386
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /map /debug /debugtype:both /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /debug /debugtype:both /machine:I386 /pdbtype:sept
 # Begin Custom Build - Extracting .dbg symbols from $(InputPath)
 InputPath=.\Release\htdigest.so
 SOURCE="$(InputPath)"
 
 ".\Release\htdigest.dbr" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	rebase -q -b 0x00400000 -x ".\Release" $(InputPath)
+	rebase -q -p -b 0x00400000 -x ".\Release" $(InputPath)
 	echo rebased > ".\Release\htdigest.dbr"
 
 # End Custom Build
@@ -82,8 +82,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386
 
 !ENDIF 
 
diff --git a/support/htpasswd.dsp b/support/htpasswd.dsp
index 7fa1c4a257..f5a4e81de2 100644
--- a/support/htpasswd.dsp
+++ b/support/htpasswd.dsp
@@ -49,14 +49,14 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /map /machine:I386
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /map /debug /debugtype:both /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /debug /debugtype:both /machine:I386 /pdbtype:sept
 # Begin Custom Build - Extracting .dbg symbols from $(InputPath)
 InputPath=.\Release\htpasswd.so
 SOURCE="$(InputPath)"
 
 ".\Release\htpasswd.dbr" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	rebase -q -b 0x00400000 -x ".\Release" $(InputPath)
+	rebase -q -p -b 0x00400000 -x ".\Release" $(InputPath)
 	echo rebased > ".\Release\htpasswd.dbr"
 
 # End Custom Build
@@ -82,8 +82,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386
 
 !ENDIF 
 
diff --git a/support/rotatelogs.dsp b/support/rotatelogs.dsp
index 176e591532..028d2d823c 100644
--- a/support/rotatelogs.dsp
+++ b/support/rotatelogs.dsp
@@ -50,13 +50,13 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /map /debug /debugtype:both /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /debug /debugtype:both /machine:I386 /pdbtype:sept
 # Begin Custom Build - Extracting .dbg symbols from $(InputPath)
 InputPath=.\Release\rotatelogs.so
 SOURCE="$(InputPath)"
 
 ".\Release\rotatelogs.dbr" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	rebase -q -b 0x00400000 -x ".\Release" $(InputPath)
+	rebase -q -p -b 0x00400000 -x ".\Release" $(InputPath)
 	echo rebased > ".\Release\rotatelogs.dbr"
 
 # End Custom Build
@@ -82,8 +82,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386
 
 !ENDIF 
 
diff --git a/support/win32/ApacheMonitor.dsp b/support/win32/ApacheMonitor.dsp
index 39cd78179a..cc62f0d0d4 100644
--- a/support/win32/ApacheMonitor.dsp
+++ b/support/win32/ApacheMonitor.dsp
@@ -53,13 +53,13 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib /nologo /subsystem:windows /map /debug /debugtype:both /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib /nologo /subsystem:windows /debug /debugtype:both /machine:I386 /pdbtype:sept
 # Begin Custom Build - Extracting .dbg symbols from $(InputPath)
 InputPath=.\Release\ApacheMonitor.so
 SOURCE="$(InputPath)"
 
 ".\Release\ApacheMonitor.dbr" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	rebase -q -b 0x00400000 -x ".\Release" $(InputPath)
+	rebase -q -p -b 0x00400000 -x ".\Release" $(InputPath)
 	echo rebased > ".\Release\ApacheMonitor.dbr"
 
 # End Custom Build
@@ -88,7 +88,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib /nologo /subsystem:windows /debug /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib /nologo /subsystem:windows /incremental:no /map /debug /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib /nologo /subsystem:windows /incremental:no /debug /machine:I386
 
 !ENDIF 
 
diff --git a/support/win32/wintty.dsp b/support/win32/wintty.dsp
index b3d84db246..07ade0a425 100644
--- a/support/win32/wintty.dsp
+++ b/support/win32/wintty.dsp
@@ -49,14 +49,14 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /map /machine:I386
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /map /debug /debugtype:both /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /debugtype:both /machine:I386 /pdbtype:sept
 # Begin Custom Build - Extracting .dbg symbols from $(InputPath)
 InputPath=.\Release\wintty.so
 SOURCE="$(InputPath)"
 
 ".\Release\wintty.dbr" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	rebase -q -b 0x00400000 -x ".\Release" $(InputPath)
+	rebase -q -p -b 0x00400000 -x ".\Release" $(InputPath)
 	echo rebased > ".\Release\wintty.dbr"
 
 # End Custom Build
@@ -82,8 +82,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386
+# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386
 
 !ENDIF