make/windows/makefiles/sa.make

@  rev 8857 : 8212110: Build of saproc.dll broken on Windows 32 bit after JDK-8210647
:  Reviewed-by: erikj, akasko
o  rev 8855 : 8210647: libsaproc is being compiled without optimization
|  Reviewed-by: duke
~

@@ -99,10 +99,13 @@
 
 checkAndBuildSA:: $(SAWINDBG)
 
 !if "$(BUILD_FLAVOR)" == "debug"
 SA_EXTRA_CFLAGS = -Od -D "_DEBUG"
+!if "$(BUILDARCH)" == "i486"
+SA_EXTRA_CFLAGS = $(SA_EXTRA_CFLAGS) -RTC1
+!endif
 !elseif "$(BUILD_FLAVOR)" == "fastdebug"
 SA_EXTRA_CFLAGS = -O2 -D "_DEBUG"
 !else
 SA_EXTRA_CFLAGS = -O2
 !endif

@@ -115,13 +118,15 @@
 # On amd64, VS2005 compiler requires bufferoverflowU.lib on the link command line, 
 # otherwise we get missing __security_check_cookie externals at link time. 
 SA_LD_FLAGS = bufferoverflowU.lib
 !endif
 !else
-SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 -Gm $(GX_OPTION) -D "WIN32" -D "_WINDOWS" -D "_CONSOLE" -D "_MBCS" -YX -FD -GZ -c
+SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 -Gm $(GX_OPTION) -D "WIN32" -D "_WINDOWS" -D "_CONSOLE" -D "_MBCS" -YX -FD -c
 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
-SA_CFLAGS = $(SA_CFLAGS) -ZI
+# -ZI is incompatible with -O2 used for release/fastdebug builds.
+# Using -Zi instead.
+SA_CFLAGS = $(SA_CFLAGS) -Zi
 !endif
 !endif
 !if "$(MT)" != ""
 SA_LD_FLAGS = -manifest $(SA_LD_FLAGS)
 !endif