Changeset 72093 in vbox

Timestamp:

May 3, 2018 2:02:30 PM (7 years ago)

Author:

vboxsync

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

122485

Message:

Restrict old glibc support to Guest Additions only.
bugref:9112: Linux Additions: fix building binaries for older Linux user space
Old glibc support is only of interest when building the Guest Additions, so
this change restricts it to binaries which will become part of the Additions,
so that it can be enabled by default.

File:

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

trunk/Config.kmk

@@ -4834 +4834 @@
   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
@@ -4874 +4865 @@
 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)
@@ -6648 +6635 @@
 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_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
+endif
+
 #
 # Template for building normal R3 programs for the guest additions.