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