Fri, 09 Nov 2018 12:39:09 +0100
8212110: Build of saproc.dll broken on Windows 32 bit after JDK-8210647
Reviewed-by: erikj, akasko
make/windows/makefiles/sa.make | file | annotate | diff | comparison | revisions |
1.1 --- a/make/windows/makefiles/sa.make Fri Nov 09 10:38:30 2018 +0100 1.2 +++ b/make/windows/makefiles/sa.make Fri Nov 09 12:39:09 2018 +0100 1.3 @@ -101,6 +101,9 @@ 1.4 1.5 !if "$(BUILD_FLAVOR)" == "debug" 1.6 SA_EXTRA_CFLAGS = -Od -D "_DEBUG" 1.7 +!if "$(BUILDARCH)" == "i486" 1.8 +SA_EXTRA_CFLAGS = $(SA_EXTRA_CFLAGS) -RTC1 1.9 +!endif 1.10 !elseif "$(BUILD_FLAVOR)" == "fastdebug" 1.11 SA_EXTRA_CFLAGS = -O2 -D "_DEBUG" 1.12 !else 1.13 @@ -117,9 +120,11 @@ 1.14 SA_LD_FLAGS = bufferoverflowU.lib 1.15 !endif 1.16 !else 1.17 -SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 -Gm $(GX_OPTION) -D "WIN32" -D "_WINDOWS" -D "_CONSOLE" -D "_MBCS" -YX -FD -GZ -c 1.18 +SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 -Gm $(GX_OPTION) -D "WIN32" -D "_WINDOWS" -D "_CONSOLE" -D "_MBCS" -YX -FD -c 1.19 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" 1.20 -SA_CFLAGS = $(SA_CFLAGS) -ZI 1.21 +# -ZI is incompatible with -O2 used for release/fastdebug builds. 1.22 +# Using -Zi instead. 1.23 +SA_CFLAGS = $(SA_CFLAGS) -Zi 1.24 !endif 1.25 !endif 1.26 !if "$(MT)" != ""