Changeset 74372 in vbox for trunk

Timestamp:

Sep 19, 2018 3:07:27 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/VBoxRTStableChecker: Made it work for x86 Visual C++ too. bugref:9246

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (3 diffs)
• VBox/DefToAsmExterns.sed (modified) (3 diffs)
• VBox/DefToAsmExternsVcc32.sed (copied) (copied from trunk/src/VBox/Runtime/VBox/DefToAsmExterns.sed ) (3 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -2346 +2346 @@
 
 if1of ($(KBUILD_TARGET),win darwin) # remove later
-ifn1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),win.x86)
- if1of (VBoxRT,$(DLLS))
+if1of (VBoxRT,$(DLLS))
  #
  # VBoxRTImpCheck - Import library check.
@@ -2359 +2358 @@
         $(LIB_RUNTIME)
  ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),win.amd64)
-$$(VBoxRTStableCheck_0_OUTDIR)/VBoxRTStableCheckA.asm: $(PATH_SUB_CURRENT)/VBox/VBoxRTImp.def $(PATH_SUB_CURRENT)/VBox/VBoxRTImp-vcc64.def $(PATH_SUB_CURRENT)/r3/win/VBoxRT-win64.def | $$(dir $$@)
+$$(VBoxRTStableCheck_0_OUTDIR)/VBoxRTStableCheckA.asm: \
+       $(PATH_SUB_CURRENT)/VBox/DefToAsmExterns.sed \
+        $(PATH_SUB_CURRENT)/VBox/VBoxRTImp.def \
+        $(PATH_SUB_CURRENT)/VBox/VBoxRTImp-vcc64.def \
+        $(PATH_SUB_CURRENT)/r3/win/VBoxRT-win64.def \
+        | $$(dir $$@)
  else ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),win.x86)
-$$(VBoxRTStableCheck_0_OUTDIR)/VBoxRTStableCheckA.asm: $(PATH_SUB_CURRENT)/VBox/VBoxRTImp.def $(PATH_SUB_CURRENT)/VBox/VBoxRTImp-vcc32.def $(PATH_SUB_CURRENT)/r3/win/VBoxRT-win32.def | $$(dir $$@)
+$$(VBoxRTStableCheck_0_OUTDIR)/VBoxRTStableCheckA.asm: \
+       $(PATH_SUB_CURRENT)/VBox/DefToAsmExternsVcc32.sed \
+        $(PATH_SUB_CURRENT)/VBox/VBoxRTImp.def \
+        $(PATH_SUB_CURRENT)/VBox/VBoxRTImp-vcc32.def \
+        $(PATH_SUB_CURRENT)/r3/win/VBoxRT-win32.def | $$(dir $$@)
  else
-$$(VBoxRTStableCheck_0_OUTDIR)/VBoxRTStableCheckA.asm: $(PATH_SUB_CURRENT)/VBox/VBoxRTImp.def $(PATH_SUB_CURRENT)/VBox/VBoxRTImp-gcc.def | $$(dir $$@)
+$$(VBoxRTStableCheck_0_OUTDIR)/VBoxRTStableCheckA.asm: \
+       $(PATH_SUB_CURRENT)/VBox/DefToAsmExterns.sed \
+        $(PATH_SUB_CURRENT)/VBox/VBoxRTImp.def \
+        $(PATH_SUB_CURRENT)/VBox/VBoxRTImp-gcc.def | $$(dir $$@)
  endif
         $(APPEND) -tn "$@" '%include "iprt/asmdefs.mac"' ''
@@ -2371 +2382 @@
         $(if-expr "$(KBUILD_TARGET)" == "win"   ,, -e "/only-win/d") \
         $(if-expr "$(KBUILD_TARGET)" == "darwin",, -e "/only-darwin/d") \
-                -f $(PATH_ROOT)/src/VBox/Runtime/VBox/DefToAsmExterns.sed \
-                $(filter %.def, $^)
- endif
+                -f "$<" $(filter %.def, $^)
 endif
 endif # remove later

trunk/src/VBox/Runtime/VBox/DefToAsmExterns.sed

@@ -38 +38 @@
 /^$/d
 
+#
 # Handle text after EXPORTS
+#
 /EXPORTS/,//{
 s/^EXPORTS$//
 /^$/b end
-
 
 /[[:space:]]DATA$/b data
@@ -52 +53 @@
 s/^\(.*\)$/EXTERN_IMP2 \1/
 b end
-
 
 #
@@ -65 +65 @@
 b end
 
-
+#
 # next expression
+#
 :end
 

trunk/src/VBox/Runtime/VBox/DefToAsmExternsVcc32.sed

@@ -38 +38 @@
 /^$/d
 
+#
 # Handle text after EXPORTS
+#
 /EXPORTS/,//{
 s/^EXPORTS$//
 /^$/b end
 
-
+/^?/b cpp_export
 /[[:space:]]DATA$/b data
 
@@ -53 +55 @@
 b end
 
-
 #
 # Data export
@@ -61 +62 @@
 b end
 
+#
+# Mangled C++ .
+#
+:cpp_export
+s/^\(.*\)$/extern __imp_\1/
+b end
+
 }
 d
 b end
 
-
+#
 # next expression
+#
 :end