changeset 597:8baaaba2ee6b

Merge
author lana
date Tue, 29 Jan 2013 20:16:12 -0800
parents 039783b67959 db46b1c27a93
children 2a713921952c
files
diffstat 2 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh	Sat Jan 26 18:24:49 2013 -0800
+++ b/common/autoconf/generated-configure.sh	Tue Jan 29 20:16:12 2013 -0800
@@ -3723,7 +3723,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1358499442
+DATE_WHEN_GENERATED=1359376859
 
 ###############################################################################
 #
--- a/common/bin/compare_exceptions.sh.incl	Sat Jan 26 18:24:49 2013 -0800
+++ b/common/bin/compare_exceptions.sh.incl	Tue Jan 29 20:16:12 2013 -0800
@@ -887,6 +887,17 @@
 ./jre/bin/unpack200.exe
 "
 
+# jabswitch.exe is compiled and linked with incremental turned on in the old
+# build. This makes no sense, so it's turned off in the new build.
+ACCEPTED_SIZE_DIFF="
+./bin/jabswitch.exe
+./jre/bin/jabswitch.exe
+"
+ACCEPTED_DIS_DIFF="
+./bin/jabswitch.exe
+./jre/bin/jabswitch.exe
+"
+
 # On windows, there are unavoidable allignment issues making
 # a perfect disasm diff impossible. Filter out the following:
 # * Random parts of C++ symbols (this is a bit greedy, but does the trick)