Changeset 42669 in vbox for trunk

Timestamp:

Aug 7, 2012 11:42:25 PM (12 years ago)

Author:

vboxsync

Message:

Config.kmk,VMM/Makefile.kmk: Made dbgopt work on Windows and optimize IEMAll.cpp in debug build on windows as well. (Requires newer kBuild.)

Location:

trunk

Files:

• Config.kmk (modified) (6 diffs)
• src/VBox/VMM/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -46 +46 @@
 KBUILD_BLD_TYPES += dbgopt
 BLD_TYPE_dbgopt_EXTENDS = debug
-BLD_TYPE_dbgopt_EXTENDS_BY = appending
+BLD_TYPE_dbgopt_EXTENDS_BY = overriding
 
 # Temporary hack for kBuild ticket #83.
@@ -3307 +3307 @@
  TEMPLATE_VBOXR3EXE_CXXFLAGS           = -Zi -Zl -GR- -EHsc -GF -MD$(VBOX_VCC_CRT_TYPE) -W3 -wd4065 -wd4244 -wd4996 -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP)
  TEMPLATE_VBOXR3EXE_CXXFLAGS.debug     = -RTCsu
+ TEMPLATE_VBOXR3EXE_CXXFLAGS.dbgopt    = $(NO_SUCH_VARIABLE)
  TEMPLATE_VBOXR3EXE_CXXFLAGS.kprofile  = -Gh -GH
  TEMPLATE_VBOXR3EXE_CFLAGS             = $(TEMPLATE_VBOXR3EXE_CXXFLAGS)
  TEMPLATE_VBOXR3EXE_CFLAGS.debug       = $(TEMPLATE_VBOXR3EXE_CXXFLAGS.debug)
+ TEMPLATE_VBOXR3EXE_CFLAGS.dbgopt      = $(TEMPLATE_VBOXR3EXE_CXXFLAGS.dbgopt)
  TEMPLATE_VBOXR3EXE_CFLAGS.kprofile    = $(TEMPLATE_VBOXR3EXE_CXXFLAGS.kprofile)
  TEMPLATE_VBOXR3EXE_LDFLAGS            = \
@@ -3479 +3481 @@
 else ifeq ($(KBUILD_TARGET),win)
  TEMPLATE_VBoxR3DllNoPic_CFLAGS            = $(TEMPLATE_VBOXR3_CFLAGS)   $(VBOX_VCC_WERR)
+ TEMPLATE_VBoxR3DllNoPic_CFLAGS.debug      = $(filter-out -RTC%,$(TEMPLATE_VBOXR3_CFLAGS.debug))
  TEMPLATE_VBoxR3DllNoPic_CFLAGS.release    = $(TEMPLATE_VBOXR3_CFLAGS.release) -GS-
  TEMPLATE_VBoxR3DllNoPic_CXXFLAGS          = $(TEMPLATE_VBOXR3_CXXFLAGS) $(VBOX_VCC_WERR)
+ TEMPLATE_VBoxR3DllNoPic_CXXFLAGS.debug    = $(filter-out -RTC%,$(TEMPLATE_VBOXR3_CXXFLAGS.debug)) # RTCsu Prevents IEM opt.
  TEMPLATE_VBoxR3DllNoPic_CXXFLAGS.release  = $(TEMPLATE_VBOXR3_CXXFLAGS.release) -GS-
  TEMPLATE_VBoxR3DllNoPic_LDFLAGS           = $(TEMPLATE_VBOXR3_LDFLAGS)  $(VBOX_VCC_LD_WERR)
@@ -3825 +3829 @@
  TEMPLATE_VBOXMAINEXE_CXXFLAGS           = -Zi -Zl -GR -EHsc -GF -MD$(VBOX_VCC_CRT_TYPE) -W3 -wd4065 -wd4996 -wd4250 -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP)
  TEMPLATE_VBOXMAINEXE_CXXFLAGS.debug     = -RTCsu
+ TEMPLATE_VBOXMAINEXE_CXXFLAGS.dbgopt    = $(NO_SUCH_VARIABLE)
  TEMPLATE_VBOXMAINEXE_CXXFLAGS.kprofile  = -Gh -GH
  TEMPLATE_VBOXMAINEXE_CFLAGS             = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS)
  TEMPLATE_VBOXMAINEXE_CFLAGS.debug       = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS.debug)
+ TEMPLATE_VBOXMAINEXE_CFLAGS.dbgopt      = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS.dbgopt)
  TEMPLATE_VBOXMAINEXE_CFLAGS.kprofile    = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS.kprofile)
  TEMPLATE_VBOXMAINEXE_LDFLAGS            = \
@@ -4222 +4228 @@
   TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS = -nologo -Zm200 -W3 -MD -Zi -EHsc -Zc:wchar_t-
   TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS.debug = -RTCsu
+  TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS.dbgopt = $(NO_SUCH_VARIABLE)
   TEMPLATE_VBOXQT4GUIEXE_INCS += \
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_INC)
@@ -4394 +4401 @@
  TEMPLATE_VBOXBLDPROG_CXXFLAGS          := -Zi -Zl -GR- -EHsc -GF -W3 -wd4065 -wd4244 -wd4996 -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP) -MT$(VBOX_VCC_CRT_TYPE)
  TEMPLATE_VBOXBLDPROG_CXXFLAGS.debug    := -RTCsu
+ TEMPLATE_VBOXBLDPROG_CXXFLAGS.dbgopt    = $(NO_SUCH_VARIABLE)
  TEMPLATE_VBOXBLDPROG_CXXFLAGS.profile   = $(TEMPLATE_VBOXBLDPROG_CXXFLAGS.release)
  TEMPLATE_VBOXBLDPROG_CXXFLAGS.kprofile  = $(TEMPLATE_VBOXBLDPROG_CXXFLAGS.release)
  TEMPLATE_VBOXBLDPROG_CFLAGS             = $(TEMPLATE_VBOXBLDPROG_CXXFLAGS)
  TEMPLATE_VBOXBLDPROG_CFLAGS.debug       = $(TEMPLATE_VBOXBLDPROG_CXXFLAGS.debug)
+ TEMPLATE_VBOXBLDPROG_CFLAGS.dbgopt      = $(TEMPLATE_VBOXBLDPROG_CXXFLAGS.dbgopt)
  TEMPLATE_VBOXBLDPROG_CFLAGS.release     = $(TEMPLATE_VBOXBLDPROG_CXXFLAGS.release)
  TEMPLATE_VBOXBLDPROG_CFLAGS.profile     = $(TEMPLATE_VBOXBLDPROG_CXXFLAGS.profile)

trunk/src/VBox/VMM/Makefile.kmk

@@ -655 +655 @@
 #
 if1of ($(KBUILD_TARGET), win)
-#VMMAll/IEMAll.cpp_CXXFLAGS += TODO
-#else if1of ($(KBUILD_TARGET_ARCH), amd64)
-# VMMAll/IEMAll.cpp_CXXFLAGS += -O2 -fomit-frame-pointer
+ # -noover is recognized despite the statement saying otherwise. It silences these warnings:
+ # cl : Command line warning D9025 : overriding '/Od' with '/O2'
+ # cl : Command line warning D9025 : overriding '/Oy-' with '/Oy'
+ VMMAll/IEMAll.cpp_CXXFLAGS += -noover -O2xy
 else
  VMMAll/IEMAll.cpp_CXXFLAGS += -O2