Attachment #5804 for bug #12913

(-)bfd/elf.c (-2 / +2 lines)

Lines 9608-9618 _bfd_elf_set_osabi (bfd * abfd,	Link Here

9608

  i_ehdrp->e_ident[EI_OSABI] = get_elf_backend_data (abfd)->elf_osabi;

9608

  i_ehdrp->e_ident[EI_OSABI] = get_elf_backend_data (abfd)->elf_osabi;

9609

9610

  /* To make things simpler for the loader on Linux systems we set the

9610

  /* To make things simpler for the loader on Linux systems we set the

9611

     osabi field to ELFOSABI_LINUX if the binary contains symbols of

9611

     osabi field to ELFOSABI_GNU if the binary contains symbols of

9612

     the STT_GNU_IFUNC type or STB_GNU_UNIQUE binding.  */

9612

     the STT_GNU_IFUNC type or STB_GNU_UNIQUE binding.  */

9613

  if (i_ehdrp->e_ident[EI_OSABI] == ELFOSABI_NONE

9613

  if (i_ehdrp->e_ident[EI_OSABI] == ELFOSABI_NONE

9614

      && elf_tdata (abfd)->has_gnu_symbols)

9614

      && elf_tdata (abfd)->has_gnu_symbols)

9615

    i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_LINUX;

9615

    i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_GNU;

9616

9617

9618

(-)bfd/elf32-hppa.c (-2 / +2 lines)

Lines 950-958 elf32_hppa_object_p (bfd *abfd)	Link Here

950

  i_ehdrp = elf_elfheader (abfd);

950

  i_ehdrp = elf_elfheader (abfd);

951

  if (strcmp (bfd_get_target (abfd), "elf32-hppa-linux") == 0)

951

  if (strcmp (bfd_get_target (abfd), "elf32-hppa-linux") == 0)

952

953

      /* GCC on hppa-linux produces binaries with OSABI=Linux,

953

      /* GCC on hppa-linux produces binaries with OSABI=GNU,

954

	 but the kernel produces corefiles with OSABI=SysV.  */

954

	 but the kernel produces corefiles with OSABI=SysV.  */

955

      if (i_ehdrp->e_ident[EI_OSABI] != ELFOSABI_LINUX &&

955

      if (i_ehdrp->e_ident[EI_OSABI] != ELFOSABI_GNU &&

956

	  i_ehdrp->e_ident[EI_OSABI] != ELFOSABI_NONE) /* aka SYSV */

956

	  i_ehdrp->e_ident[EI_OSABI] != ELFOSABI_NONE) /* aka SYSV */

957

	return FALSE;

957

	return FALSE;

958

(-)bfd/elf64-hppa.c (-2 / +2 lines)

Lines 329-337 elf64_hppa_object_p (bfd *abfd)	Link Here

329

  i_ehdrp = elf_elfheader (abfd);

329

  i_ehdrp = elf_elfheader (abfd);

330

  if (strcmp (bfd_get_target (abfd), "elf64-hppa-linux") == 0)

330

  if (strcmp (bfd_get_target (abfd), "elf64-hppa-linux") == 0)

331

332

      /* GCC on hppa-linux produces binaries with OSABI=Linux,

332

      /* GCC on hppa-linux produces binaries with OSABI=GNU,

333

	 but the kernel produces corefiles with OSABI=SysV.  */

333

	 but the kernel produces corefiles with OSABI=SysV.  */

334

      if (i_ehdrp->e_ident[EI_OSABI] != ELFOSABI_LINUX

334

      if (i_ehdrp->e_ident[EI_OSABI] != ELFOSABI_GNU

335

	  && i_ehdrp->e_ident[EI_OSABI] != ELFOSABI_NONE) /* aka SYSV */

335

	  && i_ehdrp->e_ident[EI_OSABI] != ELFOSABI_NONE) /* aka SYSV */

336

	return FALSE;

336

	return FALSE;

337

(-)binutils/elfedit.c (-2 / +1 lines)

Lines 518-525 osabis[] =	Link Here

518

  { ELFOSABI_NONE, "none" },

518

  { ELFOSABI_NONE, "none" },

519

  { ELFOSABI_HPUX, "HPUX" },

519

  { ELFOSABI_HPUX, "HPUX" },

520

  { ELFOSABI_NETBSD, "NetBSD" },

520

  { ELFOSABI_NETBSD, "NetBSD" },

521

  { ELFOSABI_LINUX, "Linux" },

521

  { ELFOSABI_GNU, "GNU" },

522

  { ELFOSABI_HURD, "Hurd" },

523

  { ELFOSABI_SOLARIS, "Solaris" },

522

  { ELFOSABI_SOLARIS, "Solaris" },

524

  { ELFOSABI_AIX, "AIX" },

523

  { ELFOSABI_AIX, "AIX" },

525

  { ELFOSABI_IRIX, "Irix" },

524

  { ELFOSABI_IRIX, "Irix" },




    case ELFOSABI_NONE:		return "UNIX - System V";
    case ELFOSABI_HPUX:		return "UNIX - HP-UX";
    case ELFOSABI_NETBSD:	return "UNIX - NetBSD";
    case ELFOSABI_GNU:		return "UNIX - GNU";
    case ELFOSABI_HURD:		return "GNU/Hurd";
    case ELFOSABI_SOLARIS:	return "UNIX - Solaris";
    case ELFOSABI_AIX:		return "UNIX - AIX";
    case ELFOSABI_IRIX:		return "UNIX - IRIX";

      else if (binding >= STB_LOOS && binding <= STB_HIOS)
	{
	  if (binding == STB_GNU_UNIQUE
	      && (elf_header.e_ident[EI_OSABI] == ELFOSABI_GNU
		  /* GNU is still using the default value 0.  */
		  || elf_header.e_ident[EI_OSABI] == ELFOSABI_NONE))
	    return "UNIQUE";
	  snprintf (buff, sizeof (buff), _("<OS specific>: %d"), binding);

	    }

	  if (type == STT_GNU_IFUNC
	      && (elf_header.e_ident[EI_OSABI] == ELFOSABI_GNU
		  /* GNU is still using the default value 0.  */
		  || elf_header.e_ident[EI_OSABI] == ELFOSABI_NONE))
	    return "IFUNC";


(-)elfcpp/elfcpp.h (-3 / +3 lines)

Lines 129-138 enum ELFOSABI	Link Here

129

  ELFOSABI_NONE = 0,

129

  ELFOSABI_NONE = 0,

130

  ELFOSABI_HPUX = 1,

130

  ELFOSABI_HPUX = 1,

131

  ELFOSABI_NETBSD = 2,

131

  ELFOSABI_NETBSD = 2,

132

  // ELFOSABI_LINUX is not listed in the ELF standard.

132

  // ELFOSABI_GNU is not listed in the ELF standard.

133

  ELFOSABI_GNU = 3,

134

  // ELFOSABI_LINUX is not listed in the ELF standard, and is an alias for ELFOSABI_GNU

133

  ELFOSABI_LINUX = 3,

135

  ELFOSABI_LINUX = 3,

134

  // ELFOSABI_HURD is not listed in the ELF standard.

135

  ELFOSABI_HURD = 4,

136

  ELFOSABI_SOLARIS = 6,

136

  ELFOSABI_SOLARIS = 6,

137

  ELFOSABI_AIX = 7,

137

  ELFOSABI_AIX = 7,

138

  ELFOSABI_IRIX = 8,

138

  ELFOSABI_IRIX = 8,




      const struct elf_backend_data *bed;

      bed = get_elf_backend_data (stdoutput);
      if (!(bed->elf_osabi == ELFOSABI_GNU
	    /* GNU is still using the default value 0.  */
	    || bed->elf_osabi == ELFOSABI_NONE))
	as_bad (_("symbol type \"%s\" is supported only by GNU targets"),
		type_name);

      struct elf_backend_data *bed;

      bed = (struct elf_backend_data *) get_elf_backend_data (stdoutput);
      if (!(bed->elf_osabi == ELFOSABI_GNU
	    /* GNU is still using the default value 0.  */
	    || bed->elf_osabi == ELFOSABI_NONE))
	as_bad (_("symbol type \"%s\" is supported only by GNU targets"),
		type_name);
      type = BSF_OBJECT | BSF_GNU_UNIQUE;
      /* PR 10549: Always set OSABI field to GNU for objects containing unique symbols.  */
      bed->elf_osabi = ELFOSABI_GNU;
    }
#ifdef md_elf_symbol_type
  else if ((type = md_elf_symbol_type (type_name, sym, elfsym)) != -1)

(-)include/elf/common.h (-2 / +2 lines)

Lines 62-69	Link Here

#define ELFOSABI_NONE	      0	/* UNIX System V ABI */

#define ELFOSABI_NONE	      0	/* UNIX System V ABI */

#define ELFOSABI_HPUX	      1	/* HP-UX operating system */

#define ELFOSABI_HPUX	      1	/* HP-UX operating system */

#define ELFOSABI_NETBSD	      2	/* NetBSD */

#define ELFOSABI_NETBSD	      2	/* NetBSD */

#define ELFOSABI_LINUX	      3	/* GNU/Linux */

#define ELFOSABI_GNU	      3	/* GNU */

#define ELFOSABI_HURD	      4	/* GNU/Hurd */

#define ELFOSABI_LINUX	      3	/* Alias for ELFOSABI_GNU */

#define ELFOSABI_SOLARIS      6	/* Solaris */

#define ELFOSABI_SOLARIS      6	/* Solaris */

#define ELFOSABI_AIX	      7	/* AIX */

#define ELFOSABI_AIX	      7	/* AIX */

#define ELFOSABI_IRIX	      8	/* IRIX */

#define ELFOSABI_IRIX	      8	/* IRIX */

Return to bug 12913