Revert patch that disables building libctf for non-ELF based targets.
Revert: binutls 2019-05-29 Nick Clifton <nickc@redhat.com> * configure.ac (LIBCTF): Export. Set to empty for non-ELF based targets. (HAVE_LIBCTF): Define if libctf support is available. * Makefile.am (LIBCTF): Set value to @LIBCTF@. * objdump.c: Make CTF code conditional upon HAVE_LIBCTF being defined. * readelf.c: Likewise. * configure: Regenerate. * Makefile.in: Regenerate. * config.in: Regenerate. top 2019-05-29 Nick Clifton <nickc@redhat.com> * configure.ac (noconfigdirs): Add libctf if the target does not use the ELF file format. * configure: Regenerate.
This commit is contained in:
Nick Clifton
parent
4f6d070adb
commit
79b377b3cf
12 changed files with 37 additions and 182 deletions
|
|
@ -60,9 +60,7 @@
|
|||
#include "bucomm.h"
|
||||
#include "elfcomm.h"
|
||||
#include "dwarf.h"
|
||||
#ifdef HAVE_LIBCTF
|
||||
#include "ctf-api.h"
|
||||
#endif
|
||||
|
||||
#include "elf/common.h"
|
||||
#include "elf/external.h"
|
||||
|
|
@ -186,9 +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. */
|
||||
#ifdef HAVE_LIBCTF
|
||||
#define CTF_DUMP (1 << 5) /* The --ctf command line switch. */
|
||||
#endif
|
||||
|
||||
typedef unsigned char dump_type;
|
||||
|
||||
|
|
@ -255,20 +251,16 @@ static bfd_boolean do_dump = FALSE;
|
|||
static bfd_boolean do_version = FALSE;
|
||||
static bfd_boolean do_histogram = FALSE;
|
||||
static bfd_boolean do_debugging = FALSE;
|
||||
#ifdef HAVE_LIBCTF
|
||||
static bfd_boolean do_ctf = FALSE;
|
||||
#endif
|
||||
static bfd_boolean do_arch = FALSE;
|
||||
static bfd_boolean do_notes = FALSE;
|
||||
static bfd_boolean do_archive_index = FALSE;
|
||||
static bfd_boolean is_32bit_elf = FALSE;
|
||||
static bfd_boolean decompress_dumps = FALSE;
|
||||
|
||||
#ifdef HAVE_LIBCTF
|
||||
static char *dump_ctf_parent_name;
|
||||
static char *dump_ctf_symtab_name;
|
||||
static char *dump_ctf_strtab_name;
|
||||
#endif
|
||||
|
||||
struct group_list
|
||||
{
|
||||
|
|
@ -4409,12 +4401,10 @@ get_section_type_name (Filedata * filedata, unsigned int sh_type)
|
|||
#define OPTION_DWARF_DEPTH 514
|
||||
#define OPTION_DWARF_START 515
|
||||
#define OPTION_DWARF_CHECK 516
|
||||
#ifdef HAVE_LIBCTF
|
||||
#define OPTION_CTF_DUMP 517
|
||||
#define OPTION_CTF_PARENT 518
|
||||
#define OPTION_CTF_SYMBOLS 519
|
||||
#define OPTION_CTF_STRINGS 520
|
||||
#endif
|
||||
|
||||
static struct option options[] =
|
||||
{
|
||||
|
|
@ -4453,13 +4443,11 @@ static struct option options[] =
|
|||
{"dwarf-start", required_argument, 0, OPTION_DWARF_START},
|
||||
{"dwarf-check", no_argument, 0, OPTION_DWARF_CHECK},
|
||||
|
||||
#ifdef HAVE_LIBCTF
|
||||
{"ctf", required_argument, 0, OPTION_CTF_DUMP},
|
||||
|
||||
{"ctf-symbols", required_argument, 0, OPTION_CTF_SYMBOLS},
|
||||
{"ctf-strings", required_argument, 0, OPTION_CTF_STRINGS},
|
||||
{"ctf-parent", required_argument, 0, OPTION_CTF_PARENT},
|
||||
#endif
|
||||
|
||||
{"version", no_argument, 0, 'v'},
|
||||
{"wide", no_argument, 0, 'W'},
|
||||
|
|
@ -4510,7 +4498,6 @@ usage (FILE * stream)
|
|||
--dwarf-depth=N Do not display DIEs at depth N or greater\n\
|
||||
--dwarf-start=N Display DIEs starting with N, at the same depth\n\
|
||||
or deeper\n"));
|
||||
#ifdef HAVE_LIBCTF
|
||||
fprintf (stream, _("\
|
||||
--ctf=<number|name> Display CTF info from section <number|name>\n\
|
||||
--ctf-parent=<number|name>\n\
|
||||
|
|
@ -4519,7 +4506,6 @@ usage (FILE * stream)
|
|||
Use section <number|name> as the CTF external symtab\n\n\
|
||||
--ctf-strings=<number|name>\n\
|
||||
Use section <number|name> as the CTF external strtab\n\n"));
|
||||
#endif
|
||||
|
||||
#ifdef SUPPORT_DISASSEMBLY
|
||||
fprintf (stream, _("\
|
||||
|
|
@ -4748,7 +4734,6 @@ parse_args (Filedata * filedata, int argc, char ** argv)
|
|||
case OPTION_DWARF_CHECK:
|
||||
dwarf_check = TRUE;
|
||||
break;
|
||||
#ifdef HAVE_LIBCTF
|
||||
case OPTION_CTF_DUMP:
|
||||
do_ctf = TRUE;
|
||||
request_dump (filedata, CTF_DUMP);
|
||||
|
|
@ -4762,7 +4747,6 @@ parse_args (Filedata * filedata, int argc, char ** argv)
|
|||
case OPTION_CTF_PARENT:
|
||||
dump_ctf_parent_name = strdup (optarg);
|
||||
break;
|
||||
#endif
|
||||
case OPTION_DYN_SYMS:
|
||||
do_dyn_syms = TRUE;
|
||||
break;
|
||||
|
|
@ -13824,7 +13808,6 @@ dump_section_as_bytes (Elf_Internal_Shdr * section,
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
#ifdef HAVE_LIBCTF
|
||||
static ctf_sect_t *
|
||||
shdr_to_ctf_sect (ctf_sect_t *buf, Elf_Internal_Shdr *shdr, Filedata *filedata)
|
||||
{
|
||||
|
|
@ -13978,7 +13961,6 @@ dump_section_as_ctf (Elf_Internal_Shdr * section, Filedata * filedata)
|
|||
free (strdata);
|
||||
return ret;
|
||||
}
|
||||
#endif /* HAVE_LIBCTF */
|
||||
|
||||
static bfd_boolean
|
||||
load_specific_debug_section (enum dwarf_section_display_enum debug,
|
||||
|
|
@ -14318,13 +14300,11 @@ process_section_contents (Filedata * filedata)
|
|||
res = FALSE;
|
||||
}
|
||||
|
||||
#ifdef HAVE_LIBCTF
|
||||
if (dump & CTF_DUMP)
|
||||
{
|
||||
if (! dump_section_as_ctf (section, filedata))
|
||||
res = FALSE;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
/* Check to see if the user requested a
|
||||
|
|
@ -20204,11 +20184,9 @@ main (int argc, char ** argv)
|
|||
if (cmdline.dump_sects != NULL)
|
||||
free (cmdline.dump_sects);
|
||||
|
||||
#ifdef HAVE_LIBCTF
|
||||
free (dump_ctf_symtab_name);
|
||||
free (dump_ctf_strtab_name);
|
||||
free (dump_ctf_parent_name);
|
||||
#endif
|
||||
|
||||
return err ? EXIT_FAILURE : EXIT_SUCCESS;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue