diff --git a/VirtualBox/configure b/VirtualBox/configure
index 25d110a..5896334 100755
--- a/VirtualBox/configure
+++ b/VirtualBox/configure
@@ -1615,12 +1615,11 @@ EOF
   echo "$CC -m32 -O -Wall -o .tmp_out .tmp_src.c" >> $LOG
   $CC -m32 -O -Wall -o .tmp_out .tmp_src.c >> $LOG 2>&1
   if [ $? -ne 0 ]; then
-    echo
-    echo "  Cannot compile 32-bit applications (missing headers and/or libraries)!"
-    echo "  Check the file $LOG for detailed error information."
-    fail
+    cnf_append "VBOX_WITHOUT_BIARCH" "1"
+    log_success "no"
+  else
+    log_success "yes"
   fi
-  log_success ""
 }
 
 
diff --git a/VirtualBox/src/VBox/Devices/testcase/Makefile.kmk b/VirtualBox/src/VBox/Devices/testcase/Makefile.kmk
index 9cb414c..a325995 100644
--- a/VirtualBox/src/VBox/Devices/testcase/Makefile.kmk
+++ b/VirtualBox/src/VBox/Devices/testcase/Makefile.kmk
@@ -48,7 +48,9 @@ TESTING += \
 #
 # The testcase generator.
 #
+ifndef VBOX_WITHOUT_BIARCH
 PROGRAMS += tstDeviceStructSizeGC
+endif
 tstDeviceStructSizeGC_TEMPLATE  = VBOXGCEXE
 tstDeviceStructSizeGC_DEFS      =
 ifdef VBOX_WITH_USB
@@ -78,7 +80,9 @@ tstDeviceStructSizeGC_INCS      = \
 #
 # The testcase it self.
 #
+ifndef VBOX_WITHOUT_BIARCH
 PROGRAMS += tstDeviceStructSize
+endif
 tstDeviceStructSize_TEMPLATE = VBOXR3AUTOTST
 tstDeviceStructSize_DEFS     =
 ifdef VBOX_WITH_USB
diff --git a/VirtualBox/src/VBox/Runtime/Makefile.kmk b/VirtualBox/src/VBox/Runtime/Makefile.kmk
index 4fe7a7c..562e083 100644
--- a/VirtualBox/src/VBox/Runtime/Makefile.kmk
+++ b/VirtualBox/src/VBox/Runtime/Makefile.kmk
@@ -1390,8 +1390,7 @@ ifeq ($(VBOX_LDR_FMT32),lx)
  RuntimeGC_SOURCES += os2/sys0.asm
 endif
 
-if1of ($(KBUILD_TARGET), darwin solaris freebsd)
-RuntimeGC_SOURCES += \
+LIBGCC_MATH_SOURCES := \
 	common/math/gcc/adddi3.c \
 	common/math/gcc/anddi3.c \
 	common/math/gcc/ashldi3.c \
@@ -1411,6 +1410,13 @@ RuntimeGC_SOURCES += \
 	common/math/gcc/udivdi3.c \
 	common/math/gcc/umoddi3.c \
 	common/math/gcc/xordi3.c
+
+if1of ($(KBUILD_TARGET), darwin solaris freebsd)
+RuntimeGC_SOURCES += $(LIBGCC_MATH_SOURCES)
+else
+ifdef VBOX_WITHOUT_BIARCH
+RuntimeGC_SOURCES += $(LIBGCC_MATH_SOURCES)
+endif
 endif
 
 
diff --git a/VirtualBox/src/VBox/VMM/testcase/Makefile.kmk b/VirtualBox/src/VBox/VMM/testcase/Makefile.kmk
index a109a43..acdd08f 100644
--- a/VirtualBox/src/VBox/VMM/testcase/Makefile.kmk
+++ b/VirtualBox/src/VBox/VMM/testcase/Makefile.kmk
@@ -25,7 +25,10 @@ include	$(KBUILD_PATH)/subheader.kmk
 #
 # Target lists.
 #
-PROGRAMS   += tstVMStructSize tstVMStructGC tstAsmStructs tstAsmStructsGC tstVMM tstVMM-HwAccm tstGlobalConfig tstInstrEmul
+PROGRAMS   += tstVMM tstVMM-HwAccm tstGlobalConfig tstInstrEmul
+ifndef VBOX_WITHOUT_BIARCH
+PROGRAMS   += tstVMStructSize tstVMStructGC tstAsmStructs tstAsmStructsGC
+endif
 ifneq ($(KBUILD_TARGET),win)
 PROGRAMS   += tstVMMFork
 endif
@@ -51,9 +54,13 @@ BLDDIRS += $(VBOX_VMM_TESTCASE_OUT_DIR)
 #
 ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
  ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
+  ifndef VBOX_WITHOUT_BIARCH
   OTHERS += \
 	$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \
 	$(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run \
+	#
+  endif
+  OTHERS += \
 	$(VBOX_VMM_TESTCASE_OUT_DIR)/tstInstrEmul.run
  endif
 endif