PR5900

[H.J. Lu]

On Wed, Mar 12, 2008 at 07:02:40PM +1030, Alan Modra wrote:
>  /* The number of entries in a section is its size divided by the size
> Index: bfd/elfcode.h
> ===================================================================
> RCS file: /cvs/src/src/bfd/elfcode.h,v
> retrieving revision 1.89
> diff -u -p -r1.89 elfcode.h
> --- bfd/elfcode.h	11 Mar 2008 23:23:23 -0000	1.89
> +++ bfd/elfcode.h	12 Mar 2008 07:45:21 -0000
> @@ -189,12 +189,14 @@ elf_swap_symbol_in (bfd *abfd,
>    dst->st_info = H_GET_8 (abfd, src->st_info);
>    dst->st_other = H_GET_8 (abfd, src->st_other);
>    dst->st_shndx = H_GET_16 (abfd, src->st_shndx);
> -  if (dst->st_shndx == SHN_XINDEX)
> +  if (dst->st_shndx == (SHN_XINDEX & 0xffff))
>      {
>        if (shndx == NULL)
>  	return FALSE;
>        dst->st_shndx = H_GET_32 (abfd, shndx->est_shndx);
>      }
> +  else if (dst->st_shndx >= (SHN_LORESERVE & 0xffff))
> +    dst->st_shndx += SHN_LORESERVE - (SHN_LORESERVE & 0xffff);
>    return TRUE;
>  }
>  
> @@ -215,12 +217,12 @@ elf_swap_symbol_out (bfd *abfd,
>    H_PUT_8 (abfd, src->st_info, dst->st_info);
>    H_PUT_8 (abfd, src->st_other, dst->st_other);
>    tmp = src->st_shndx;
> -  if (tmp > SHN_HIRESERVE)
> +  if (tmp >= (SHN_LORESERVE & 0xffff) && tmp < SHN_LORESERVE)
>      {
>        if (shndx == NULL)
>  	abort ();
>        H_PUT_32 (abfd, tmp, shndx);
> -      tmp = SHN_XINDEX;
> +      tmp = SHN_XINDEX & 0xffff;
>      }
>    H_PUT_16 (abfd, tmp, dst->st_shndx);
>  }
> @@ -280,12 +282,12 @@ elf_swap_ehdr_out (bfd *abfd,
>    H_PUT_16 (abfd, src->e_phnum, dst->e_phnum);
>    H_PUT_16 (abfd, src->e_shentsize, dst->e_shentsize);
>    tmp = src->e_shnum;
> -  if (tmp >= SHN_LORESERVE)
> +  if (tmp >= (SHN_LORESERVE & 0xffff))
>      tmp = SHN_UNDEF;
>    H_PUT_16 (abfd, tmp, dst->e_shnum);
>    tmp = src->e_shstrndx;
> -  if (tmp >= SHN_LORESERVE)
> -    tmp = SHN_XINDEX;
> +  if (tmp >= (SHN_LORESERVE & 0xffff))
> +    tmp = SHN_XINDEX & 0xffff;
>    H_PUT_16 (abfd, tmp, dst->e_shstrndx);
>  }

Will the above work when number of sections >= (unsigned int) -0x100u?


H.J.