Fix the build

diff --git a/mono/cil/cil-opcodes.xml b/mono/cil/cil-opcodes.xml
index ba735a8b681f7336dbff8ff7798b40ecc6f7958c..bc337abde8054108111bda0ed7815138685d4011 100644 (file)
--- a/mono/cil/cil-opcodes.xml
+++ b/mono/cil/cil-opcodes.xml
@@ -308,4 +308,5 @@
 <opcode name="mono_tls" input="Pop0" output="PushI" args="InlineI" o1="0xF0" o2="0x0D" flow="next" />
 <opcode name="mono_icall_addr" input="Pop0" output="PushI" args="InlineI" o1="0xF0" o2="0x0E" flow="next" />
 <opcode name="mono_dyn_call" input="Pop0" output="PushI" args="InlineI" o1="0xF0" o2="0x0F" flow="next" />
+<opcode name="mono_memory_barrier" input="Pop0" output="Push0" args="InlineI" o1="0xF0" o2="0x10" flow="next" />
 </opdesc>

diff --git a/mono/cil/make-opcodes-def.pl b/mono/cil/make-opcodes-def.pl
index a94c15778cac608d1f83d9d1e23421d0de139da9..4a4c8cf55b8b212d80417fbf93e2fa7138c305b8 100644 (file)
--- a/mono/cil/make-opcodes-def.pl
+++ b/mono/cil/make-opcodes-def.pl
@@ -22,6 +22,7 @@ my %valid_flow;
 open OUTPUT, ">$ARGV[1]" || die "Can not create $ARGV[1] file: $!";
 
 my $parser = new XML::Parser (Handlers => {Start => \&handle_opcode});
+print_header();
 $parser->parsefile($ARGV[0]);
 print_trailer();
 close(OUTPUT) || die "Can not close file: $!";
@@ -53,6 +54,12 @@ sub handle_opcode {
     
 }
 
+sub print_header {
+print OUTPUT<<EOF;
+/* GENERATED FILE, DO NOT EDIT */
+EOF
+}
+
 sub print_trailer {
 print OUTPUT<<EOF;
 #ifndef OPALIAS

diff --git a/mono/cil/opcode.def b/mono/cil/opcode.def
index ed9d26e6d9ccf15d8b2806e5645e969e6872070b..3dd6ff0180cea7dd2f601c24fd1ba827a86a8fe9 100644 (file)
--- a/mono/cil/opcode.def
+++ b/mono/cil/opcode.def
@@ -1,3 +1,4 @@
+/* GENERATED FILE, DO NOT EDIT */
 OPDEF(CEE_NOP, "nop", Pop0, Push0, InlineNone, X, 1, 0xFF, 0x00, NEXT)
 OPDEF(CEE_BREAK, "break", Pop0, Push0, InlineNone, X, 1, 0xFF, 0x01, ERROR)
 OPDEF(CEE_LDARG_0, "ldarg.0", Pop0, Push1, InlineNone, X, 1, 0xFF, 0x02, NEXT)