Index: /trunk/src/VBox/VMM/Makefile.kmk
===================================================================
--- /trunk/src/VBox/VMM/Makefile.kmk	(revision 57854)
+++ /trunk/src/VBox/VMM/Makefile.kmk	(revision 57855)
@@ -552,7 +552,7 @@
  VMMR0_DEFS.win.amd64  = VBOX_WITH_KERNEL_USING_XMM
 
- #ifeq ($(VBOX_LDR_FMT),elf)
- # VMMR0_CXXFLAGS += $(filter-out -Wno-unused,$(TEMPLATE_VBoxR0_CXXFLAGS)) -Wunused-variable -Wno-unused-result -Wno-unused-value
- #endif
+ ifeq ($(VBOX_LDR_FMT),elf)
+  VMMR0_CXXFLAGS += $(filter-out -Wno-unused,$(TEMPLATE_VBoxR0_CXXFLAGS)) -Wunused-variable
+ endif
 
  VMMR0_INCS      = \
@@ -730,8 +730,11 @@
 #
 ifneq ($(KBUILD_TARGET),win)
- VMMR3/PGMPool.cpp_CXXFLAGS     = $(VBOX_GCC_Wno-array_bounds)
- VMMAll/PGMAllPool.cpp_CXXFLAGS = $(VBOX_GCC_Wno-array_bounds)
- VMMAll/PGMAll.cpp_CXXFLAGS     = -Wno-unused-function
- VMMAll/IEMAll.cpp_CXXFLAGS     = -Wno-unused-parameter
+ VMMR3/PGMPool.cpp_CXXFLAGS       = $(VBOX_GCC_Wno-array_bounds)
+ VMMAll/PGMAllPool.cpp_CXXFLAGS   = $(VBOX_GCC_Wno-array_bounds)
+ VMMAll/PGMAll.cpp_CXXFLAGS       = -Wno-unused-function
+ VMMAll/IEMAll.cpp_CXXFLAGS       = -Wno-unused-parameter -Wno-unused-function
+ VMMAll/IEMAllAImplC.cpp_CXXFLAGS = -Wno-unused-parameter
+ VMMAll/CPUMAllMsrs.cpp_CXXFLAGS  = -Wno-unused-parameter
+ VMMR0/GMMR0.cpp_CXXFLAGS         = -Wno-unused-value
 endif