changeset 2315:f84403709ae3

Adjusted compare for arm minimal jvm
author erikj
date Fri, 11 Mar 2016 15:56:28 +0100
parents 3693eed0618e
children b66f5ff665cb
files common/bin/compare_exceptions.sh.incl
diffstat 1 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/common/bin/compare_exceptions.sh.incl	Thu Mar 10 19:20:24 2016 +0100
+++ b/common/bin/compare_exceptions.sh.incl	Fri Mar 11 15:56:28 2016 +0100
@@ -114,7 +114,11 @@
       "
 
   if [ "$OPENJDK_TARGET_CPU" = "arm" ]; then
-    # Link time optimization makes fulldump diff impossible
+    # NOTE: When comparing the old and new hotspot builds, the link time
+    # optimization makes good comparisons impossible. Fulldump compare always
+    # fails and disassembly can end up with some functions in different order.
+    # So for now, accept the difference but put a limit on the size. The
+    # different order of functions shouldn't result in a very big diff.
     KNOWN_FULLDUMP_DIFF="
         ./lib$OPENJDK_TARGET_CPU_LIBDIR/minimal/libjvm.so
         "
@@ -126,6 +130,11 @@
     DIS_DIFF_FILTER="$SED -r \
         -e 's/\.[0-9]+/.X/g'
         "
+    KNOWN_DIS_DIFF="
+        ./lib$OPENJDK_TARGET_CPU_LIBDIR/minimal/libjvm.so
+        "
+    MAX_KNOWN_DIS_DIFF_SIZE="2000"
+
     NEED_SYMBOLS_DIFF_FILTER="
         ./lib$OPENJDK_TARGET_CPU_LIBDIR/minimal/libjvm.so
         "