* coff-objfmt.c: Add "x64" as an alias for "win64" (when selecting object

formats).  This makes integration with the VC8 build tools much nicer, as
VC8 uses "x64" as the PlatformName environment setting.

* win64/Makefile.inc, Mkfiles/Makefile.flat, Mkfiles/Makefile.dj: Update
build files to look for objfmt_x64 module.

Suggested by: Brian Gladman <brg@gladman.plus.com>

svn path=/trunk/yasm/; revision=1331

diff --git a/Mkfiles/Makefile.dj b/Mkfiles/Makefile.dj
index 1305fe1225da6bed29c08cee570503ac2e7c7539..4aeec1f1719718dd5517f802935096d548a7b101 100644 (file)
--- a/Mkfiles/Makefile.dj
+++ b/Mkfiles/Makefile.dj
@@ -76,7 +76,7 @@ MODULES_OBJFMTS_OBJS= \
  modules/objfmts/xdf/xdf-objfmt.o
 YASM_MODULES+=objfmt_dbg
 YASM_MODULES+=objfmt_bin
-YASM_MODULES+=objfmt_coff objfmt_win32 objfmt_win64
+YASM_MODULES+=objfmt_coff objfmt_win32 objfmt_win64 objfmt_x64
 YASM_MODULES+=objfmt_elf objfmt_elf32 objfmt_elf64
 YASM_MODULES+=objfmt_xdf
 

diff --git a/Mkfiles/Makefile.flat b/Mkfiles/Makefile.flat
index df2a794799f722aac6d66ddfd2963e41b46fad3a..e02e403c0366c62657c160bc02e1da61479798b7 100644 (file)
--- a/Mkfiles/Makefile.flat
+++ b/Mkfiles/Makefile.flat
@@ -79,7 +79,7 @@ MODULES_OBJFMTS_OBJS= \
  modules/objfmts/xdf/xdf-objfmt.o
 YASM_MODULES+=objfmt_dbg
 YASM_MODULES+=objfmt_bin
-YASM_MODULES+=objfmt_coff objfmt_win32 objfmt_win64
+YASM_MODULES+=objfmt_coff objfmt_win32 objfmt_win64 objfmt_x64
 YASM_MODULES+=objfmt_elf objfmt_elf32 objfmt_elf64
 YASM_MODULES+=objfmt_xdf
 

diff --git a/modules/objfmts/coff/coff-objfmt.c b/modules/objfmts/coff/coff-objfmt.c
index 4c2d2d8e3a3c745e1c4e36c92152cc897d71bfce..31d3da970ffee623133d96000d18488502c03318 100644 (file)
--- a/modules/objfmts/coff/coff-objfmt.c
+++ b/modules/objfmts/coff/coff-objfmt.c
@@ -1587,3 +1587,20 @@ yasm_objfmt_module yasm_win64_LTX_objfmt = {
     coff_objfmt_common_declare,
     win32_objfmt_directive
 };
+yasm_objfmt_module yasm_x64_LTX_objfmt = {
+    "Win64",
+    "x64",
+    "obj",
+    ".text",
+    64,
+    coff_objfmt_dbgfmt_keywords,
+    "null",
+    win64_objfmt_create,
+    coff_objfmt_output,
+    coff_objfmt_destroy,
+    coff_objfmt_section_switch,
+    coff_objfmt_extern_declare,
+    coff_objfmt_global_declare,
+    coff_objfmt_common_declare,
+    win32_objfmt_directive
+};

diff --git a/modules/objfmts/win64/Makefile.inc b/modules/objfmts/win64/Makefile.inc
index 003ca6a56a024d3f3937ecf8258f74871b5a867c..72dcd7161dd6093dda1d7f4b80c2253839f6eadc 100644 (file)
--- a/modules/objfmts/win64/Makefile.inc
+++ b/modules/objfmts/win64/Makefile.inc
@@ -2,7 +2,7 @@
 
 # Assume objfmt_coff is included
 
-YASM_MODULES += objfmt_win64
+YASM_MODULES += objfmt_win64 objfmt_x64
 
 EXTRA_DIST += modules/objfmts/win64/tests/Makefile.inc