Changeset 71694 in vbox

Timestamp:

Apr 6, 2018 8:27:41 AM (7 years ago)

Author:

vboxsync

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

121784

Message:

Make building Linux Additions compatible with old GLIBC versions default.
bugref:9112: Linux Additions: fix building binaries for older Linux user space
Remove VBOX_WITH_OLD_GLIBC_SUPPORT as a separate build option and apply it to
Additions binaries (and only them) by default.

Location:

trunk

Files:

• Config.kmk (modified) (6 diffs)
• src/VBox/Additions/x11/VBoxClient/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -2851 +2851 @@
         -fno-sanitize=vptr \
         -fno-common \
-        -static-libasan
+        -include sanitizer/lsan_interface.h \
+        -DVBOX_WITH_GCC_SANITIZER
 else
  VBOX_GCC_SANITIZER_FLAGS =
-endif
-
-# -libasan-static is currently not supported in combination with -no-undefined.
-ifdef VBOX_WITH_GCC_SANITIZER
- VBOX_GCC_NO_UNDEFINED    :=
- VBOX_GCC_NO_UNDEFINED_R0 :=
-else
- VBOX_GCC_NO_UNDEFINED    := -Wl,--no-undefined
- VBOX_GCC_NO_UNDEFINED_R0 := -no-undefined
 endif
 
@@ -4260 +4252 @@
         $(QUIET)$$(if $$(eq $$(symvers_$(module)_dep),),,\
 $$(CP) $$(symvers_$(module)_dep) "$$(PATH_TARGET)/tst$(module)_mod/Module.symvers")
-        + $(QUIET)make KBUILD_VERBOSE=$(KBUILD_VERBOSE) KERN_DIR=$(KERN_DIR) $(if-expr $(KMK_OPTS_JOBS) != 1,JOBS=$(KMK_OPTS_JOBS),) -C $$(PATH_TARGET)/tst$(module)_mod \
+        + $(QUIET)make KBUILD_VERBOSE=$(KBUILD_VERBOSE) KERN_DIR=$(KERN_DIR) $(if-expr $(KMK_OPTS_JOBS) > 1,JOBS=$(KMK_OPTS_JOBS),) -C $$(PATH_TARGET)/tst$(module)_mod \
                 2>&1 | tee "$$(PATH_TARGET)/tst$(module)_mod/make.err"
         $(QUIET)! grep "^WARNING: .* undefined!$$$$" "$$(PATH_TARGET)/tst$(module)_mod/make.err"
@@ -4697 +4689 @@
   TEMPLATE_VBOXR3EXE_CXXFLAGS         += $(VBOX_GCC_WERR)
  endif
- ifdef VBOX_WITH_OLD_GLIBC_SUPPORT
-  # Use older versions of APIs which were improved in versions of glibc later
-  # than what we are targetting, and do not use the stack protector, which
-  # needs glibc 2.4 or later.
-  TEMPLATE_VBOXR3EXE_CXXFLAGS.linux    = \
-        -include $(PATH_ROOT)/include/iprt/linux/symvers.h \
-        $(VBOX_GCC_fno-stack-protector)
-  TEMPLATE_VBOXR3EXE_CFLAGS.linux      = $(TEMPLATE_VBOXR3EXE_CXXFLAGS.linux)
- endif
 TEMPLATE_VBOXR3EXE_CXXFLAGS.x86        = -m32
 TEMPLATE_VBOXR3EXE_CXXFLAGS.amd64      = -m64
@@ -4737 +4720 @@
 TEMPLATE_VBOXR3EXE_LDFLAGS.sparc64     = -m64
 TEMPLATE_VBOXR3EXE_LDFLAGS.linux       = -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
- ifdef VBOX_WITH_OLD_GLIBC_SUPPORT
-  # The GNU_HASH ELF tag is not supported by older systems.
-TEMPLATE_VBOXR3EXE_LDFLAGS.linux      += -Wl,--hash-style=sysv
- endif
 TEMPLATE_VBOXR3EXE_LDFLAGS.solaris     = -Wl,-z,ignore # same as VBOX_LD_as_needed
 TEMPLATE_VBOXR3EXE_LDFLAGS.debug       = $(VBOX_GCC_SANITIZER_FLAGS)
@@ -6511 +6490 @@
 endif
 
+# Use older versions of APIs which were improved in versions of glibc later
+# than what we are targetting, and do not use the stack protector, which
+# needs glibc 2.4 or later.
+TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS.linux    = \
+        -include $(PATH_ROOT)/include/iprt/linux/symvers.h \
+        $(VBOX_GCC_fno-stack-protector)
+TEMPLATE_VBOXGUESTR3EXE_CFLAGS.linux      = $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS.linux)
+# The GNU_HASH ELF tag is not supported by older systems.
+TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux      += -Wl,--hash-style=sysv
+
 #
 # Template for building normal R3 programs for the guest additions.
@@ -6712 +6701 @@
 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TARGET)    = $(NO_SUCH_VARIABLE)
 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE)
-ifdef VBOX_WITH_OLD_GLIBC_SUPPORT
 # The GNU_HASH ELF tag is not supported by older systems.
 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.linux = --hash-style=sysv
-endif
 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TYPE)   = $(NO_SUCH_VARIABLE)
 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS          = -r

trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk

@@ -68 +68 @@
         supc++ \
         gcc_eh
-ifdef VBOX_WITH_OLD_GLIBC_SUPPORT
- # This has to be in LIBS, so as to be linked in after supc++ and gcc_eh, which
- # depend on the symbols it provides.  Static supc++ and gcc_eh on at least
- # Ubuntu 17.04 contain references to __sprintf_chk and __stack_chk_fail.
- # Furthermore, they contain references to memcpy, which needs to be resolved
- # to memcpy@GLIBC_2.2.5, which we solve in a not-very-satisfactory way with a
- # wrapper.
- ifeq ($(KBUILD_TARGET),linux)
+
+# The following is for ensuring binary compatibility for old Linux guests.
+# This has to be in LIBS, so as to be linked in after supc++ and gcc_eh, which
+# depend on the symbols it provides.  Static supc++ and gcc_eh on at least
+# Ubuntu 17.04 contain references to __sprintf_chk and __stack_chk_fail.
+# Furthermore, they contain references to memcpy, which needs to be resolved
+# to memcpy@GLIBC_2.2.5, which we solve in a not-very-satisfactory way with a
+# wrapper.
+ifeq ($(KBUILD_TARGET),linux)
 VBoxClient_LIBS    += \
         $(PATH_ROOT)/src/VBox/Additions/x11/VBoxClient/chk_stubs.c
 VBoxClient_LDFLAGS.amd64 += \
         -Wl,--wrap=memcpy
- endif
 endif