Merge of main trunk, all conflicts resolved.

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 318d3a8aed024163227cfd63e212b586ac60507d..cc41a1813e5ad6ca4807e482b28efa2dac0014c6 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -868,7 +868,7 @@ sub update_numbers
                        $new_syms++;
                        printf OUT "%s%-40s%d\t%s\n","",$s, ++$start_num,$i;
                        if (exists $r{$s}) {
-                               ($s, $i) = split /\\/,$r{$sym};
+                               ($s, $i) = split /\\/,$r{$s};
                                printf OUT "%s%-40s%d\t%s\n","",$s, $start_num,$i;
                        }
                }