static string output = "a.out";
static string object_out = null;
static List<string> link_paths = new List<string> ();
- static List<string> aot_paths = new List<string> ();
- static List<string> aot_names = new List<string> ();
static Dictionary<string,string> libraries = new Dictionary<string,string> ();
static bool autodeps = false;
- static string in_tree = null;
static bool keeptemp = false;
static bool compile_only = false;
static bool static_link = false;
static bool custom_mode = true;
static string embedded_options = null;
static string runtime = null;
- static bool aot_compile = false;
- static string aot_args = "static";
- static string aot_mode = "";
- static string aot_runtime = null;
- static int? aot_dedup_assembly = null;
static string sdk_path = null;
static string lib_path = null;
static Dictionary<string,string> environment = new Dictionary<string,string>();
case "--bundled-header":
bundled_header = true;
break;
- case "--in-tree":
- if (i+1 == top) {
- Console.WriteLine ("Usage: --in-tree <path/to/headers> ");
- return 1;
- }
- in_tree = args [++i];
- break;
- case "--aot-runtime":
- if (i+1 == top) {
- Console.WriteLine ("Usage: --aot-runtime <path/to/runtime> ");
- return 1;
- }
- aot_runtime = args [++i];
- aot_compile = true;
- static_link = true;
- break;
- case "--aot-dedup":
- if (i+1 == top) {
- Console.WriteLine ("Usage: --aot-dedup <container_dll> ");
- return 1;
- }
- var dedup_file = args [++i];
- sources.Add (dedup_file);
- aot_dedup_assembly = sources.Count () - 1;
- aot_compile = true;
- static_link = true;
- break;
- case "--aot-mode":
- if (i+1 == top) {
- Console.WriteLine ("Need string of aot mode (full, llvmonly). Omit for normal AOT.");
- return 1;
- }
-
- aot_mode = args [++i];
- if (aot_mode != "full" && aot_mode != "llvmonly") {
- Console.WriteLine ("Need string of aot mode (full, llvmonly). Omit for normal AOT.");
- return 1;
- }
-
- aot_compile = true;
- static_link = true;
- break;
- case "--aot-args":
- if (i+1 == top) {
- Console.WriteLine ("AOT arguments are passed as a comma-delimited list");
- return 1;
- }
- if (args [i + 1].Contains ("outfile")) {
- Console.WriteLine ("Per-aot-output arguments (ex: outfile, llvm-outfile) cannot be given");
- return 1;
- }
- aot_args = String.Format("static,{0}", args [++i]);
- aot_compile = true;
- static_link = true;
- break;
default:
sources.Add (args [i]);
break;
foreach (string file in assemblies)
if (!QueueAssembly (files, file))
return 1;
-
- if (aot_compile)
- AotCompile (files);
-
if (custom_mode)
GenerateBundles (files);
else
Console.WriteLine ("At {0:x} with input {1}", package.Position, fileStream.Length);
fileStream.CopyTo (package);
package.Position = package.Position + (align - (package.Position % align));
+
return (int) ret;
}
}
{
var p = package.Position;
var size = AddFile (fname);
+
locations [entry] = Tuple.Create(p, size);
}
return false;
}
maker.Add (code, file);
+ // add a space after code (="systemconfig:" or "machineconfig:")
+ Console.WriteLine (code + " " + file);
return true;
}
Console.WriteLine (" Assembly: " + fname);
if (File.Exists (fname + ".config")){
maker.Add ("config:" + aname, fname + ".config");
- Console.WriteLine (" Config: " + runtime);
+ Console.WriteLine (" Config: " + fname + ".config");
}
}
if (!MaybeAddFile (maker, "systemconfig:", config_file) || !MaybeAddFile (maker, "machineconfig:", machine_config_file))
return false;
- if (config_dir != null)
+ if (config_dir != null){
maker.Add ("config_dir:", config_dir);
+ Console.WriteLine (" Config_dir: " + config_dir );
+ }
if (embedded_options != null)
maker.AddString ("options:", embedded_options);
if (environment.Count > 0){
} else {
tc.WriteLine ("#include <mono/metadata/mono-config.h>");
tc.WriteLine ("#include <mono/metadata/assembly.h>\n");
-
- if (in_tree != null)
- tc.WriteLine ("#include <mono/mini/jit.h>\n");
- else
- tc.WriteLine ("#include <mono/jit/jit.h>\n");
}
if (compress) {
}
ts.Close ();
- // Managed assemblies baked in
if (compress)
tc.WriteLine ("\nstatic const CompressedAssembly *compressed [] = {");
else
tc.WriteLine ("\t&{0},", c);
}
tc.WriteLine ("\tNULL\n};\n");
-
-
- // AOT baked in plus loader
- foreach (string asm in aot_names){
- tc.WriteLine ("\textern const void *mono_aot_module_{0}_info;", asm);
- }
-
- tc.WriteLine ("\nstatic void install_aot_modules (void) {\n");
- foreach (string asm in aot_names){
- tc.WriteLine ("\tmono_aot_register_module (mono_aot_module_{0}_info);\n", asm);
- }
-
- string enum_aot_mode;
- switch (aot_mode) {
- case "full":
- enum_aot_mode = "MONO_AOT_MODE_FULL";
- break;
- case "llvmonly":
- enum_aot_mode = "MONO_AOT_MODE_LLVMONLY";
- break;
- case "":
- enum_aot_mode = "MONO_AOT_MODE_NORMAL";
- break;
- default:
- throw new Exception ("Unsupported AOT mode");
- }
- tc.WriteLine ("\tmono_jit_set_aot_mode ({0});", enum_aot_mode);
-
- tc.WriteLine ("\n}\n");
-
-
tc.WriteLine ("static char *image_name = \"{0}\";", prog);
if (ctor_func != null) {
else
{
string zlib = (compress ? "-lz" : "");
+ string objc = (style == "osx" ? "-framework CoreFoundation -lobjc" : "");
string debugging = "-g";
string cc = GetEnv("CC", "cc");
string cmd = null;
debugging = "-ggdb";
if (static_link)
{
- string platform_libs;
string smonolib;
- if (style == "osx") {
+ if (style == "osx")
smonolib = "`pkg-config --variable=libdir mono-2`/libmono-2.0.a ";
- platform_libs = "-liconv -framework Foundation ";
- } else {
+ else
smonolib = "-Wl,-Bstatic -lmono-2.0 -Wl,-Bdynamic ";
- platform_libs = "";
- }
-
- string in_tree_include = "";
-
- if (in_tree != null) {
- smonolib = String.Format ("{0}/mono/mini/.libs/libmonosgen-2.0.a", in_tree);
- in_tree_include = String.Format (" -I{0} ", in_tree);
- }
-
- cmd = String.Format("{4} -o '{2}' -Wall `pkg-config --cflags mono-2` {7} {0} {3} " +
- "`pkg-config --libs-only-L mono-2` {5} {6} " + platform_libs +
- "`pkg-config --libs-only-l mono-2 | sed -e \"s/\\-lmono-2.0 //\"` {1} -g ",
- temp_c, temp_o, output, zlib, cc, smonolib, String.Join (" ", aot_paths), in_tree_include);
+ cmd = String.Format("{4} -o '{2}' -Wall {5} `pkg-config --cflags mono-2` {0} {3} " +
+ "`pkg-config --libs-only-L mono-2` " + smonolib +
+ "`pkg-config --libs-only-l mono-2 | sed -e \"s/\\-lmono-2.0 //\"` {1}",
+ temp_c, temp_o, output, zlib, cc, objc);
}
else
{
- cmd = String.Format("{4} " + debugging + " -o '{2}' -Wall {0} `pkg-config --cflags --libs mono-2` {3} {1}",
- temp_c, temp_o, output, zlib, cc);
+ cmd = String.Format("{4} " + debugging + " -o '{2}' -Wall {5} {0} `pkg-config --cflags --libs mono-2` {3} {1}",
+ temp_c, temp_o, output, zlib, cc, objc);
}
Execute (cmd);
}
}
}
-
- static string EncodeAotSymbol (string symbol)
- {
- var sb = new StringBuilder ();
- /* This mimics what the aot-compiler does */
- foreach (var b in System.Text.Encoding.UTF8.GetBytes (symbol)) {
- char c = (char) b;
- if ((c >= '0' && c <= '9') ||
- (c >= 'a' && c <= 'z') ||
- (c >= 'A' && c <= 'Z')) {
- sb.Append (c);
- continue;
- }
- sb.Append ('_');
- }
- return sb.ToString ();
- }
-
- static void AotCompile (List<string> files)
- {
- if (aot_runtime == null)
- aot_runtime = runtime;
-
- if (aot_runtime == null || aot_runtime.Length == 0){
- if (IsUnix)
- aot_runtime = Process.GetCurrentProcess().MainModule.FileName;
- else {
- Error ("You must specify at least one aot runtime with --runtime or --cross or --aot_runtime when AOT compiling");
- Environment.Exit (1);
- }
- }
-
- var aot_mode_string = "";
- if (aot_mode != null)
- aot_mode_string = "," + aot_mode;
-
- var dedup_mode_string = "";
- StringBuilder all_assemblies = null;
- if (aot_dedup_assembly != null) {
- dedup_mode_string = ",dedup-skip";
- all_assemblies = new StringBuilder("");
- }
-
- for (int i=0; i < files.Count; i++) {
- var fileName = files [i];
- string path = LocateFile (new Uri (fileName).LocalPath);
- string outPath = String.Format ("{0}.aot_out", path);
- aot_paths.Add (outPath);
- var name = System.Reflection.Assembly.LoadFrom(path).GetName().Name;
- aot_names.Add (EncodeAotSymbol (name));
-
- if (aot_dedup_assembly != null && i != (int) aot_dedup_assembly) {
- all_assemblies.Append (path);
- all_assemblies.Append (" ");
- Execute (String.Format ("{0} --aot={1},outfile={2}{3}{4} {5}",
- aot_runtime, aot_args, outPath, aot_mode_string, dedup_mode_string, path));
- } else {
- Execute (String.Format ("{0} --aot={1},outfile={2}{3} {4}",
- aot_runtime, aot_args, outPath, aot_mode_string, path));
- }
- }
- if (aot_dedup_assembly != null) {
- string fileName = files [(int) aot_dedup_assembly];
- var filePath = new Uri (fileName).LocalPath;
- string path = LocateFile (filePath);
- dedup_mode_string = String.Format (",dedup-include={0}", Path.GetFileName(filePath));
- string outPath = String.Format ("{0}.aot_out", path);
- Execute (String.Format ("{0} --aot={1},outfile={2}{3}{4} {5} {6}",
- aot_runtime, aot_args, outPath, aot_mode_string, dedup_mode_string, path, all_assemblies.ToString ()));
- }
- }
-
-
static void Execute (string cmdLine)
{
if (IsUnix) {
projects / mono.git / blobdiff