diff options
| author | Nick Alcock <nick.alcock@oracle.com> | 2019-09-30 15:04:05 +0100 |
|---|---|---|
| committer | Nick Alcock <nick.alcock@oracle.com> | 2020-06-26 15:56:39 +0100 |
| commit | 094e34f22146ad53eb93da22e480cab428bd23b5 (patch) | |
| tree | 67dcb4257f8436adcde9d021bd8f99c774de47d8 /ld/ldelfgen.c | |
| parent | 1776e3e59ca6200dff981894361b8b49cb453766 (diff) | |
| download | gdb-094e34f22146ad53eb93da22e480cab428bd23b5.zip gdb-094e34f22146ad53eb93da22e480cab428bd23b5.tar.gz gdb-094e34f22146ad53eb93da22e480cab428bd23b5.tar.bz2 | |
binutils, ld: work with --disable-libctf
This unfortunately means conditionalizing out all the libctf code, but
the result is not too unbearably ugly, if a bit repetitive. I have
stubbed out code in the !ENABLE_LIBCTF path to avoid extra redundant
ifdefs where it seems that might be helpful. (The stubs are not too
disruptive, but I've tried to keep them on one line where possible to
avoid filling up the screen with stubs that nobody would care about.
If this is too much of a coding style violation I can change it.)
Changes since v2: use GCC_ENABLE rather than repeating all the
AC_ARG_ENABLE stuff over and over again.
ld/
* configure.ac [--enable-libctf]: New, default yes.
Set ENABLE_LIBCTF accordingly.
* Makefile.am [!ENABLE_LIBCTF]: Empty LIBCTF.
* configure: Regenerate.
* config.in: Regenerate.
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* ldlang.c (ctf_output): Conditionalize on ENABLE_LIBCTF.
(ldlang_open_ctf): Likewise.
(lang_merge_ctf): Likewise.
(ldlang_ctf_apply_strsym): Likewise.
(lang_write_ctf): Likewise.
(ldlang_write_ctf_late): Likewise.
(ldlang_open_ctf) [!ENABLE_LIBCTF]: Warn about the presence of CTF
sections.
(lang_merge_ctf) [!ENABLE_LIBCTF]: New stub.
(ldlang_ctf_apply_strsym) [!ENABLE_LIBCTF]: Likewise.
(lang_write_ctf) [!ENABLE_LIBCTF]: Likewise.
(ldlang_write_ctf_late) [!ENABLE_LIBCTF]: Likewise.
* ldelfgen.c (ldelf_emit_ctf_early): Conditionalize on
ENABLE_LIBCTF.
(struct ctf_strsym_iter_cb_arg): Likewise.
(ldelf_ctf_strtab_iter_cb): Likewise.
(ldelf_ctf_symbols_iter_cb): Likewise.
(ldelf_examine_strtab_for_ctf): Likewise.
(ldelf_emit_ctf_early) [!ENABLE_LIBCTF]: New stub.
(ldelf_examine_strtab_for_ctf) [!ENABLE_LIBCTF]: New stub.
binutils/
* configure.ac [--enable-libctf]: New, default yes.
Set ENABLE_LIBCTF accordingly.
* Makefile.am [!ENABLE_LIBCTF]: Empty LIBCTF and LIBCTF_NOBFD.
* configure: Regenerate.
* config.in: Regenerate.
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* objdump.c (usage): Conditionalize portions on ENABLE_LIBCTF.
(option_values): Likewise.
(long_options): Likewise.
(main): Likewise.
(dump_ctf_indent_lines): Conditionalize out when !ENABLE_LIBCTF.
(make_ctfsect): Likewise.
(dump_ctf_archive_member): Likewise.
(dump_ctf) [ENABLE_LIBCTF]: Likewise.
(dump_ctf) [!ENABLE_LIBCTF]: New empty stub.
* readelf.c (options): Conditionalize portions on ENABLE_LIBCTF.
(usage): Likewise.
(process_section_contents): Likewise.
(shdr_to_ctf_sect): Conditionalize out when !ENABLE_LIBCTF.
(dump_ctf_indent_lines): Likewise.
(dump_section_as_ctf) [ENABLE_LIBCTF]: Likewise.
Diffstat (limited to 'ld/ldelfgen.c')
| -rw-r--r-- | ld/ldelfgen.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/ld/ldelfgen.c b/ld/ldelfgen.c index c0568f1..3a56194 100644 --- a/ld/ldelfgen.c +++ b/ld/ldelfgen.c @@ -88,6 +88,7 @@ ldelf_map_segments (bfd_boolean need_layout) } } +#ifdef ENABLE_LIBCTF /* We want to emit CTF early if and only if we are not targetting ELF with this invocation. */ @@ -197,3 +198,16 @@ ldelf_examine_strtab_for_ctf "cost: %s\n"), ctf_errmsg (ctf_errno (ctf_output))); } } +#else +extern int ldelf_emit_ctf_early (void) +{ + return 0; +} + +extern void ldelf_examine_strtab_for_ctf + (struct ctf_file *ctf_output ATTRIBUTE_UNUSED, + struct elf_sym_strtab *syms ATTRIBUTE_UNUSED, + bfd_size_type symcount ATTRIBUTE_UNUSED, + struct elf_strtab_hash *symstrtab ATTRIBUTE_UNUSED) +{} +#endif |