Index: reloc.ml
===================================================================
--- reloc.ml	(révision 195)
+++ reloc.ml	(copie de travail)
@@ -160,10 +160,10 @@

 let gcclib () =
   let extra = match !toolchain with
-  | `MINGW -> "-mno-cygwin "
+  | `MINGW -> "i686-w64-mingw32-"
   | _ -> ""
   in
-  Filename.dirname (get_output1 ~use_bash:(!toolchain = `CYGWIN) (Printf.sprintf "gcc %s-print-libgcc-file-name" extra))
+  Filename.dirname (get_output1 ~use_bash:(!toolchain = `CYGWIN) (Printf.sprintf "%sgcc -print-libgcc-file-name" extra))

 let file_exists fn =
   if Sys.file_exists fn && not (Sys.is_directory fn) then Some fn
@@ -494,7 +494,8 @@
       failwith "Creation of import library not supported for this toolchain"
   | `CYGWIN | `MINGW ->
       let dmp = temp_file "dyndll" ".dmp" in
-      if cmd_verbose (Printf.sprintf "objdump -p %s > %s" fn dmp) <> 0
+      let pre = if !toolchain = `MINGW then "i686-w64-mingw32-" else "" in
+      if cmd_verbose (Printf.sprintf "%sobjdump -p %s > %s" pre fn dmp) <> 0
       then failwith "Error while extracting exports from a DLL";
       parse_dll_exports dmp

@@ -908,10 +909,10 @@
             Filename.quote def_file
         in
 	Printf.sprintf
-	  "gcc -mno-cygwin -m%s %s%s -L. %s %s -o %s %s %s %s %s %s"
+	  "i686-w64-mingw32-gcc -m%s %s%s -L. %s %s -o %s %s %s %s %s %s"
           !subsystem
 	  (if link_exe = `EXE then "" else "-shared ")
-	  (if main_pgm then "" else if !noentry then "-Wl,-e0 " else "-Wl,-e_FlexDLLiniter@12 ")
+	  (if main_pgm then "" else if !noentry then "-Wl,-e0 " else if !machine = `x86 then "-Wl,-e_FlexDLLiniter@12 " else "-Wl,-eFlexDLLiniter ")
 	  (mk_dirs_opt "-I")
 	  (mk_dirs_opt "-L")
 	  (Filename.quote output_file)
@@ -989,6 +990,7 @@
 	  [ "/lib/mingw";
             "/lib";
 	    "/lib/w32api";
+	    "/usr/i686-w64-mingw32/sys-root/mingw/lib";
 	    gcclib () ];
       default_libs :=
 	["-lmingw32"; "-lgcc"; "-lmoldname"; "-lmingwex"; "-lmsvcrt";
@@ -1017,10 +1019,10 @@
 	    file
       | `MINGW ->
 	  Printf.sprintf
-	    "gcc -mno-cygwin -c -o %s %s %s"
+	    "i686-w64-mingw32-gcc -c -o %s %s %s"
 	    (Filename.quote tmp_obj)
 	    (mk_dirs_opt "-I")
-	    file
+            (Filename.quote file)
       | `LIGHTLD ->
           failwith "Compilation of C code is not supported for this toolchain"
     in
Index: Makefile
===================================================================
--- Makefile	(révision 195)
+++ Makefile	(copie de travail)
@@ -1,4 +1,4 @@
-VERSION = 0.26
+VERSION = 0.26+mingw64
 all: flexlink.exe support

 include $(shell cygpath -ad "$(shell ocamlopt -where)/Makefile.config")
@@ -9,7 +9,8 @@

 # Supported tool-chains

-CHAINS = mingw cygwin msvc msvc64
+#CHAINS = mingw mingw64 cygwin msvc msvc64
+CHAINS = mingw cygwin


 # Compilers