Changeset 74652 in vbox

Timestamp:

Oct 7, 2018 12:10:28 PM (6 years ago)

Author:

vboxsync

Message:

iprt: Use imported Mach-O code; removed kStuff entirely. bugref:9232

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• Maintenance.kmk (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (10 diffs)
• src/VBox/ValidationKit/Config.kmk (modified) (2 diffs)
• src/libs/Makefile.kmk (modified) (1 diff)
• src/libs/kStuff (deleted)

trunk/Config.kmk

@@ -515 +515 @@
 # Include the EFI firmware into the package
 VBOX_WITH_EFIFW_PACKING = 1
-# Use kStuff for MACH-O and LX binary loading.
-if1of ($(KBUILD_TARGET_ARCH), x86 amd64)
- IPRT_WITH_KSTUFF = 1
-endif
 # Enable setuid wrapper for Solaris host DVD.
 #VBOX_WITH_SUID_WRAPPER = 1
@@ -6636 +6632 @@
 TEMPLATE_VBoxAdvBldProg_LIBS    = \
         $(PATH_STAGE_LIB)/RuntimeBldProg$(VBOX_HOSTSUFF_LIB) \
-        $(if-expr defined(IPRT_WITH_KSTUFF), \
-                $(PATH_STAGE_LIB)/VBox-kStuffStaticBldProg$(VBOX_HOSTSUFF_LIB) \
-                $(PATH_STAGE_LIB)/RuntimeBldProg$(VBOX_HOSTSUFF_LIB) \
-        ,) \
         $(TEMPLATE_VBoxBldProg_LIBS)
 TEMPLATE_VBoxAdvBldProg_LIBS.darwin = \

trunk/Maintenance.kmk

@@ -30 +30 @@
         @$(ECHO) ""
         @$(ECHO) "up update         - Update svn and fetch tools."
-        @$(ECHO) "up2 update2       - Update svn and fetch tools, ignore externals (kBuild, kStuff)."
+        @$(ECHO) "up2 update2       - Update svn and fetch tools, ignore externals (kBuild)."
         @$(ECHO) "incs              - Update autogenerated assembly include files in include/."
         @$(ECHO) "snapshot-puel     - Create a source tarball of the PUEL (closed) sources."

trunk/src/VBox/Runtime/Makefile.kmk

@@ -266 +266 @@
         LDR_WITH_ELF32 \
         LDR_WITH_LX \
+        LDR_WITH_MACHO \
         LDR_WITH_PE \
         RT_WITH_VBOX \
@@ -272 +273 @@
         IPRT_WITH_OPENSSL \
         NOFILEID
-ifeq ($(USERNAME),bird)
- RuntimeR3_DEFS += LDR_WITH_MACHO
-endif
 if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
  RuntimeR3_DEFS         += \
@@ -280 +278 @@
 endif
 #RuntimeR3_DEFS         += RTMEM_WRAP_TO_EF_APIS
-ifdef IPRT_WITH_KSTUFF
- RuntimeR3_DEFS        += LDR_WITH_KLDR
-endif
 ifdef IPRT_WITH_LZJB
  RuntimeR3_DEFS        += RTZIP_USE_LZJB
@@ -300 +295 @@
 RuntimeR3_INCS         += \
         $(PATH_ROOT)/src/libs/liblzf-3.4
-ifdef IPRT_WITH_KSTUFF
- RuntimeR3_INCS        += \
-        $(PATH_ROOT)/src/libs/kStuff/kStuff/include
-endif
 
 # RuntimeR3_INCS.solaris  = \
@@ -797 +788 @@
 
 
-ifdef IPRT_WITH_KSTUFF
- RuntimeR3_SOURCES += \
-        common/ldr/ldrkStuff.cpp
-endif
-
 # VBox specific stuff.
 RuntimeR3_SOURCES += \
@@ -1630 +1616 @@
         common/ldr/ldrEx.cpp \
         common/ldr/ldrFile.cpp \
-        common/ldr/ldrkStuff.cpp \
         common/ldr/ldrLX.cpp \
         common/ldr/ldrMachO.cpp \
@@ -1990 +1975 @@
 RuntimeGuestR3_INCS.$(KBUILD_HOST)      := $(RuntimeR3_INCS.$(KBUILD_HOST))
 RuntimeGuestR3_SOURCES                  := $(filter-out \
-        common/ldr/ldrkStuff.cpp \
         common/time/timesupref.cpp \
         common/time/timesupA.asm \
@@ -2139 +2123 @@
         $(PATH_STAGE_LIB)/SUPR3$(VBOX_SUFF_LIB)
 endif
-ifdef IPRT_WITH_KSTUFF
- VBoxRT_LIBS                  += \
-        $(PATH_STAGE_LIB)/VBox-kStuff$(VBOX_SUFF_LIB)
-endif
 ifndef SDK_VBOX_LIBXML2_LIBS
  VBoxRT_LIBS                 += \
@@ -2292 +2272 @@
 VBoxRT-x86_LIBS += \
         $(PATH_STAGE_LIB)/SUPR3-x86$(VBOX_SUFF_LIB)
-endif
-ifdef IPRT_WITH_KSTUFF
- VBoxRT-x86_LIBS                  += \
-        $(PATH_STAGE_LIB)/VBox-kStuff-x86$(VBOX_SUFF_LIB)
 endif
 ifndef SDK_VBOX_LIBXML2_LIBS
@@ -3626 +3602 @@
                 '$(VBOX_PATH_RUNTIME_SRC)/common/string/unidata-lower.cpp' \
                 '$(VBOX_PATH_RUNTIME_SRC)/common/string/unidata-upper.cpp' \
-                '$(VBOX_PATH_RUNTIME_SRC)/common/ldr/ldrkStuff.cpp'
         $(QUIET)$(APPEND) [email protected]
         $(QUIET)$(APPEND) [email protected] 'INPUT = $(foreach x,$(IPRT_DOXYFILE_INPUT),\$(NLTAB)$(x))'

trunk/src/VBox/ValidationKit/Config.kmk

@@ -71 +71 @@
 TEMPLATE_VBoxValidationKitR3_LIBS = \
         $(PATH_STAGE_LIB)/RuntimeR3$(VBOX_SUFF_LIB)
-ifdef IPRT_WITH_KSTUFF
- TEMPLATE_VBoxValidationKitR3_LIBS += \
-        $(PATH_STAGE_LIB)/VBox-kStuffStatic$(VBOX_SUFF_LIB) \
-        $(PATH_STAGE_LIB)/RuntimeR3$(VBOX_SUFF_LIB)
-endif
 ifeq ($(KBUILD_TARGET),solaris)
  TEMPLATE_VBoxValidationKitR3_LIBS += \
@@ -130 +125 @@
         $(PATH_STAGE_LIB)/SUPR3Static$(VBOX_SUFF_LIB) \
         $(PATH_STAGE_LIB)/RuntimeR3$(VBOX_SUFF_LIB)
-ifdef IPRT_WITH_KSTUFF
- TEMPLATE_VBoxValidationKitR3Host_LIBS += \
-        $(PATH_STAGE_LIB)/VBox-kStuffStatic$(VBOX_SUFF_LIB) \
-        $(PATH_STAGE_LIB)/RuntimeR3$(VBOX_SUFF_LIB)
-endif
 ifeq ($(KBUILD_TARGET),solaris)
  TEMPLATE_VBoxValidationKitR3Host_LIBS += \

trunk/src/libs/Makefile.kmk

@@ -51 +51 @@
 endif
 
-# The kStuff lib used by IPRT and the debugger.
-if defined(IPRT_WITH_KSTUFF)
- include $(PATH_SUB_CURRENT)/kStuff/Makefile.kmk
-endif
-
 # OpenSSL.
 if  !defined(VBOX_ONLY_SDK) \