Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding support for 64bit GNAT compiler #49

Merged
merged 1 commit into from
Jan 9, 2018
Merged

Adding support for 64bit GNAT compiler #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cmdline.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ let use_default_libs = ref true
let subsystem = ref "console"
let explain = ref false
let builtin_linker = ref false
let toolchain : [ `MSVC | `MSVC64 | `MINGW | `MINGW64 | `GNAT | `CYGWIN | `CYGWIN64 | `LIGHTLD ] ref = ref `MSVC
let toolchain : [ `MSVC | `MSVC64 | `MINGW | `MINGW64 | `GNAT | `GNAT64 | `CYGWIN | `CYGWIN64 | `LIGHTLD ] ref = ref `MSVC
let save_temps = ref false
let show_exports = ref false
let show_imports = ref false
Expand Down Expand Up @@ -98,7 +98,7 @@ let specs = [
"-l", Arg.String (fun s -> files := ("-l" ^ s) :: !files),
"<lib> Library file";

"-chain", Arg.Symbol (["msvc";"msvc64";"cygwin";"cygwin64";"mingw";"mingw64";"gnat";"ld"],
"-chain", Arg.Symbol (["msvc";"msvc64";"cygwin";"cygwin64";"mingw";"mingw64";"gnat";"gnat64";"ld"],
(fun s ->
machine := `x86; underscore := true;
toolchain := match s with
Expand All @@ -108,6 +108,7 @@ let specs = [
| "cygwin64" -> machine := `x64; underscore := false; `CYGWIN64
| "mingw" -> `MINGW
| "gnat" -> `GNAT
| "gnat64" -> machine := `x64; underscore := false; `GNAT64
| "mingw64" -> machine := `x64; underscore := false; `MINGW64
| "ld" -> `LIGHTLD
| _ -> assert false)),
Expand Down
15 changes: 8 additions & 7 deletions reloc.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ type cmdline = {
let new_cmdline () =
let rf = match !toolchain with
| `MSVC | `MSVC64 | `LIGHTLD -> true
| `MINGW | `MINGW64 | `GNAT | `CYGWIN | `CYGWIN64 -> false
| `MINGW | `MINGW64 | `GNAT | `GNAT64 | `CYGWIN | `CYGWIN64 -> false
in
{
may_use_response_file = rf;
Expand Down Expand Up @@ -585,7 +585,7 @@ let parse_dll_exports fn =
let dll_exports fn = match !toolchain with
| `MSVC | `MSVC64 | `LIGHTLD ->
failwith "Creation of import library not supported for this toolchain"
| `GNAT | `CYGWIN | `CYGWIN64 | `MINGW | `MINGW64 ->
| `GNAT | `GNAT64 | `CYGWIN | `CYGWIN64 | `MINGW | `MINGW64 ->
let dmp = temp_file "dyndll" ".dmp" in
if cmd_verbose (Printf.sprintf "%s -p %s > %s" !objdump fn dmp) <> 0
then failwith "Error while extracting exports from a DLL";
Expand Down Expand Up @@ -1058,7 +1058,7 @@ let build_dll link_exe output_file files exts extra_args =
files
def_file
extra_args
| `MINGW | `MINGW64 | `GNAT ->
| `MINGW | `MINGW64 | `GNAT | `GNAT64 ->
let def_file =
if main_pgm then ""
else
Expand Down Expand Up @@ -1253,7 +1253,7 @@ let setup_toolchain () =
mingw_libs Version.mingw_prefix
| `MINGW64 ->
mingw_libs Version.mingw64_prefix
| `GNAT ->
| `GNAT | `GNAT64 ->
(* This is a plain copy of the mingw version, but we do not change the
prefix and use "gnatls" to compute the include dir. *)
search_path :=
Expand Down Expand Up @@ -1309,7 +1309,7 @@ let compile_if_needed file =
(Filename.quote tmp_obj)
(mk_dirs_opt "-I")
file
| `MINGW | `MINGW64 | `GNAT ->
| `MINGW | `MINGW64 | `GNAT | `GNAT64 ->
Printf.sprintf
"%s -c -o %s %s %s"
!gcc
Expand Down Expand Up @@ -1359,7 +1359,8 @@ let all_files () =
| `CYGWIN -> "cygwin.o"
| `CYGWIN64 -> "cygwin64.o"
| `MINGW64 -> "mingw64.o"
| `GNAT -> "gnat.o"
| `GNAT -> "gnat.o"
| `GNAT64 -> "gnat64.o"
| `MINGW | `LIGHTLD -> "mingw.o" in
if !exe_mode <> `DLL then
if !add_flexdll_obj then f ("flexdll_" ^ tc) :: files
Expand All @@ -1377,7 +1378,7 @@ let main () =
match !toolchain, !cygpath_arg with
| _, `Yes -> true
| _, `No -> false
| (`GNAT|`MINGW|`MINGW64|`CYGWIN|`CYGWIN64), `None ->
| (`GNAT|`GNAT64|`MINGW|`MINGW64|`CYGWIN|`CYGWIN64), `None ->
begin match Sys.os_type with
| "Unix" | "Cygwin" ->
Sys.command "cygpath -S 2>/dev/null >/dev/null" = 0
Expand Down