Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/make/linux/makefiles/saproc.make	Wed Dec 05 16:59:12 2018 -0500
     1.2 +++ b/make/linux/makefiles/saproc.make	Fri Nov 09 10:38:30 2018 +0100
     1.3 @@ -59,6 +59,11 @@
     1.4    SA_DEBUG_CFLAGS = -g
     1.5  endif
     1.6  
     1.7 +# Optimize saproc lib at level -O3 unless it's a slowdebug build
     1.8 +ifneq ($(BUILD_FLAVOR), debug)
     1.9 +  SA_OPT_FLAGS = $(OPT_CFLAGS)
    1.10 +endif
    1.11 +
    1.12  # if $(AGENT_DIR) does not exist, we don't build SA
    1.13  # also, we don't build SA on Itanium or zero.
    1.14  
    1.15 @@ -95,6 +100,7 @@
    1.16  	           $(SASRCFILES)                                        \
    1.17  	           $(SA_LFLAGS)                                         \
    1.18  	           $(SA_DEBUG_CFLAGS)                                   \
    1.19 +	           $(SA_OPT_FLAGS)                                      \
    1.20  	           $(EXTRA_CFLAGS)                                      \
    1.21  	           -o $@                                                \
    1.22  	           -lthread_db -ldl

     2.1 --- a/make/windows/makefiles/sa.make	Wed Dec 05 16:59:12 2018 -0500
     2.2 +++ b/make/windows/makefiles/sa.make	Fri Nov 09 10:38:30 2018 +0100
     2.3 @@ -99,20 +99,25 @@
     2.4  
     2.5  checkAndBuildSA:: $(SAWINDBG)
     2.6  
     2.7 -# These do not need to be optimized (don't run a lot of code) and it
     2.8 -# will be useful to have the assertion checks in place
     2.9 +!if "$(BUILD_FLAVOR)" == "debug"
    2.10 +SA_EXTRA_CFLAGS = -Od -D "_DEBUG"
    2.11 +!elseif "$(BUILD_FLAVOR)" == "fastdebug"
    2.12 +SA_EXTRA_CFLAGS = -O2 -D "_DEBUG"
    2.13 +!else
    2.14 +SA_EXTRA_CFLAGS = -O2
    2.15 +!endif
    2.16  
    2.17  !if "$(BUILDARCH)" == "ia64"
    2.18 -SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 $(GX_OPTION) -Od -D "WIN32" -D "WIN64" -D "_WINDOWS" -D "_DEBUG" -D "_CONSOLE" -D "_MBCS" -YX -FD -c
    2.19 +SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 $(GX_OPTION) -D "WIN32" -D "WIN64" -D "_WINDOWS"  -D "_CONSOLE" -D "_MBCS" -YX -FD -c
    2.20  !elseif "$(BUILDARCH)" == "amd64"
    2.21 -SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 $(GX_OPTION) -Od -D "WIN32" -D "WIN64" -D "_WINDOWS" -D "_DEBUG" -D "_CONSOLE" -D "_MBCS" -YX -FD -c
    2.22 +SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 $(GX_OPTION) -D "WIN32" -D "WIN64" -D "_WINDOWS" -D "_CONSOLE" -D "_MBCS" -YX -FD -c
    2.23  !if "$(COMPILER_NAME)" == "VS2005"
    2.24  # On amd64, VS2005 compiler requires bufferoverflowU.lib on the link command line, 
    2.25  # otherwise we get missing __security_check_cookie externals at link time. 
    2.26  SA_LD_FLAGS = bufferoverflowU.lib
    2.27  !endif
    2.28  !else
    2.29 -SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 -Gm $(GX_OPTION) -Od -D "WIN32" -D "_WINDOWS" -D "_DEBUG" -D "_CONSOLE" -D "_MBCS" -YX -FD -GZ -c
    2.30 +SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 -Gm $(GX_OPTION) -D "WIN32" -D "_WINDOWS" -D "_CONSOLE" -D "_MBCS" -YX -FD -GZ -c
    2.31  !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
    2.32  SA_CFLAGS = $(SA_CFLAGS) -ZI
    2.33  !endif
    2.34 @@ -120,6 +125,7 @@
    2.35  !if "$(MT)" != ""
    2.36  SA_LD_FLAGS = -manifest $(SA_LD_FLAGS)
    2.37  !endif
    2.38 +SA_CFLAGS = $(SA_CFLAGS) $(SA_EXTRA_CFLAGS)
    2.39  
    2.40  SASRCFILES = $(AGENT_DIR)/src/os/win32/windbg/sawindbg.cpp \
    2.41  		$(AGENT_DIR)/src/share/native/sadis.c