diff options
| -rw-r--r-- | binutils/ChangeLog | 7 | ||||
| -rw-r--r-- | binutils/objdump.c | 10 | ||||
| -rw-r--r-- | binutils/readelf.c | 22 |
3 files changed, 23 insertions, 16 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 50eeb5c..00a1a1d 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,10 @@ +2019-09-30 Nick Alcock <nick.alcock@oracle.com> + + * objdump.c (main): Fix tabdamage. + * readelf.c (CTF_DUMP): Likewise. + (options): Likewise. + (dump_section_as_ctf): Likewise. + 2019-08-03 Nick Alcock <nick.alcock@oracle.com> * objdump.c (dump_ctf): Use the default CTF archive member as the diff --git a/binutils/objdump.c b/binutils/objdump.c index ae50d87..a2a0645 100644 --- a/binutils/objdump.c +++ b/binutils/objdump.c @@ -4548,11 +4548,11 @@ main (int argc, char **argv) case OPTION_DWARF_CHECK: dwarf_check = TRUE; break; - case OPTION_CTF: - dump_ctf_section_info = TRUE; - dump_ctf_section_name = xstrdup (optarg); - seenflag = TRUE; - break; + case OPTION_CTF: + dump_ctf_section_info = TRUE; + dump_ctf_section_name = xstrdup (optarg); + seenflag = TRUE; + break; case OPTION_CTF_PARENT: dump_ctf_parent_name = xstrdup (optarg); break; diff --git a/binutils/readelf.c b/binutils/readelf.c index cecad76..2a9d145 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -184,7 +184,7 @@ typedef struct elf_section_list #define DEBUG_DUMP (1 << 2) /* The -w command line switch. */ #define STRING_DUMP (1 << 3) /* The -p command line switch. */ #define RELOC_DUMP (1 << 4) /* The -R command line switch. */ -#define CTF_DUMP (1 << 5) /* The --ctf command line switch. */ +#define CTF_DUMP (1 << 5) /* The --ctf command line switch. */ typedef unsigned char dump_type; @@ -4465,7 +4465,7 @@ static struct option options[] = {"dwarf-start", required_argument, 0, OPTION_DWARF_START}, {"dwarf-check", no_argument, 0, OPTION_DWARF_CHECK}, - {"ctf", required_argument, 0, OPTION_CTF_DUMP}, + {"ctf", required_argument, 0, OPTION_CTF_DUMP}, {"ctf-symbols", required_argument, 0, OPTION_CTF_SYMBOLS}, {"ctf-strings", required_argument, 0, OPTION_CTF_STRINGS}, @@ -13922,15 +13922,15 @@ dump_section_as_ctf (Elf_Internal_Shdr * section, Filedata * filedata) Elf_Internal_Shdr * parent_sec = NULL; Elf_Internal_Shdr * symtab_sec = NULL; Elf_Internal_Shdr * strtab_sec = NULL; - void * data = NULL; - void * symdata = NULL; - void * strdata = NULL; - void * parentdata = NULL; - ctf_sect_t ctfsect, symsect, strsect, parentsect; - ctf_sect_t * symsectp = NULL; - ctf_sect_t * strsectp = NULL; - ctf_file_t * ctf = NULL; - ctf_file_t * parent = NULL; + void * data = NULL; + void * symdata = NULL; + void * strdata = NULL; + void * parentdata = NULL; + ctf_sect_t ctfsect, symsect, strsect, parentsect; + ctf_sect_t * symsectp = NULL; + ctf_sect_t * strsectp = NULL; + ctf_file_t * ctf = NULL; + ctf_file_t * parent = NULL; const char *things[] = {"Header", "Labels", "Data objects", "Function objects", "Variables", "Types", "Strings", |