Changeset 70936 in vbox

Timestamp:

Feb 9, 2018 3:55:18 PM (7 years ago)

Author:

vboxsync

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

120771

Message:

Additions/linux: support producing builds which work with glibc 2.3.
bugref:9112: tools: update i386 Linux Additions build tool
Add an option - VBOX_WITH_OLD_GLIBC_SUPPORT - for producing Linux Additions
builds which work with glibc 2.3, by not referencing symbols which were
introduced later, including improved versions of APIs supported in glibc 2.3,
by not using GNU_HASH tags and by not using the stack protector.

Location:

trunk

Files:

• Config.kmk (modified) (3 diffs)
• include/iprt/linux/symvers.h (added)
• src/VBox/Additions/x11/VBoxClient/Makefile.kmk (modified) (1 diff)
• src/VBox/Additions/x11/VBoxClient/chk_stubs.c (added)

trunk/Config.kmk

@@ -4699 +4699 @@
   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
@@ -4730 +4739 @@
 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)
@@ -6689 +6702 @@
 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)
+VBoxClient_LIBS    += \
+        $(PATH_ROOT)/src/VBox/Additions/x11/VBoxClient/chk_stubs.c
+VBoxClient_LDFLAGS.amd64 += \
+        -Wl,--wrap=memcpy
+ endif
+endif
+
 ifdef VBOX_X11_SEAMLESS_GUEST
  VBoxClient_DEFS += SEAMLESS_GUEST DYNAMIC_RESIZE