Changeset 85605 in vbox for trunk

Timestamp:

Aug 4, 2020 12:23:47 PM (4 years ago)

Author:

vboxsync

Message:

/Config.kmk: Postpone using shared objects for .r0 on solaris. bugref:9801

File:

• trunk/Config.kmk (modified) (3 diffs)

trunk/Config.kmk

@@ -4637 +4637 @@
  endif
  ifeq ($(KBUILD_TARGET),solaris)
- #TEMPLATE_VBoxR0_LDFLAGS            = -r
+ TEMPLATE_VBoxR0_LDFLAGS            = -r
  TEMPLATE_VBoxR0_LDFLAGS.solaris    = -u _init -u _info
  TEMPLATE_VBoxR0_LDFLAGS.solaris.amd64 = -m64
@@ -4643 +4643 @@
  TEMPLATE_VBoxR0_LIBS.solaris       = \
         $(PATH_STAGE_LIB)/RuntimeR0Stub$(VBOX_SUFF_LIB)
- #ifdef VBOX_GCC_USING_SOLARIS_AS
- # TEMPLATE_VBoxR0_CFLAGS.amd64 += -Wa,-xmodel=kernel
- # TEMPLATE_VBoxR0_CXXFLAGS.amd64 += -Wa,-xmodel=kernel
- #endif
+ ifdef VBOX_GCC_USING_SOLARIS_AS
+  TEMPLATE_VBoxR0_CFLAGS.amd64 += -Wa,-xmodel=kernel
+  TEMPLATE_VBoxR0_CXXFLAGS.amd64 += -Wa,-xmodel=kernel
+ endif
  # Solaris driver signing.
  TEMPLATE_VBoxR0_POST_CMDS          = $(VBOX_SIGN_DRIVER_CMDS)
@@ -4654 +4654 @@
  TEMPLATE_VBoxR0_LD_DEBUG           = split
  endif
- if1of ($(KBUILD_TARGET), linux solaris)
+ if1of ($(KBUILD_TARGET), linux)
 VBOX_WITH_VBOXR0_AS_DLL = 1
 TEMPLATE_VBoxR0_DLLSUFF             = .r0