merge & resolve conflicts from remote
diff --git a/scripts/readelf.py b/scripts/readelf.py
index 228d7a2..986b7ae 100755
--- a/scripts/readelf.py
+++ b/scripts/readelf.py
@@ -235,8 +235,12 @@
section['sh_addralign']))
self._emitline('Key to Flags:')
- self._emitline(' W (write), A (alloc), X (execute), M (merge), S (strings)')
- self._emitline(' I (info), L (link order), G (group), x (unknown)')
+ self._emit(' W (write), A (alloc), X (execute), M (merge), S (strings)')
+ if self.elffile['e_machine'] in ('EM_X86_64', 'EM_L10M'):
+ self._emitline(', l (large)')
+ else:
+ self._emitline()
+ self._emitline(' I (info), L (link order), G (group), T (TLS), E (exclude), x (unknown)')
self._emitline(' O (extra OS processing required) o (OS specific), p (processor specific)')
def display_symbol_tables(self):
