Changeset 40632 in vbox

Timestamp:

Mar 26, 2012 11:44:30 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

77053

Message:

Config.kmk/VBOXR0DRV: Do NOT use -Wnested-externs as it will get screwed by our AssertCompilNS macro.

File:

• trunk/Config.kmk (modified) (4 diffs)

trunk/Config.kmk

@@ -2953 +2953 @@
 TEMPLATE_VBOXR0DRV_INCS                = $(VBOX_LINUX_INCS)
 TEMPLATE_VBOXR0DRV_CFLAGS              = -nostdinc -iwithprefix include $(VBOX_LINUX_INCLUDE) \
-        $(VBOX_GCC_WARN) -Wstrict-prototypes $(VBOX_GCC_Wno-pointer-sign) -Wno-sign-compare \
-        $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration
+        $(VBOX_GCC_WARN) -Wstrict-prototypes $(VBOX_GCC_Wno-pointer-sign) -Wno-sign-compare $(VBOX_GCC_fdiagnostics-show-option) \
+        $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
+        -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration 
 TEMPLATE_VBOXR0DRV_CFLAGS.x86          = -mpreferred-stack-boundary=2 -msoft-float
 TEMPLATE_VBOXR0DRV_CFLAGS.amd64        = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow \
@@ -2987 +2988 @@
 ## @todo try use VBOX_GCC_PEDANTIC_CXX
 TEMPLATE_VBOXR0DRV_CXXFLAGS            = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS) \
-        -g $(VBOX_GCC_pipe) $(VBOX_GCC_WARN) -Wno-long-long -fno-common -nostdinc -fno-builtin -finline \
+        -g $(VBOX_GCC_pipe) $(VBOX_GCC_WARN) -Wno-long-long $(VBOX_GCC_fdiagnostics-show-option) \
+        -fno-common -nostdinc -fno-builtin -finline \
         -fno-keep-inline-functions -fno-exceptions -msoft-float \
         -fapple-kext -fno-rtti -fcheck-new -force_cpusubtype_ALL \
@@ -3018 +3020 @@
 # Exclude -Wall because of solaris headers' pragma ident warnings that gcc refuses to supress.
 TEMPLATE_VBOXR0DRV_CFLAGS              = -Wpointer-arith -Winline $(VBOX_GCC_Wno-pointer-sign) \
-        -Wmissing-prototypes -Wstrict-prototypes -Wnested-externs \
+        -Wmissing-prototypes -Wstrict-prototypes $(VBOX_GCC_fdiagnostics-show-option) \
         -Wshadow -Wuninitialized -Wunused-function -Wunused-label -Wunused-value -Wunused-variable \
         -Wformat  -Wimplicit-int -Wimplicit-function-declaration -Werror-implicit-function-declaration -Wparentheses \
@@ -3075 +3077 @@
 # omitting: -Wcast-qual, -Wredundant-decls
 TEMPLATE_VBOXR0DRV_CFLAGS              =  \
-        $(VBOX_GCC_WARN) -Wpointer-arith -Winline $(VBOX_GCC_Wno-pointer-sign) \
-        -Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes -Wnested-externs \
+        $(VBOX_GCC_WARN) -Wpointer-arith -Winline $(VBOX_GCC_Wno-pointer-sign) $(VBOX_GCC_fdiagnostics-show-option) \
+        -Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes \
         -Wimplicit-function-declaration -Werror-implicit-function-declaration \
         -O2 -fformat-extensions -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \