Просмотр исходного кода

Dpkg::Shlibs::Symbol: use 'auto' c++filt format for demangling C++ symbols

'auto' will try to select appropriate C++ demangling type automatically. Please
note that 'auto' format is limited to C++ symbols as of binutils 2.20.

Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
Modestas Vainius лет назад: 16
Родитель
Сommit
22bf0c7e95
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      scripts/Dpkg/Shlibs/Symbol.pm
  2. 1 1
      scripts/t/190_Dpkg_Shlibs_Cppfilt.t

+ 1 - 1
scripts/Dpkg/Shlibs/Symbol.pm

@@ -354,7 +354,7 @@ sub convert_to_alias {
 	    # symbol version from the rawname.
 	    # symbol version from the rawname.
 	    return "*\@$1" if ($rawname =~ /\@([^@]+)$/);
 	    return "*\@$1" if ($rawname =~ /\@([^@]+)$/);
 	} elsif ($rawname =~ /^_Z/ && $type eq "c++") {
 	} elsif ($rawname =~ /^_Z/ && $type eq "c++") {
-	    return cppfilt_demangle($rawname, "gnu-v3");
+	    return cppfilt_demangle($rawname, "auto");
 	}
 	}
     }
     }
     return undef;
     return undef;

+ 1 - 1
scripts/t/190_Dpkg_Shlibs_Cppfilt.t

@@ -21,7 +21,7 @@ use warnings;
 use_ok("Dpkg::Shlibs::Cppfilt");
 use_ok("Dpkg::Shlibs::Cppfilt");
 
 
 sub demangle_cpp {
 sub demangle_cpp {
-    return cppfilt_demangle(shift, 'gnu-v3');
+    return cppfilt_demangle(shift, 'auto');
 }
 }
 
 
 # Simple C++ demangling tests
 # Simple C++ demangling tests