From 6fff9b53f24478610f4bc2e6a6e5b4d75f686f8a Mon Sep 17 00:00:00 2001
From: Andreas Ziegler <andreas.ziegler@fau.de>
Date: Sat, 7 Mar 2020 15:32:40 +0100
Subject: [PATCH] readelf: print addend for RELA relocations without symbol
 (#292)

* readelf: print addend for RELA relocations without symbol

When processing relocations from a SHT_RELA type section, GNU
readelf displays the value of the 'r_addend' field if no
symbol index is given (that is, 'r_info_sym' is 0).

By also implementing this we can better test the output for
64-bit binaries which commonly use SHT_RELA relocations.

The included test file is the same as tls.elf but compiled
for x86_64. Its code is the following:

  __thread int i;

  int main(){}

and it is compiled using the following command line:

$ gcc -m64 -o tls64.elf tls.c

* test: add source file for tls{,64}.elf

The comments at the top describe how to compile the source
file into tls.elf and tls64.elf.
---
 scripts/readelf.py                   |   4 ++++
 test/testfiles_for_readelf/tls.c     |   8 ++++++++
 test/testfiles_for_readelf/tls64.elf | Bin 0 -> 8280 bytes
 3 files changed, 12 insertions(+)
 create mode 100644 test/testfiles_for_readelf/tls.c
 create mode 100755 test/testfiles_for_readelf/tls64.elf

diff --git a/scripts/readelf.py b/scripts/readelf.py
index 6db36df..5c5111c 100755
--- a/scripts/readelf.py
+++ b/scripts/readelf.py
@@ -506,6 +506,10 @@ class ReadElf(object):
                         rel['r_info_type'], self.elffile)))
 
                 if rel['r_info_sym'] == 0:
+                    if section.is_RELA():
+                        fieldsize = 8 if self.elffile.elfclass == 32 else 16
+                        addend = self._format_hex(rel['r_addend'], lead0x=False)
+                        self._emit(' %s   %s' % (' ' * fieldsize, addend))
                     self._emitline()
                     continue
 
diff --git a/test/testfiles_for_readelf/tls.c b/test/testfiles_for_readelf/tls.c
new file mode 100644
index 0000000..781bf99
--- /dev/null
+++ b/test/testfiles_for_readelf/tls.c
@@ -0,0 +1,8 @@
+// Compile into tls.elf using:
+// $ gcc -m32 -o tls.elf tls.c
+// For tls64.elf, use:
+// $ gcc -m64 -o tls64.elf tls.c
+
+__thread int i;
+
+int main(){}
diff --git a/test/testfiles_for_readelf/tls64.elf b/test/testfiles_for_readelf/tls64.elf
new file mode 100755
index 0000000000000000000000000000000000000000..ef775387fce1e4f7556069a715e195a9a35c16ad
GIT binary patch
literal 8280
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
L75Fb;e*J#~Z4><~

literal 0
HcmV?d00001

-- 
2.30.2