Remove MONO_OPT_SCHED; we don't actually use it and it's misleading.

diff --git a/mono/mini/mini.h b/mono/mini/mini.h
index 2a629c39b4afa26d721a0741cb4bab59ee4f7107..5023ce34d7cc8d6323c17d35e6142cb6a2a6b4ff 100644 (file)
--- a/mono/mini/mini.h
+++ b/mono/mini/mini.h
@@ -118,7 +118,7 @@
 #endif
 
 /* Version number of the AOT file format */
-#define MONO_AOT_FILE_VERSION 82
+#define MONO_AOT_FILE_VERSION 83
 
 //TODO: This is x86/amd64 specific.
 #define mono_simd_shuffle_mask(a,b,c,d) ((a) | ((b) << 2) | ((c) << 4) | ((d) << 6))

diff --git a/mono/mini/optflags-def.h b/mono/mini/optflags-def.h
index e0333ea456037c1cef8b91994452713af4c36c87..82ec442482f58337796a852fcca7853136f03d45 100644 (file)
--- a/mono/mini/optflags-def.h
+++ b/mono/mini/optflags-def.h
@@ -8,19 +8,18 @@ OPTFLAG(DEADCE   ,6, "deadce",     "Dead code elimination")
 OPTFLAG(LINEARS  ,7, "linears",    "Linear scan global reg allocation")
 OPTFLAG(CMOV     ,8, "cmov",       "Conditional moves")
 OPTFLAG(SHARED   ,9, "shared",     "Emit per-domain code")
-OPTFLAG(SCHED    ,10, "sched",      "Instruction scheduling")
-OPTFLAG(INTRINS  ,11, "intrins",    "Intrinsic method implementations")
-OPTFLAG(TAILC    ,12, "tailc",      "Tail recursion and tail calls")
-OPTFLAG(LOOP     ,13, "loop",       "Loop related optimizations")
-OPTFLAG(FCMOV    ,14, "fcmov",      "Fast x86 FP compares")
-OPTFLAG(LEAF     ,15, "leaf",       "Leaf procedures optimizations")
-OPTFLAG(AOT      ,16, "aot",        "Usage of Ahead Of Time compiled code")
-OPTFLAG(PRECOMP  ,17, "precomp",    "Precompile all methods before executing Main")
-OPTFLAG(ABCREM   ,18, "abcrem",     "Array bound checks removal")
-OPTFLAG(SSAPRE   ,19, "ssapre",     "SSA based Partial Redundancy Elimination")
-OPTFLAG(EXCEPTION,20, "exception",  "Optimize exception catch blocks")
-OPTFLAG(SSA      ,21, "ssa",        "Use plain SSA form")
-OPTFLAG(SSE2     ,23, "sse2",       "SSE2 instructions on x86")
-OPTFLAG(GSHARED  ,24, "gshared",    "Share generics")
-OPTFLAG(SIMD    ,25, "simd",       "Simd intrinsics")
-OPTFLAG(UNSAFE  ,26, "unsafe",     "Remove bound checks and perform other dangerous changes")
+OPTFLAG(INTRINS  ,10, "intrins",    "Intrinsic method implementations")
+OPTFLAG(TAILC    ,11, "tailc",      "Tail recursion and tail calls")
+OPTFLAG(LOOP     ,12, "loop",       "Loop related optimizations")
+OPTFLAG(FCMOV    ,13, "fcmov",      "Fast x86 FP compares")
+OPTFLAG(LEAF     ,14, "leaf",       "Leaf procedures optimizations")
+OPTFLAG(AOT      ,15, "aot",        "Usage of Ahead Of Time compiled code")
+OPTFLAG(PRECOMP  ,16, "precomp",    "Precompile all methods before executing Main")
+OPTFLAG(ABCREM   ,17, "abcrem",     "Array bound checks removal")
+OPTFLAG(SSAPRE   ,18, "ssapre",     "SSA based Partial Redundancy Elimination")
+OPTFLAG(EXCEPTION,19, "exception",  "Optimize exception catch blocks")
+OPTFLAG(SSA      ,20, "ssa",        "Use plain SSA form")
+OPTFLAG(SSE2     ,21, "sse2",       "SSE2 instructions on x86")
+OPTFLAG(GSHARED  ,22, "gshared",    "Share generics")
+OPTFLAG(SIMD    ,23, "simd",       "Simd intrinsics")
+OPTFLAG(UNSAFE  ,24, "unsafe",     "Remove bound checks and perform other dangerous changes")