Changeset 96106 in vbox

Timestamp:

Aug 8, 2022 11:13:21 AM (3 years ago)

Author:

vboxsync

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

152907

Message:

softfloat-3e,/Config.kmk: Build a version of the library for VBoxGL.dll when in VBOX_WITH_NOCRT_STATIC mode. bugref:10261

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/libs/Makefile.kmk (modified) (1 diff)
• src/libs/softfloat-3e/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -4858 +4858 @@
 SDK_VBOX_SOFTFLOATR0_LIBS       = \
         $(PATH_STAGE_LIB)/VBox-SoftFloatR0$(VBOX_SUFF_LIB)
+
+SDK_VBOX_SOFTFLOATGUESTR3SHARED           := SoftFloat 3 for ring-0 linking.
+SDK_VBOX_SOFTFLOATGUESTR3SHARED_DEFS      := SOFTFLOAT_FAST_INT64
+SDK_VBOX_SOFTFLOATGUESTR3SHARED_DEFS.amd64:= LITTLEENDIAN
+SDK_VBOX_SOFTFLOATGUESTR3SHARED_DEFS.arm64:= LITTLEENDIAN
+SDK_VBOX_SOFTFLOATGUESTR3SHARED_DEFS.x86  := LITTLEENDIAN
+SDK_VBOX_SOFTFLOATGUESTR3SHARED_INCS       = \
+        $(PATH_ROOT)/src/libs/softfloat-3e/source/include
+SDK_VBOX_SOFTFLOATR0_LIBS       = \
+        $(PATH_STAGE_LIB)/VBox-SoftFloatGuestR3Shared$(VBOX_SUFF_LIB)
 
 ifdef VBOX_WITH_LIBSSH

trunk/src/libs/Makefile.kmk

@@ -95 +95 @@
 
 # SoftFloat is used by the VMM for FPU emulation.
-if !defined(VBOX_ONLY_BUILD) \
- && "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SUPPORTED_HOST_ARCHS))" != ""
-  include $(PATH_SUB_CURRENT)/softfloat-3e/Makefile.kmk
+if  (!defined(VBOX_ONLY_BUILD) && "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SUPPORTED_HOST_ARCHS))" != "") \
+ || (   defined(VBOX_WITH_NOCRT_STATIC) \
+     && "$(KBUILD_TARGET)" == "win" \
+     && (   defined(VBOX_ONLY_ADDITIONS) \
+         || (!defined(VBOX_ONLY_BUILD) && defined(VBOX_WITH_ADDITIONS))))
+ include $(PATH_SUB_CURRENT)/softfloat-3e/Makefile.kmk
 endif
 

trunk/src/libs/softfloat-3e/Makefile.kmk

@@ -364 +364 @@
 endif
 
+
+ifdef VBOX_WITH_NOCRT_STATIC
+#
+# Static No-CRT version of the above for use with VBoxGL.dll in the GAs.
+#
+LIBRARIES.win += VBox-SoftFloatGuestR3Shared
+VBox-SoftFloatGuestR3Shared_TEMPLATE    := NewerVccVBoxGuestR3Dll
+VBox-SoftFloatGuestR3Shared_EXTENDS     := VBox-SoftFloat
+
+# -wd4389: f64_to_i64_r_minMag.c(93): warning C4389: '!=': signed/unsigned mismatch
+VBox-SoftFloatGuestR3Shared_CFLAGS.win  := $(VBox-SoftFloat_CFLAGS.win) -wd4245 -wd4389
+ ifn1of ($(KBUILD_TARGET),win)
+VBox-SoftFloatGuestR3Shared_CFLAGS      := $(VBox-SoftFloat_CFLAGS) -Wno-sign-compare
+ endif
+endif # VBOX_WITH_NOCRT_STATIC
+
+
 include $(FILE_KBUILD_SUB_FOOTER)