Changeset 42595 in vbox for trunk/src/recompiler

Timestamp:

Aug 5, 2012 2:37:25 AM (13 years ago)

Author:

vboxsync

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

79780

Message:

REM/Makefile.kmk: MinGW-W64 experiments.

File:

• trunk/src/recompiler/Makefile.kmk (modified) (6 diffs)

trunk/src/recompiler/Makefile.kmk

@@ -44 +44 @@
  VBoxRemPrimary_TEMPLATE       = DUMMY
  VBoxRemPrimary_TOOL.win.x86   = MINGW32
- VBoxRemPrimary_TOOL.win.amd64 = XGCCAMD64LINUX
+ ifdef VBOX_USE_MINGWW64
+  VBoxRemPrimary_TOOL.win.amd64 = MINGWW64
+ else
+  VBoxRemPrimary_TOOL.win.amd64 = XGCCAMD64LINUX
+ endif
  VBoxRemPrimary_SDKS.win.x86   = W32API
  VBoxRemPrimary_ASFLAGS        = -x assembler-with-cpp
@@ -105 +109 @@
         Sun/testmath.c
 VBoxRemPrimary_SOURCES.win.x86 = $(VBoxREMImp_0_OUTDIR)/VBoxREMWin.def
-
+ifdef VBOX_USE_MINGWW64
+VBoxRemPrimary_SOURCES.win.amd64 = $(VBoxREMImp_0_OUTDIR)/VBoxREMWin.def
+endif
+
+ifndef VBOX_USE_MINGWW64
 VBoxRemPrimary_LIBS            = \
         $(LIB_VMM) \
         $(LIB_RUNTIME)
+else
+VBoxRemPrimary_LIBS            = \
+        $(VBoxRemPrimary_0_OUTDIR)/VBoxVMMImp.a \
+        $(VBoxRemPrimary_0_OUTDIR)/VBoxRTImp.a
+VBoxRemPrimary_CLEAN           = \
+        $(VBoxRemPrimary_0_OUTDIR)/VBoxVMMImp.a \
+        $(VBoxRemPrimary_0_OUTDIR)/VBoxVMMImp.def \
+        $(VBoxRemPrimary_0_OUTDIR)/VBoxRTImp.a \
+        $(VBoxRemPrimary_0_OUTDIR)/VBoxRTImp.def
+endif
 
 VBoxRemPrimary_LDFLAGS.solaris = -mimpure-text
@@ -114 +132 @@
 
 
-if "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "win.amd64"
+if "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "win.amd64" && !defined(VBOX_USE_MINGWW64)
  #
  # VBoxREM2/VBoxRemPrimary - Currently only used by 64-bit Windows.
@@ -126 +144 @@
         Sun/e_powl-$(KBUILD_TARGET_ARCH).S
  VBoxRemPrimary_INCS      += \
-        Sun/crt
+        Sun/crt
  VBoxRemPrimary_SYSSUFF    = .rel
  VBoxRemPrimary_LIBS       = \
@@ -167 +185 @@
  VBoxRemPrimary_NAME       = VBoxREM
  VBoxRemPrimary_LDFLAGS.darwin = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxREM3.dylib
+
+ ifdef VBOX_USE_MINGWW64
+  # GNU ld (rubenvb-4.5.4) 2.22.52.20120716 doesn't fix up rip relative
+  # addressing in the import libraries generated by microsoft link.exe. So, we
+  # have to regenerate these.
+  $$(VBoxRemPrimary_0_OUTDIR)/VBoxVMMImp.a \
+  $$(VBoxRemPrimary_0_OUTDIR)/VBoxRTImp.a : $$(VBoxRemPrimary_0_OUTDIR)/$$(notdir $$(basename $$@)).def
+        $(TOOL_MINGWW64_DLLTOOL) --output-lib "$@" --input-def "$<" --dllname "$(patsubst %Imp.a,%.dll,$(notdir $@))"
+
+  $$(VBoxRemPrimary_0_OUTDIR)/VBoxVMMImp.def \
+  $$(VBoxRemPrimary_0_OUTDIR)/VBoxRTImp.def : \
+                $(PATH_STAGE_BIN)/$$(patsubst %Imp.def,%.dll,$$(notdir $$@)) \
+               | $$(dir $$@)
+        $(APPEND) -nt $@ "LIBRARY $(notdir $<)" "EXPORTS"
+        $(TOOL_$(VBOX_VCC_TOOL)_DUMPBIN) /EXPORTS "$<" \
+                | $(SED) -e '/ = /!d' \
+                         -e 's/^.* \([^ ][^ ]*\) = .*$(DOLLAR)/  \"\1\"/' \
+                         --append $@
+ endif # VBOX_USE_MINGWW64
+
 endif
 
@@ -186 +224 @@
  VBoxREMWrapper_SOURCES    = \
         VBoxREMWrapper.cpp
- if "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "win.amd64"
+ if "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "win.amd64" && !defined(VBOX_USE_MINGWW64)
   VBoxREMWrapper_SOURCES  += \
         VBoxREMWrapperA.asm