Changeset 66171 in vbox

Timestamp:

Mar 20, 2017 2:42:13 PM (8 years ago)

Author:

vboxsync

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

114080

Message:

bugref:8019: Undefined behaviour sanitiser: clean up the VBOX_WITH_GCC_SANITIZER settings in Config.kmk.

File:

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

trunk/Config.kmk

@@ -2775 +2775 @@
 VBOX_GCC_NON_PEDANTIC_C   ?= -Wno-sign-compare -Werror-implicit-function-declaration
 
+# The address sanitiser library intercepts dlopen() and breaks RPATH $ORIGIN,
+# so we need to link it statically.
 VBOX_GCC_SANITIZER_FLAGS = \
   -fsanitize=undefined \
@@ -2785 +2787 @@
   -fno-common \
   -static-libasan
-# The dynamic sanitiser library intercepts dlopen() and breaks RPATH $ORIGIN.
-VBOX_GCC_SANITIZER_LDFLAGS = \
-  -fsanitize=undefined \
-  -fsanitize=address \
-  -fsanitize=return \
-  -fsanitize=bounds \
-  -fsanitize=object-size \
-  -fno-sanitize=alignment \
-  -fno-sanitize=vptr \
-  -fno-common \
-  -static-libasan \
-  -static-libubsan
-VBOX_GCC_SANITIZER_LIBS= # pthread m rt dl
-# When the address sanitiser is enabled, shared objects will contain references
-# to ASAN symbols.  Linking in libasan causes problems.
+
+# -libasan-static is currently not supported in combination with -no-undefined.
 VBOX_GCC_NO_UNDEFINED=$(if $(VBOX_WITH_GCC_SANITIZER),,-Wl,--no-undefined)
 VBOX_GCC_NO_UNDEFINED_R0=$(if $(VBOX_WITH_GCC_SANITIZER),,-no-undefined)
@@ -4606 +4595 @@
 TEMPLATE_VBOXR3EXE_LDFLAGS.linux       = -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
 TEMPLATE_VBOXR3EXE_LDFLAGS.solaris     = -Wl,-z,ignore # same as VBOX_LD_as_needed
-TEMPLATE_VBOXR3EXE_LDFLAGS.debug       = $(if $(VBOX_WITH_GCC_SANITIZER),$(VBOX_GCC_SANITIZER_LDFLAGS),)
-TEMPLATE_VBOXR3EXE_LIBS.debug          = $(if $(VBOX_WITH_GCC_SANITIZER),$(VBOX_GCC_SANITIZER_LIBS),)
+TEMPLATE_VBOXR3EXE_LDFLAGS.debug       = $(if $(VBOX_WITH_GCC_SANITIZER),$(VBOX_GCC_SANITIZER_FLAGS),)
 
  ifeq ($(KBUILD_TARGET),linux)
@@ -5408 +5396 @@
 TEMPLATE_VBOXMAINEXE_LDFLAGS.x86         = -m32
 TEMPLATE_VBOXMAINEXE_LDFLAGS.amd64       = -m64
-TEMPLATE_VBOXMAINEXE_LDFLAGS.debug       = $(if $(VBOX_WITH_GCC_SANITIZER),$(VBOX_GCC_SANITIZER_LDFLAGS),)
-TEMPLATE_VBOXMAINEXE_LIBS.debug          = $(if $(VBOX_WITH_GCC_SANITIZER),$(VBOX_GCC_SANITIZER_LIBS),)
+TEMPLATE_VBOXMAINEXE_LDFLAGS.debug       = $(if $(VBOX_WITH_GCC_SANITIZER),$(VBOX_GCC_SANITIZER_FLAGS),)
  ifeq ($(KBUILD_TARGET),linux)
 TEMPLATE_VBOXMAINEXE_LIBS                = pthread m rt $(LIB_RUNTIME) dl
@@ -5956 +5943 @@
   TEMPLATE_VBOXQTGUIEXE_LDFLAGS.x86 = -m32
   TEMPLATE_VBOXQTGUIEXE_LDFLAGS.amd64 = -m64
-  TEMPLATE_VBOXQTGUIEXE_LDFLAGS.debug = $(if $(VBOX_WITH_GCC_SANITIZER),$(VBOX_GCC_SANITIZER_LDFLAGS),)
-  TEMPLATE_VBOXQTGUIEXE_LIBS.debug    = $(if $(VBOX_WITH_GCC_SANITIZER),$(VBOX_GCC_SANITIZER_LIBS),)
+  TEMPLATE_VBOXQTGUIEXE_LDFLAGS.debug = $(if $(VBOX_WITH_GCC_SANITIZER),$(VBOX_GCC_SANITIZER_FLAGS),)
   TEMPLATE_VBOXQTGUIEXE_LIBS = \
         $(VBOX_LIBS_QT) \