Changeset 75140 in vbox

Timestamp:

Oct 29, 2018 11:23:06 AM (6 years ago)

Author:

vboxsync

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

126218

Message:

iprt/symvers.h, Config.kmk: build binary-compatible Additions on glibc 2.18.
bugref:9112: Linux Additions: fix building binaries for older Linux user space
Prevent linking against fcntl64 symbol, and do not include symvers.h with
XFree86 modules, which should not use glibc anyway.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• include/iprt/linux/symvers.h (modified) (1 diff)

trunk/Config.kmk

@@ -6963 +6963 @@
  TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.amd64   = -m elf_x86_64
 endif
-TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS  = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fno-pie -fno-merge-constants -std=c99 -ffreestanding
-TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-pie -fno-merge-constants -ffreestanding
+TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS  = $(VBOX_GCC_fno-stack-protector) -fno-pie -fno-merge-constants -std=c99 -ffreestanding
+TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(VBOX_GCC_fno-stack-protector) -fno-pie -fno-merge-constants -ffreestanding
 TEMPLATE_VBOXGUESTR3XF86MOD_SYSSUFF = .o
 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS  = \

trunk/include/iprt/linux/symvers.h

@@ -60 +60 @@
 #undef __GLIBC_MINOR__
 #define __GLIBC_MINOR__ 3
+
+/* Do not use fcntl64 */
+#include <fcntl.h>
+#ifdef fnctl
+# undef fcntl
+#endif
+#if defined(RT_ARCH_AMD64)
+__asm__(".symver fcntl64,fcntl@GLIBC_2.2.5");
+#else
+__asm__(".symver fcntl64,fcntl@GLIBC_2.0");
+#endif
+
 #endif /* ___iprt_linux_symvers_h */