Re: Renaming .debug to .zdebug and vice versa

[Simon Marchi <simon.marchi@polymtl.ca>]

On 12/4/22 16:51, Alan Modra wrote:
> Move a couple of elf.c functions to compress.c.
> 
> 	* compress.c (bfd_debug_name_to_zdebug): New inline function.
> 	(bfd_zdebug_name_to_debug): Likewise.
> 	* elf.c (convert_debug_to_zdebug, convert_zdebug_to_debug): Delete.
> 	(_bfd_elf_make_section_from_shdr, elf_fake_sections),
> 	(_bfd_elf_assign_file_positions_for_non_load): Adjust to suit.
> 	* coffgen.c (make_a_section_from_file): Use new inlines here.
> 
> diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
> index 0b071dda1e5..48451175364 100644
> --- a/bfd/bfd-in2.h
> +++ b/bfd/bfd-in2.h
> @@ -7963,6 +7963,31 @@ bfd_byte *bfd_simple_get_relocated_section_contents
>     (bfd *abfd, asection *sec, bfd_byte *outbuf, asymbol **symbol_table);
>  
>  /* Extracted from compress.c.  */
> +static inline char *
> +bfd_debug_name_to_zdebug (bfd *abfd, const char *name)
> +{
> +  size_t len = strlen (name);
> +  char *new_name = bfd_alloc (abfd, len + 2);
> +  if (new_name == NULL)
> +    return NULL;
> +  new_name[0] = '.';
> +  new_name[1] = 'z';
> +  memcpy (new_name + 2, name + 1, len);
> +  return new_name;
> +}
> +
> +static inline char *
> +bfd_zdebug_name_to_debug (bfd *abfd, const char *name)
> +{
> +  size_t len = strlen (name);
> +  char *new_name = bfd_alloc (abfd, len);
> +  if (new_name == NULL)
> +    return NULL;
> +  new_name[0] = '.';
> +  memcpy (new_name + 1, name + 2, len - 1);
> +  return new_name;
> +}

Hi Alan,

This breaks GDB.  We need to cast the bfd_alloc return value so that it compiles as C++.

  CXX    gdb.o
In file included from /home/simark/src/binutils-gdb/gdb/defs.h:37,
                 from /home/simark/src/binutils-gdb/gdb/gdb.c:19:
../bfd/bfd.h: In function ‘char* bfd_debug_name_to_zdebug(bfd*, const char*)’:
../bfd/bfd.h:7970:30: error: invalid conversion from ‘void*’ to ‘char*’ [-fpermissive]
 7970 |   char *new_name = bfd_alloc (abfd, len + 2);
      |                    ~~~~~~~~~~^~~~~~~~~~~~~~~
      |                              |
      |                              void*

Simon