Changeset 6657 in vbox
- Timestamp:
- Jan 31, 2008 2:11:49 PM (17 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
-
Config.kmk (modified) (2 diffs)
-
src/VBox/Additions/common/VBoxGuest/Makefile.kmk (modified) (1 diff)
-
src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk (modified) (3 diffs)
-
src/VBox/Runtime/Makefile.kmk (modified) (7 diffs)
-
src/VBox/Runtime/common/misc/assert.cpp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r6654 r6657 2631 2631 2632 2632 2633 2634 2635 ifdef VBOX_WITH_OS2_ADDITIONS2636 2637 #2638 # Template for building R3 OS/2 guest additions.2639 #2640 TEMPLATE_VBOXOS2GUESTR3 = VBox OS/2 Guest Programs and DLLs2641 TEMPLATE_VBOXOS2GUESTR3_INST = $(INST_ADDITIONS)os2/2642 TEMPLATE_VBOXOS2GUESTR3_BLD_TRG = os22643 TEMPLATE_VBOXOS2GUESTR3_BLD_TRG_ARCH = x862644 TEMPLATE_VBOXOS2GUESTR3_BLD_TRG_CPU = blend2645 TEMPLATE_VBOXOS2GUESTR3_DEFS = IN_GUEST IN_GUEST_R3 IN_RING3 IN_RT_R3 HC_ARCH_BITS=32 GC_ARCH_BITS=322646 TEMPLATE_VBOXOS2GUESTR3_ASTOOL = NASM2647 TEMPLATE_VBOXOS2GUESTR3_ASFLAGS = -f obj -DASM_FORMAT_OMF -D__NASM__ -w+orphan-labels -g2648 TEMPLATE_VBOXOS2GUESTR3_DLLSUFF = .dll2649 TEMPLATE_VBOXOS2GUESTR3_EXESUFF = .exe2650 TEMPLATE_VBOXOS2GUESTR3_LIBSUFF = .lib2651 TEMPLATE_VBOXOS2GUESTR3_ARLIBSUFF = .lib2652 TEMPLATE_VBOXOS2GUESTR3_TOOL = GXX3OMF2653 TEMPLATE_VBOXOS2GUESTR3_CXXFLAGS = -g -Wall -pedantic -Wno-long-long -Wno-trigraphs -pipe -fno-strict-aliasing -fno-rtti -fno-exceptions2654 TEMPLATE_VBOXOS2GUESTR3_CFLAGS = -g -Wall -pedantic -Wno-long-long -Wno-trigraphs -pipe -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -fno-strict-aliasing2655 ifneq ($(BUILD_TYPE),debug)2656 TEMPLATE_VBOXOS2GUESTR3_CFLAGS += -O2 -fno-omit-frame-pointer2657 TEMPLATE_VBOXOS2GUESTR3_CXXFLAGS += -O2 -fno-omit-frame-pointer2658 endif2659 TEMPLATE_VBOXOS2GUESTR3_INCS = \2660 $(VBOX_PATH_SDK)/include2661 2662 #2663 # Template for building OS/2 guest R3 libraries.2664 #2665 TEMPLATE_VBOXOS2GUESTR3LIB = VBox OS/2 Guest Usermode Libraries2666 TEMPLATE_VBOXOS2GUESTR3LIB_EXTENDS = VBOXOS2GUESTR32667 TEMPLATE_VBOXOS2GUESTR3LIB_INST = $(INST_ADDITIONS_LIB)os2/2668 2669 #2670 # Template for building OS/2 Guest R0 images.2671 #2672 TEMPLATE_VBOXOS2GUESTR0 = VBox OS/2 Guest Driver2673 TEMPLATE_VBOXOS2GUESTR0_INST = $(INST_ADDITIONS)os2/2674 TEMPLATE_VBOXOS2GUESTR0_BLD_TRG = os22675 TEMPLATE_VBOXOS2GUESTR0_BLD_TRG_ARCH = x862676 TEMPLATE_VBOXOS2GUESTR0_BLD_TRG_CPU = blend2677 TEMPLATE_VBOXOS2GUESTR0_DEFS = IN_RING0 IN_GUEST IN_GUEST_R0 IN_RT_R0 HC_ARCH_BITS=32 GC_ARCH_BITS=32 LOG_TO_BACKDOOR2678 TEMPLATE_VBOXOS2GUESTR0_SYSSUFF = .sys2679 TEMPLATE_VBOXOS2GUESTR0_ASTOOL = NASM2680 TEMPLATE_VBOXOS2GUESTR0_ASFLAGS = -f obj -DASM_FORMAT_OMF -D__NASM__ -w+orphan-labels -g2681 TEMPLATE_VBOXOS2GUESTR0_TOOL = GXX3OMF2682 TEMPLATE_VBOXOS2GUESTR0_CXXFLAGS = -g -Wall -pedantic -Wno-long-long -Wno-trigraphs -pipe -fno-strict-aliasing -fno-rtti -fno-exceptions2683 TEMPLATE_VBOXOS2GUESTR0_CFLAGS = -g -Wall -pedantic -Wno-long-long -Wno-trigraphs -pipe -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -fno-strict-aliasing2684 ifneq ($(BUILD_TYPE),debug)2685 TEMPLATE_VBOXOS2GUESTR0_CFLAGS += -O2 -fno-omit-frame-pointer2686 TEMPLATE_VBOXOS2GUESTR0_CXXFLAGS += -O2 -fno-omit-frame-pointer2687 endif2688 TEMPLATE_VBOXOS2GUESTR0_LIBS = $(VBOX_GCC_LIBGCC) ## @todo this isn't nice.2689 TEMPLATE_VBOXOS2GUESTR0_LDFLAGS = -Zlinker Option -Zlinker internalrelocs, -Zlinker togglerelocs2690 2691 #2692 # Template for building OS/2 Guest R0 libraries.2693 #2694 TEMPLATE_VBOXOS2GUESTR0LIB = VBox OS/2 Guest Driver Library2695 TEMPLATE_VBOXOS2GUESTR0LIB_EXTENDS = VBOXOS2GUESTR02696 TEMPLATE_VBOXOS2GUESTR0LIB_INST = $(INST_ADDITIONS_LIB)os2/2697 2698 #2699 # OS/2 Guest Libraries.2700 #2701 VBOX_LIB_IPRT_OS2_GUEST_R0 = $(PATH_LIB)/additions/os2/RuntimeOS2GuestR0.lib2702 VBOX_LIB_IPRT_OS2_GUEST_R3 = $(PATH_LIB)/additions/os2/RuntimeOS2GuestR3.lib2703 VBOX_LIB_VBGL_OS2_R3 = $(PATH_LIB)/additions/os2/VBoxGuestR3LibOS2.lib2704 VBOX_LIB_VBGL_OS2_R0BASE = $(PATH_LIB)/additions/os2/VBoxGuestR0LibBaseOS2.lib2705 VBOX_LIB_VBGL_OS2_R0 = $(PATH_LIB)/additions/os2/VBoxGuestR0LibOS2.lib2706 2707 endif # VBOX_WITH_OS2_ADDITIONS2708 2709 2710 2633 # 2711 2634 # Template for building R3 programs for the guest additions. … … 2799 2722 # The _MINI and _SHARED are both compiled as PIC and intended for linking into a .so/.dll/.dylib. 2800 2723 # 2801 ifeq ($(BUILD_TARGET),os2)2802 VBOX_LIB_IPRT_GUEST_R3 = $(VBOX_PATH_ADDITIONS_LIB)/os2/RuntimeOS2GuestR3$(VBOX_SUFF_LIB)2803 else2804 2724 VBOX_LIB_IPRT_GUEST_R3 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3$(VBOX_SUFF_LIB) 2805 endif2806 2725 VBOX_LIB_IPRT_GUEST_R3_MINI = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3Mini$(VBOX_SUFF_LIB) 2807 2726 VBOX_LIB_IPRT_GUEST_R0 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR0$(VBOX_SUFF_LIB) 2808 ifeq ($(BUILD_TARGET),os2)2809 VBOX_LIB_VBGL_R3 = $(VBOX_PATH_ADDITIONS_LIB)/os2/VBoxGuestR3LibOS2$(VBOX_SUFF_LIB)2810 else2811 2727 VBOX_LIB_VBGL_R3 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3Lib$(VBOX_SUFF_LIB) 2812 endif2813 2728 VBOX_LIB_VBGL_R3_XFREE86 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3LibXFree86$(VBOX_SUFF_LIB) 2814 2729 VBOX_LIB_VBGL_R3_SHARED = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3LibShared$(VBOX_SUFF_LIB) -
trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk
r6361 r6657 20 20 include $(PATH_KBUILD)/subheader.kmk 21 21 22 # 23 # VBoxGuest.sys - The OS/2 driver. 24 # 25 ifeq ($(BUILD_PLATFORM),os2) 26 ifdef VBOX_WITH_OS2_ADDITIONS 27 SYSMODS.os2 += VBoxGuest 28 endif 29 VBoxGuest_TEMPLATE = VBOXOS2GUESTR0 30 VBoxGuest_DEFS = VBGL_VBOXGUEST VBOX_HGCM 31 VBoxGuest_INCS := $(PATH_SUB_CURRENT) 32 #VBoxGuest_LDFLAGS = -s -t -v 33 VBoxGuest_SOURCES = \ 34 VBoxGuestA-os2.asm \ 35 VBoxGuest-os2.def 36 VBoxGuest_LIBS = \ 37 $(TARGET_VBoxGuestLib) \ 38 $(VBOX_LIB_VBGL_OS2_R0BASE) \ 39 $(VBOX_LIB_IPRT_OS2_GUEST_R0) \ 40 $(VBOX_GCC_LIBGCC) \ 41 end 22 # PORTME: OSes using mixed case driver names join OS/2, the others join Solaris below. 42 23 43 ## When debugging init with kDrvTest: 44 #VBoxGuest_NAME = VBoxGst 24 if1of ($(BUILD_TARGET),os2) 25 # 26 # VBoxGuest - The Guest Additions Driver (mixed case). 27 # 28 ifdef VBOX_WITH_OS2_ADDITIONS 29 SYSMODS.os2 += VBoxGuest 30 LIBRARIES += VBoxGuestLibOs2Hack 31 endif 32 VBoxGuest_TEMPLATE = VBOXGUESTR0 33 VBoxGuest_DEFS = VBGL_VBOXGUEST VBOX_HGCM 34 VBoxGuest_INCS := $(PATH_SUB_CURRENT) 35 ifneq ($(BUILD_TARGET),os2) 36 VBoxGuest_SOURCES = \ 37 VBoxGuest-$(BUILD_TARGET).cpp \ 38 VBoxGuest.cpp 39 VBoxGuest_LIBS = \ 40 $(VBOX_LIB_VBGL_R0BASE) \ 41 $(VBOX_LIB_IPRT_GUEST_R0) 42 else # OS/2: 43 # The library order is crusial, so a bit of trickery is necessary. 44 # A library is used to make sure that VBoxGuestA-os2.asm is first in the link. (temporary hack?) 45 VBoxGuest_SOURCES = \ 46 VBoxGuestA-os2.asm \ 47 VBoxGuest-os2.def 48 #VBoxGuest_LDFLAGS = -s -t -v 49 VBoxGuest_LIBS = \ 50 $(TARGET_VBoxGuestLibOs2Hack) \ 51 $(VBOX_LIB_VBGL_R0BASE) \ 52 $(VBOX_LIB_IPRT_GUEST_R0) \ 53 $(VBOX_GCC_LIBGCC) \ 54 end 55 ## When debugging init with kDrvTest: 56 #VBoxGuest_NAME = VBoxGst 57 58 VBoxGuestLibOs2Hack_TEMPLATE = VBOXGUESTR0LIB 59 VBoxGuestLibOs2Hack_NOINST = 1 60 VBoxGuestLibOs2Hack_DEFS = $(VBoxGuest_DEFS) 61 VBoxGuestLibOs2Hack_INCS := \ 62 $(PATH_SUB_CURRENT) \ 63 $(PATH_TARGET) \ 64 $(PATH_ROOT)/src/VBox/Runtime/include # for the os2ddk 65 VBoxGuestLibOs2Hack_SOURCES = \ 66 VBoxGuest-os2.cpp \ 67 VBoxGuest.cpp 68 endif # OS/2 45 69 46 # temp hack to ensure that VBoxGuestA-os2.asm is first in the link. 47 ifdef VBOX_WITH_OS2_ADDITIONS 48 LIBRARIES += VBoxGuestLib 49 endif 50 VBoxGuestLib_TEMPLATE = VBOXOS2GUESTR0LIB 51 VBoxGuestLib_NOINST = 1 52 VBoxGuestLib_DEFS = VBGL_VBOXGUEST VBOX_HGCM 53 VBoxGuestLib_INCS := \ 54 $(PATH_SUB_CURRENT) \ 55 $(PATH_TARGET) \ 56 $(PATH_ROOT)/src/VBox/Runtime/include 57 VBoxGuestLib_SOURCES = \ 58 VBoxGuest-os2.cpp \ 59 VBoxGuest.cpp 60 endif 61 62 # 63 # vboxadd.o - The Solaris Guest Driver. 64 # 65 ifeq ($(BUILD_PLATFORM),solaris) 66 SYSMODS.solaris += vboxadd 67 vboxadd_TEMPLATE = VBOXGUESTR0 68 vboxadd_DEFS = VBGL_VBOXGUEST VBOX_HGCM 69 vboxadd_INCS := $(PATH_SUB_CURRENT) \ 70 $(PATH_ROOT)/src/VBox/Runtime/r0drv/solaris 71 vboxadd_SOURCES = \ 72 VBoxGuest-solaris.c \ 73 VBoxGuest.cpp 74 vboxadd_LIBS = \ 75 $(VBOX_LIB_VBGL_R0BASE) \ 76 $(VBOX_LIB_IPRT_GUEST_R0) 70 else if1of ($(BUILD_TARGET),solaris) 71 # 72 # vboxguest - The Guest Additions Driver (lower cased). 73 # 74 ## @todo rename to vboxguest, please. 75 SYSMODS.solaris += vboxadd 76 vboxadd_TEMPLATE = VBOXGUESTR0 77 vboxadd_DEFS = VBGL_VBOXGUEST VBOX_HGCM 78 vboxadd_INCS := $(PATH_SUB_CURRENT) 79 vboxadd_INCS.solaris = $(PATH_ROOT)/src/VBox/Runtime/r0drv/solaris 80 vboxadd_SOURCES = \ 81 VBoxGuest-$(BUILD_TARGET).c \ 82 VBoxGuest.cpp 83 vboxadd_LIBS = \ 84 $(VBOX_LIB_VBGL_R0BASE) \ 85 $(VBOX_LIB_IPRT_GUEST_R0) 86 77 87 endif 78 88 -
trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
r6654 r6657 20 20 include $(PATH_KBUILD)/subheader.kmk 21 21 22 if 1of ($(BUILD_TARGET),solaris)22 ifn1of ($(BUILD_TARGET),l4 linux windows) 23 23 LIBRARIES += \ 24 24 VBoxGuestR0Lib \ 25 25 VBoxGuestR0LibBase 26 ifneq ($(BUILD_TARGET),win) 27 LIBRARIES += \ 26 LIBRARIES += \ 28 27 VBoxGuestR3Lib \ 29 28 VBoxGuestR3LibShared 29 if1of ($(BUILD_TARGET),freebsd linux netbsd openbsd) 30 LIBRARIES += \ 31 VBoxGuestR3LibXFree86 30 32 endif 31 33 else … … 53 55 VBoxGuestR3LibXFree86 \ 54 56 VBoxGuestR3LibLinux 55 endif56 ifdef VBOX_WITH_OS2_ADDITIONS57 LIBRARIES += \58 VBoxGuestR0LibOS2 \59 VBoxGuestR0LibBaseOS2 \60 VBoxGuestR3LibOS261 57 endif 62 58 endif … … 199 195 200 196 201 #202 # VBoxGuestR0LibOS2203 #204 VBoxGuestR0LibOS2_TEMPLATE = VBOXOS2GUESTR0LIB205 VBoxGuestR0LibOS2_SOURCES = $(VBoxGuestR0Lib_SOURCES)206 VBoxGuestR0LibOS2_INCS = $(VBoxGuestLib_INCS)207 VBoxGuestR0LibOS2_DEFS = VBOX_HGCM208 209 #210 # VBoxGuestR0LibBaseOS2211 #212 VBoxGuestR0LibBaseOS2_TEMPLATE = VBOXOS2GUESTR0LIB213 VBoxGuestR0LibBaseOS2_SOURCES = $(VBoxGuestR0LibBase_SOURCES)214 VBoxGuestR0LibBaseOS2_INCS = $(VBoxGuestLib_INCS)215 VBoxGuestR0LibBaseOS2_DEFS = VBOX_HGCM VBGL_VBOXGUEST216 217 #218 # VBoxGuestR3LibBaseOS2219 #220 VBoxGuestR3LibOS2_TEMPLATE = VBOXOS2GUESTR3LIB221 VBoxGuestR3LibOS2_DEFS = VBOX_HGCM222 VBoxGuestR3LibOS2_SOURCES = $(VBoxGuestR3Lib_SOURCES)223 224 225 197 include $(PATH_KBUILD)/subfooter.kmk 226 198 -
trunk/src/VBox/Runtime/Makefile.kmk
r6604 r6657 35 35 ifeq ($(BUILD_TARGET),linux) 36 36 LIBRARIES = RuntimeLnx32GuestR0 RuntimeLnx32GuestR3 RuntimeGuestR3Mini 37 else ifeq ($(BUILD_TARGET),os2)38 LIBRARIES = RuntimeOS2GuestR0 RuntimeOS2GuestR3 #RuntimeOS2Warp3GuestR039 37 else ifeq ($(BUILD_TARGET),win) 40 38 LIBRARIES = RuntimeW32GuestR0 RuntimeW32GuestR3 RuntimeW32NT4GuestR0 … … 73 71 endif 74 72 endif 75 else ifeq ($(BUILD_TARGET),os2) ## @todo RuntimeOS2Guest* -> RuntimeGuest*76 ifdef VBOX_WITH_OS2_ADDITIONS77 LIBRARIES += RuntimeOS2GuestR0 RuntimeOS2GuestR378 endif79 73 else 80 74 LIBRARIES += RuntimeGuestR0 RuntimeGuestR3 RuntimeGuestR3Mini 75 #LIBRARIES.os2 = RuntimeOS2Warp3GuestR0 81 76 endif 82 #LIBRARIES.os2 = RuntimeOS2Warp3GuestR083 77 endif # VBOX_WITH_ADDITIONS 84 78 LIBRARIES.l4 = RuntimeR3L4 … … 525 519 # RuntimeGuestR3Mini - Minimal Guest Additions Runtime which does not require 526 520 # initialization and can be linked into an .so. Intended 527 # for X11 drivers .521 # for X11 drivers, GRADD and similar. 528 522 # 529 523 RuntimeGuestR3Mini_TEMPLATE := VBOXGUESTR3DLL … … 594 588 RuntimeLnx32GuestR3_SOURCES += VBox/logbackdoor.cpp 595 589 RuntimeLnx32GuestR3_INCS = $(RuntimeR3_INCS.linux) $(RuntimeR3_INCS) 596 597 598 #599 # RuntimeOS2GuestR3 - OS/2 guest program runtime.600 #601 RuntimeOS2GuestR3_TEMPLATE = VBOXOS2GUESTR3LIB602 RuntimeOS2GuestR3_DEFS = IN_RT_R3 IN_SUP_R3 LDR_WITH_NATIVE LDR_WITH_ELF32 LDR_WITH_PE RT_WITH_VBOX603 ifdef IPRT_WITH_KSTUFF604 RuntimeOS2GuestR3_DEFS += LDR_WITH_KLDR605 endif606 RuntimeOS2GuestR3_SOURCES = $(RuntimeR3_SOURCES.os2) $(RuntimeR3_SOURCES)607 RuntimeOS2GuestR3_INCS = $(RuntimeR3_INCS.os2) $(RuntimeR3_INCS)608 590 609 591 … … 1038 1020 endif 1039 1021 1022 RuntimeOS2GuestR0_TEMPLATE = VBOXOS2GUESTR0LIB 1023 RuntimeOS2GuestR0_SOURCES = \ 1024 $(filter-out common/misc/assert.cpp generic/RTLogWriteUser-generic.cpp,$(RuntimeR0Drv_SOURCES)) \ 1025 $(RuntimeR0Drv_SOURCES.os2) \ 1026 VBox/logbackdoor.cpp 1040 1027 1041 1028 # … … 1073 1060 # 1074 1061 # RuntimeLnx32GuestR0 - 32-bit Linux guest driver runtime. 1075 # 1062 # 1063 ## @todo remove this and use RuntimeGuestR0. 1076 1064 RuntimeLnx32GuestR0_TEMPLATE = VBOXLNX32GUESTR0 1077 1065 RuntimeLnx32GuestR0_DEFS = RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS IN_SUP_R0 \ … … 1081 1069 $(RuntimeR0Drv_SOURCES) \ 1082 1070 $(RuntimeR0Drv_SOURCES.linux) \ 1083 VBox/logbackdoor.cpp1084 1085 1086 #1087 # RuntimeOS2GuestR0 - OS/2 Warp 4.5 guest driver runtime.1088 #1089 RuntimeOS2GuestR0_TEMPLATE = VBOXOS2GUESTR0LIB1090 RuntimeOS2GuestR0_INCS := $(PATH_SUB_CURRENT)1091 RuntimeOS2GuestR0_DEFS = RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS1092 RuntimeOS2GuestR0_SOURCES = \1093 $(filter-out common/misc/assert.cpp generic/RTLogWriteUser-generic.cpp,$(RuntimeR0Drv_SOURCES)) \1094 $(RuntimeR0Drv_SOURCES.os2) \1095 1071 VBox/logbackdoor.cpp 1096 1072 -
trunk/src/VBox/Runtime/common/misc/assert.cpp
r5999 r6657 38 38 39 39 40 #ifdef IN_GUEST_R0 40 #if defined(IN_GUEST_R0) && (defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)) 41 /* 42 * This is legacy that should be eliminated. OS specific code deals with 43 * R0 assertions now and it will do the backdoor printfs in addition to 44 * proper OS specific printfs and panics / BSODs / IPEs. 45 */ 41 46 #include <VBox/log.h> 42 47 … … 75 80 } 76 81 77 # if defined(RT_OS_LINUX) && defined(IN_MODULE)82 # if defined(RT_OS_LINUX) && defined(IN_MODULE) 78 83 /* 79 84 * When we build this in the Linux kernel module, we wish to make the 80 85 * symbols available to other modules as well. 81 86 */ 82 # include "the-linux-kernel.h"87 # include "the-linux-kernel.h" 83 88 EXPORT_SYMBOL(AssertMsg1); 84 89 EXPORT_SYMBOL(AssertMsg2); 85 # endif90 # endif 86 91 87 92 #elif defined(IN_RING0)
Note:
See TracChangeset
for help on using the changeset viewer.
