1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
|
From b4d6ac055f8f16ac735a70036243bc4ea2334039 Mon Sep 17 00:00:00 2001
From: Giuseppe Corbelli <corbelligiuseppe@mesdan.it>
Date: Tue, 14 Jan 2020 11:50:20 +0100
Subject: [PATCH] [SymbolInfo.cc] Support compilation with binutils >= 2.33.1
on Debian.
bfd_get_section_vma macro was removed.
bfd_section_size changed signature.
See inline comment for details.
---
libgrive/src/bfd/SymbolInfo.cc | 35 ++++++++++++++++++++--------------
1 file changed, 21 insertions(+), 14 deletions(-)
diff --git a/libgrive/src/bfd/SymbolInfo.cc b/libgrive/src/bfd/SymbolInfo.cc
index 5876cc0..cdb5d7c 100644
--- a/libgrive/src/bfd/SymbolInfo.cc
+++ b/libgrive/src/bfd/SymbolInfo.cc
@@ -49,9 +49,9 @@ SymbolInfo::SymbolInfo( )
m_impl->m_bfd = 0 ;
m_impl->m_symbols = 0 ;
m_impl->m_symbol_count = 0 ;
-
+
bfd_init( ) ;
-
+
// opening itself
bfd *b = bfd_openr( "/proc/self/exe", 0 ) ;
if ( b == NULL )
@@ -60,13 +60,13 @@ SymbolInfo::SymbolInfo( )
<< bfd_errmsg( bfd_get_error() ) << std::endl ;
return ;
}
-
+
if ( bfd_check_format( b, bfd_archive ) )
{
bfd_close( b ) ;
return ;
}
-
+
char **matching ;
if ( !bfd_check_format_matches( b, bfd_object, &matching ) )
{
@@ -78,7 +78,7 @@ SymbolInfo::SymbolInfo( )
std::cerr << bfd_get_filename( b ) << ": Matching formats: " ;
for ( char **p = matching ; *p != 0 ; p++ )
std::cerr << " " << *p ;
-
+
std::cerr << std::endl ;
std::free( matching ) ;
}
@@ -107,7 +107,7 @@ struct SymbolInfo::BacktraceInfo
const char *m_func_name ;
unsigned int m_lineno ;
unsigned int m_is_found ;
-
+
static void Callback( bfd *abfd, asection *section, void* addr ) ;
} ;
@@ -117,17 +117,24 @@ void SymbolInfo::BacktraceInfo::Callback( bfd *abfd, asection *section,
BacktraceInfo *info = (BacktraceInfo *)data ;
if ((section->flags & SEC_ALLOC) == 0)
return ;
-
- bfd_vma vma = bfd_get_section_vma(abfd, section);
-
+
+ // bfd_get_section_vma works up to 7b1cfbcf1a27951fb1b3a212995075dd6fdf985b,
+ // removed in 7c13bc8c91abf291f0206b6608b31955c5ea70d8 (binutils 2.33.1 or so)
+ // so it's substituted by its implementation to avoid checking for binutils
+ // version (which at least on Debian SID it's not that easy because the
+ // version.h is not included with the official package)
+ bfd_vma vma = section->vma;
+
unsigned long address = (unsigned long)(info->m_addr);
if ( address < vma )
return;
-
- bfd_size_type size = bfd_section_size(abfd, section);
+
+ // bfd_section_size changed between the two objects described above,
+ // same rationale applies
+ bfd_size_type size = section->size;
if ( address > (vma + size))
return ;
-
+
const SymbolInfo *pthis = info->m_pthis ;
info->m_is_found = bfd_find_nearest_line( abfd, section,
pthis->m_impl->m_symbols,
@@ -149,7 +156,7 @@ void SymbolInfo::PrintTrace( void *addr, std::ostream& os, std::size_t idx )
{
this, addr, 0, 0, 0, false
} ;
-
+
Dl_info sym ;
bfd_map_over_sections( m_impl->m_bfd,
&SymbolInfo::BacktraceInfo::Callback,
@@ -165,7 +172,7 @@ if ( btinfo.m_is_found )
filename.erase( pos, std::strlen( SRC_DIR ) ) ;
#endif
os << "#" << idx << " " << addr << " "
- << filename << ":" << btinfo.m_lineno
+ << filename << ":" << btinfo.m_lineno
<< " "
<< (btinfo.m_func_name != 0 ? Demangle(btinfo.m_func_name) : "" )
<< std::endl ;
|
GitWeb