Changeset 61701 in vbox for trunk

Timestamp:

Jun 14, 2016 9:08:40 PM (9 years ago)

Author:

vboxsync

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

108062

Message:

don't set VBOX_WITH_BS3KIT if gcc does not support -m64

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/ValidationKit/bootsectors/Makefile.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -2638 +2638 @@
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_fno-stack-protector   ?= $(call VBOX_GCC_CHECK_CC,-fno-stack-protector,)'
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_fno-dwarf2-cfi-asm    ?= $(call VBOX_GCC_CHECK_CC,-fno-dwarf2-cfi-asm,)'
+        $(QUIET)$(APPEND) '$@' 'VBOX_GCC_m64                   ?= $(call VBOX_GCC_CHECK_CC,-m64,)'
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_no-pie                ?= $(call VBOX_GCC_CHECK_CC,-no-pie,)'
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_fdiagnostics-show-option ?= $(call VBOX_GCC_CHECK_CC,-fdiagnostics-show-option,)'

trunk/src/VBox/ValidationKit/bootsectors/Makefile.kmk

@@ -42 +42 @@
 # The VBOX_WITH_BS3KIT feature requires NASM 2.12 and either MSVC or gcc
 # with ms_abi function attribute (gcc v4.4+, MSVC default).
+# Some 32-bit gcc compilers come without 64-bit support (e.g. EL5).
 #
 if defined(VBOX_WITH_OPEN_WATCOM)
@@ -48 +49 @@
  else if $(VBOX_GCC_VERSION_CC) >= 40400 # ms_abi was added in 4.4
   if1of ($(KBUILD_TARGET), linux)
-   VBOX_WITH_BS3KIT = 1
+   ifneq ($(VBOX_GCC_m64),)
+    VBOX_WITH_BS3KIT = 1
+   endif
   endif
  endif