Revert "Merge pull request #5330 from alexanderkyte/dedup_mkbundle"
[mono.git] / mcs / tools / mkbundle / mkbundle.cs
index dd19a7b2b216f290fd299c2aa53539485c756527..9a80f57f7feff53722a085f060c53b58451c26d4 100755 (executable)
@@ -40,8 +40,6 @@ class MakeBundle {
        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 bool keeptemp = false;
@@ -65,11 +63,6 @@ class MakeBundle {
        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>();
@@ -358,49 +351,11 @@ class MakeBundle {
                        case "--bundled-header":
                                bundled_header = true;
                                break;
-                       case "--aot-runtime":
-                               aot_runtime = args [++i];
-                               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;
-                               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;
-                               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;
-                               break;
                        default:
                                sources.Add (args [i]);
                                break;
                        }
+
                }
                // Modern bundling starts here
                if (!custom_mode){
@@ -456,10 +411,6 @@ class MakeBundle {
                foreach (string file in assemblies)
                        if (!QueueAssembly (files, file))
                                return 1;
-
-               if (aot_compile)
-                       AotCompile (files);
-
                if (custom_mode)
                        GenerateBundles (files);
                else 
@@ -586,6 +537,7 @@ class MakeBundle {
                                        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;
                        }
                }
@@ -594,6 +546,7 @@ class MakeBundle {
                {
                        var p = package.Position;
                        var size = AddFile (fname);
+                       
                        locations [entry] = Tuple.Create(p, size);
                }
 
@@ -766,7 +719,6 @@ void          mono_register_config_for_assembly (const char* assembly_name, cons
                        } else {
                                tc.WriteLine ("#include <mono/metadata/mono-config.h>");
                                tc.WriteLine ("#include <mono/metadata/assembly.h>\n");
-                               tc.WriteLine ("#include <mono/jit/jit.h>\n");
                        }
 
                        if (compress) {
@@ -907,7 +859,6 @@ void          mono_register_config_for_assembly (const char* assembly_name, cons
                        }
                        ts.Close ();
 
-                       // Managed assemblies baked in
                        if (compress)
                                tc.WriteLine ("\nstatic const CompressedAssembly *compressed [] = {");
                        else
@@ -917,37 +868,6 @@ void          mono_register_config_for_assembly (const char* assembly_name, cons
                                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) {
@@ -1093,20 +1013,15 @@ void          mono_register_config_for_assembly (const char* assembly_name, cons
                                        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 = "";
-                                       }
-
                                        cmd = String.Format("{4} -o '{2}' -Wall `pkg-config --cflags mono-2` {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));
+                                               "`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);
                                }
                                else
                                {
@@ -1416,67 +1331,6 @@ void          mono_register_config_for_assembly (const char* assembly_name, cons
                }
        }
 
-
-       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;
-
-               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));
-                       }
-               }
-               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) {