Changeset 657 in vbox

Timestamp:

Feb 6, 2007 1:26:08 AM (18 years ago)

Author:

vboxsync

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

18293

Message:

Sanity checks and fixes for building 32-bit guest stuff correctly when targetting 64-bit systems.

File:

• trunk/src/VBox/Runtime/Makefile (modified) (11 diffs)

trunk/src/VBox/Runtime/Makefile

@@ -35 +35 @@
  endif
  ifdef VBOX_WITH_LINUX_ADDITIONS
-  LIBRARIES += RuntimeLnx32GuestR0 RuntimeLnx32GuestR3
+  LIBRARIES += RuntimeLnx32GuestR3
+  ifeq ($(BUILD_PLATFORM_ARCH),x86) # (AMD64: can't build it and doesn't need it, so skip it.)
+   LIBRARIES += RuntimeLnx32GuestR0
+  endif
  endif
  LIBRARIES.l4= RuntimeR3L4
@@ -121 +124 @@
 
 RuntimeR3_SOURCES       = \
+        misc/sanity-cpp.cpp \
+        misc/sanity-c.c \
         alloc.cpp \
         alloc/heapsimple.cpp \
@@ -385 +390 @@
 #
 RuntimeW32GuestR3_TEMPLATE     = VBOXW32GUESTR3LIB
-RuntimeW32GuestR3_SDKS         = $(RuntimeR3_SDKS.win) $(RuntimeR3_SDKS.win.x86) $(RuntimeR3_SDKS)
-RuntimeW32GuestR3_DEFS         = $(RuntimeR3_DEFS)
-RuntimeW32GuestR3_DEFS.$(BUILD_TYPE) = $(RuntimeR3_DEFS).$(BUILD_TYPE)
+RuntimeW32GuestR3_SDKS         = WINPSDK W2K3DDK
+RuntimeW32GuestR3_DEFS         = IN_RT_R3 IN_SUP_R3 LDR_WITH_NATIVE LDR_WITH_ELF32 LDR_WITH_PE RT_WITH_VBOX
+ifdef IPRT_WITH_KLDR
+ RuntimeW32GuestR3_DEFS       += LDR_WITH_KLDR KLDR_USE_CRT
+ RuntimeW32GuestR3_DEFS.debug += KLDRMOD_STRICT KLDRMODLX_STRICT KLDRMODPE_STRICT KLDRMODNATIVE_STRICT KLDRRDR_STRICT
+endif
 RuntimeW32GuestR3_SOURCES      = $(RuntimeR3_SOURCES.win) $(RuntimeR3_SOURCES)
 RuntimeW32GuestR3_INCS         = $(RuntimeR3_INCS.win)    $(RuntimeR3_INCS)
@@ -396 +404 @@
 #
 RuntimeLnx32GuestR3_TEMPLATE   = VBOXLNX32GUESTR3LIB
-RuntimeLnx32GuestR3_DEFS       = $(RuntimeR3_DEFS.linux)    $(RuntimeR3_DEFS)    IN_GUEST IN_GUEST_R3
-RuntimeLnx32GuestR3_DEFS.$(BUILD_TYPE) = $(RuntimeR3_DEFS.$(BUILD_TYPE))
+RuntimeLnx32GuestR3_DEFS       = IN_RT_R3 IN_SUP_R3 LDR_WITH_NATIVE LDR_WITH_ELF32 LDR_WITH_PE RT_WITH_VBOX
+ifdef IPRT_WITH_KLDR
+ RuntimeLnx32GuestR3_DEFS     += LDR_WITH_KLDR KLDR_USE_CRT
+ RuntimeLnx32GuestR3_DEFS.debug += KLDRMOD_STRICT KLDRMODLX_STRICT KLDRMODPE_STRICT KLDRMODNATIVE_STRICT KLDRRDR_STRICT
+endif
 RuntimeLnx32GuestR3_SOURCES    = $(RuntimeR3_SOURCES.linux) $(RuntimeR3_SOURCES)
 RuntimeLnx32GuestR3_INCS       = $(RuntimeR3_INCS.linux)    $(RuntimeR3_INCS)
@@ -427 +438 @@
         iconv
 VBoxRT_LIBPATH.freebsd         = \
-        /usr/local/lib  
+        /usr/local/lib
 VBoxRT_LDFLAGS.darwin          = -framework IOKit
 ifdef VBOX_USE_VCC80
@@ -451 +462 @@
 RuntimeR3NoCRTGCC_TEMPLATE = VBOXNOCRTGCC
 RuntimeR3NoCRTGCC_SOURCES  = \
+        misc/sanity-cpp.cpp \
+        misc/sanity-c.c \
         \
         math/ceill.asm \
@@ -499 +512 @@
 RuntimeR0_DEFS          = IN_RT_R0 RT_WITH_VBOX
 RuntimeR0_SOURCES       = \
+        misc/sanity-cpp.cpp \
+        misc/sanity-c.c \
         assert.cpp \
         table/avlhcphys.cpp \
@@ -559 +574 @@
 
 RuntimeR0Drv_SOURCES    = \
+        misc/sanity-cpp.cpp \
+        misc/sanity-c.c \
         assert.cpp \
         log.cpp \
@@ -631 +648 @@
 RuntimeW32GuestR0_TEMPLATE      = VBOXW32GUESTR0LIB
 RuntimeW32GuestR0_SDKS          = W2K3DDKX86 WINPSDKINCS
-RuntimeW32GuestR0_DEFS          = $(RuntimeR0Drv_DEFS.win) $(RuntimeR0Drv_DEFS.win.x86) $(RuntimeR0Drv_DEFS)
-RuntimeW32GuestR0_INCS          = $(RuntimeR0Drv_INCS.win) $(RuntimeR0Drv_INCS.win.x86) $(RuntimeR0Drv_INCS)
+RuntimeW32GuestR0_DEFS          = IN_RT_R0 RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS  IN_SUP_R0
 RuntimeW32GuestR0_SOURCES       = \
         $(RuntimeR0Drv_SOURCES) \
@@ -662 +678 @@
 #
 RuntimeLnx32GuestR0_TEMPLATE      = VBOXLNX32GUESTR0
-RuntimeLnx32GuestR0_DEFS          = $(RuntimeR0Drv_DEFS.linux) $(RuntimeR0Drv_DEFS) IN_GUEST IN_GUEST_R0
+RuntimeLnx32GuestR0_DEFS          = RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS IN_SUP_R0 \
+                                    MODULE KBUILD_MODNAME=KBUILD_STR\(vboxdrv\) KBUILD_BASENAME=KBUILD_STR\(vboxdrv\)
 RuntimeLnx32GuestR0_INCS          = $(RuntimeR0Drv_INCS.linux) $(RuntimeR0Drv_INCS)
 RuntimeLnx32GuestR0_SOURCES       = \
@@ -675 +692 @@
 RuntimeGC_DEFS          = IN_RT_GC RT_WITH_VBOX
 RuntimeGC_SOURCES       = \
+        misc/sanity-cpp.cpp \
+        misc/sanity-c.c \
         table/avlogcphys.cpp \
         table/avlrogcphys.cpp \