Remove VEC(tsv_s), use std::vector instead

[deliverable/binutils-gdb.git] / gdb / make-target-delegates

diff --git a/gdb/make-target-delegates b/gdb/make-target-delegates
index 5f77c9df982d8bdc1693f73b5c2a0268b5162baa..bf91ddc17cfed435a08c8f3d2a7649cd6aee95f5 100755 (executable)
--- a/gdb/make-target-delegates
+++ b/gdb/make-target-delegates
@@ -115,7 +115,7 @@ sub parse_argtypes($) {
     foreach $iter (@typelist) {
        if ($iter =~ m/^(enum\s+${SYMBOL}\s*)(${SYMBOL})?$/) {
            $onetype = $1;
-       } elsif ($iter =~ m/^(.*(enum\s+)?${SYMBOL}.*(\s|\*))${SYMBOL}+$/) {
+       } elsif ($iter =~ m/^(.*(enum\s+)?${SYMBOL}.*(\s|\*|&))${SYMBOL}+$/) {
            $onetype = $1;
        } elsif ($iter eq 'void') {
            next;
@@ -151,7 +151,7 @@ sub write_function_header($$@) {
 
        $val =~ s/$TARGET_DEBUG_PRINTER//;
 
-       if ($iter !~ m,\*$,) {
+       if ($iter !~ m,(\*|&)$,) {
            $val .= ' ';
        }
 
@@ -234,6 +234,7 @@ sub munge_type($) {
        ($result = $typename) =~ s/\s+$//;
        $result =~ s/[ ()<>:]/_/g;
        $result =~ s/[*]/p/g;
+       $result =~ s/&/r/g;
 
        # Identifers with double underscores are reserved to the C++
        # implementation.