diff options
| author | Alan Modra <amodra@gmail.com> | 2022-12-06 08:43:31 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2022-12-06 12:11:28 +1030 |
| commit | 89dbeac7460eaa2c6b0149b8abfac880ecefbfe3 (patch) | |
| tree | 8a05d32e7adcc0bb459d06de592ca208605618de /binutils/readelf.c | |
| parent | 8b4d46dfdf2023d3da295fc3748ce67f064e3df0 (diff) | |
Compression header enum
Define an enum instead of using ELFCOMPRESS_ZLIB and ELFCOMPRESS_ZSTD
in bfd and binutils, and move some functions from bfd.c to compress.c.
When looking at the COFF/PE debug compression support, I wondered
about extending it to support zstd. I likely won't do that, but
the compression header ch_type field isn't just ELF specific if these
headers are to be used in COFF/PE too.
bfd/
* bfd.c (bfd_update_compression_header),
(bfd_check_compression_header, bfd_get_compression_header_size),
(bfd_convert_section_size, bfd_convert_section_contents): Move to..
* compress.c: ..here.
(enum compression_type): New. Use it throughout file.
* elf.c (_bfd_elf_make_section_from_shdr): Replace uses of
ELFCOMPRESS_ZLIB and ELFCOMPRESS_ZSTD with ch_compress_zlib and
ch_compress_zstd.
* bfd-in2.h: Regenerate.
binutils/
* readelf.c (process_section_headers, dump_section_as_strings),
(dump_section_as_bytes, load_specific_debug_section): Replace
uses of ELFCOMPRESS_ZLIB and ELFCOMPRESS_ZSTD with
ch_compress_zlib and ch_compress_zstd.
Diffstat (limited to 'binutils/readelf.c')
| -rw-r--r-- | binutils/readelf.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/binutils/readelf.c b/binutils/readelf.c index 1bd6df9448a..bce93782952 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -7803,9 +7803,9 @@ process_section_headers (Filedata * filedata) printf (_(" [<corrupt>]\n")); else { - if (chdr.ch_type == ELFCOMPRESS_ZLIB) + if (chdr.ch_type == ch_compress_zlib) printf (" ZLIB, "); - else if (chdr.ch_type == ELFCOMPRESS_ZSTD) + else if (chdr.ch_type == ch_compress_zstd) printf (" ZSTD, "); else printf (_(" [<unknown>: 0x%x], "), @@ -15369,10 +15369,10 @@ dump_section_as_strings (Elf_Internal_Shdr * section, Filedata * filedata) by get_compression_header. */ goto error_out; - if (chdr.ch_type == ELFCOMPRESS_ZLIB) + if (chdr.ch_type == ch_compress_zlib) ; #ifdef HAVE_ZSTD - else if (chdr.ch_type == ELFCOMPRESS_ZSTD) + else if (chdr.ch_type == ch_compress_zstd) is_zstd = true; #endif else @@ -15592,10 +15592,10 @@ dump_section_as_bytes (Elf_Internal_Shdr *section, by get_compression_header. */ goto error_out; - if (chdr.ch_type == ELFCOMPRESS_ZLIB) + if (chdr.ch_type == ch_compress_zlib) ; #ifdef HAVE_ZSTD - else if (chdr.ch_type == ELFCOMPRESS_ZSTD) + else if (chdr.ch_type == ch_compress_zstd) is_zstd = true; #endif else @@ -16024,10 +16024,10 @@ load_specific_debug_section (enum dwarf_section_display_enum debug, by get_compression_header. */ return false; - if (chdr.ch_type == ELFCOMPRESS_ZLIB) + if (chdr.ch_type == ch_compress_zlib) ; #ifdef HAVE_ZSTD - else if (chdr.ch_type == ELFCOMPRESS_ZSTD) + else if (chdr.ch_type == ch_compress_zstd) is_zstd = true; #endif else |