0818a82
From 3d6dbb6d48d10579984fb7fda2e79d3d73e10f70 Mon Sep 17 00:00:00 2001
0818a82
From: Andrey Ponomarenko <andrewponomarenko@yandex.ru>
0818a82
Date: Wed, 3 Jul 2019 16:51:32 +0300
0818a82
Subject: [PATCH] Support for new elfutils (Fedora 30)
0818a82
0818a82
---
0818a82
 abi-dumper.pl | 11 ++++++++---
0818a82
 1 file changed, 8 insertions(+), 3 deletions(-)
0818a82
0818a82
--- a/abi-dumper.pl
0818a82
+++ b/abi-dumper.pl
0818a82
@@ -3,7 +3,7 @@
0818a82
 # ABI Dumper 1.1
0818a82
 # Dump ABI of an ELF object containing DWARF debug info
0818a82
 #
0818a82
-# Copyright (C) 2013-2017 Andrey Ponomarenko's ABI Laboratory
0818a82
+# Copyright (C) 2013-2019 Andrey Ponomarenko's ABI Laboratory
0818a82
 #
0818a82
 # Written by Andrey Ponomarenko
0818a82
 #
0818a82
@@ -92,7 +92,7 @@ my %ERROR_CODE = (
0818a82
 
0818a82
 my $ShortUsage = "ABI Dumper $TOOL_VERSION
0818a82
 Dump ABI of an ELF object containing DWARF debug info
0818a82
-Copyright (C) 2017 Andrey Ponomarenko's ABI Laboratory
0818a82
+Copyright (C) 2019 Andrey Ponomarenko's ABI Laboratory
0818a82
 License: GNU LGPL or GNU GPL
0818a82
 
0818a82
 Usage: $CmdName [options] [object]
0818a82
@@ -4276,6 +4276,11 @@ sub setSource(@)
0818a82
     
0818a82
     if(defined $File)
0818a82
     {
0818a82
+        if(index($File, "(")!=-1)
0818a82
+        { # Support for new elfutils (Fedora 30)
0818a82
+            $File=~s/.+ \((\d+)\)/$1/;
0818a82
+        }
0818a82
+        
0818a82
         my $Name = undef;
0818a82
         
0818a82
         if($ID>=0) {
0818a82
@@ -6504,7 +6509,7 @@ sub scenario()
0818a82
     if($ShowVersion)
0818a82
     {
0818a82
         printMsg("INFO", "ABI Dumper $TOOL_VERSION");
0818a82
-        printMsg("INFO", "Copyright (C) 2017 Andrey Ponomarenko's ABI Laboratory");
0818a82
+        printMsg("INFO", "Copyright (C) 2019 Andrey Ponomarenko's ABI Laboratory");
0818a82
         printMsg("INFO", "License: LGPL or GPL <http://www.gnu.org/licenses/>");
0818a82
         printMsg("INFO", "This program is free software: you can redistribute it and/or modify it.\n");
0818a82
         printMsg("INFO", "Written by Andrey Ponomarenko.");