Changeset 59784 in vbox

Timestamp:

Feb 23, 2016 12:48:14 PM (9 years ago)

Author:

vboxsync

Message:

bootsectors/Config.kmk: --allow-64bit-code-anywhere ==> --allow-64-bit

File:

• trunk/src/VBox/ValidationKit/bootsectors/Config.kmk (modified) (4 diffs)

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

@@ -86 +86 @@
                 -M -MP
 endef
-
+if "$(KBUILD_HOST)" == "darwin" \
+ || "$(VBOX_NASM_allow_64_bit)" != ""
+ BS3KIT_NASM_allow_64_bit = --allow-64-bit
+endif
 
 #
@@ -328 +331 @@
 TEMPLATE_VBoxBS3KitImg_MODE         = 0644
 TEMPLATE_VBoxBS3KitImg_ASTOOL       = VBoxNasm
-TEMPLATE_VBoxBS3KitImg_ASFLAGS      = -f obj -g --allow-64bit-code-anywhere -w+orphan-labels
+TEMPLATE_VBoxBS3KitImg_ASFLAGS      = -f obj -g $(BS3KIT_NASM_allow_64_bit) -w+orphan-labels
 TEMPLATE_VBoxBS3KitImg_ASDEFS       = ASM_FORMAT_OMF RT_NOINC_SEGMENTS __NASM__
 TEMPLATE_VBoxBS3KitImg_DEFS         = ARCH_BITS=16 IN_BS3KIT
@@ -436 +439 @@
 TEMPLATE_VBoxBS3KitImg32_INSTTYPE     = none
 TEMPLATE_VBoxBS3KitImg32_ASTOOL       = VBoxNasm
-TEMPLATE_VBoxBS3KitImg32_ASFLAGS      = -f obj -g --allow-64bit-code-anywhere -w+orphan-labels
+TEMPLATE_VBoxBS3KitImg32_ASFLAGS      = -f obj -g $(BS3KIT_NASM_allow_64_bit) -w+orphan-labels
 TEMPLATE_VBoxBS3KitImg32_ASDEFS       = ASM_FORMAT_OMF RT_NOINC_SEGMENTS __NASM__
 TEMPLATE_VBoxBS3KitImg32_DEFS         = ARCH_BITS=32 IN_BS3KIT
@@ -456 +459 @@
 TEMPLATE_VBoxBS3KitImg64_INSTTYPE     = none
 TEMPLATE_VBoxBS3KitImg64_ASTOOL       = VBoxNasm
-TEMPLATE_VBoxBS3KitImg64_ASFLAGS      = -f obj -g --allow-64bit-code-anywhere -w+orphan-labels
+TEMPLATE_VBoxBS3KitImg64_ASFLAGS      = -f obj -g $(BS3KIT_NASM_allow_64_bit) -w+orphan-labels
 TEMPLATE_VBoxBS3KitImg64_ASDEFS       = ASM_FORMAT_OMF RT_NOINC_SEGMENTS __NASM__
 TEMPLATE_VBoxBS3KitImg64_DEFS         = IN_BS3KIT ARCH_BITS=64