diff options
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/ChangeLog | 9 | ||||
| -rw-r--r-- | binutils/doc/binutils.texi | 3 | ||||
| -rw-r--r-- | binutils/elfedit.c | 4 | ||||
| -rw-r--r-- | binutils/readelf.c | 11 |
4 files changed, 18 insertions, 9 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index d358a16..1d24315 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,12 @@ +2011-07-03 Samuel Thibault <samuel.thibault@gnu.org> + Thomas Schwinge <thomas@schwinge.name> + + * elfedit.c (osabis): Use ELFOSABI_GNU name instead of ELFOSABI_LINUX + alias and ELFOSABI_HURD. Add GNU alias. + * readelf.c (get_osabi_name, get_symbol_binding, get_symbol_type): + Likewise. + * doc/binutils.texi <elfedit>: Update accordingly. + 2011-07-01 Nick Clifton <nickc@redhat.com> PR binutils/12325 diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi index fb1f960..64abcf2 100644 --- a/binutils/doc/binutils.texi +++ b/binutils/doc/binutils.texi @@ -4295,7 +4295,8 @@ Set the matching input ELF file OSABI to @var{osabi}. If @option{--input-osabi} isn't specified, it will match any ELF OSABIs. The supported ELF OSABIs are, @var{none}, @var{HPUX}, @var{NetBSD}, -@var{Linux}, @var{Hurd}, @var{Solaris}, @var{AIX}, @var{Irix}, +@var{GNU}, @var{Linux} (alias for @var{GNU}), +@var{Solaris}, @var{AIX}, @var{Irix}, @var{FreeBSD}, @var{TRU64}, @var{Modesto}, @var{OpenBSD}, @var{OpenVMS}, @var{NSK}, @var{AROS} and @var{FenixOS}. diff --git a/binutils/elfedit.c b/binutils/elfedit.c index 1805ec1..4cc2846 100644 --- a/binutils/elfedit.c +++ b/binutils/elfedit.c @@ -518,8 +518,8 @@ osabis[] = { ELFOSABI_NONE, "none" }, { ELFOSABI_HPUX, "HPUX" }, { ELFOSABI_NETBSD, "NetBSD" }, - { ELFOSABI_LINUX, "Linux" }, - { ELFOSABI_HURD, "Hurd" }, + { ELFOSABI_GNU, "GNU" }, + { ELFOSABI_GNU, "Linux" }, { ELFOSABI_SOLARIS, "Solaris" }, { ELFOSABI_AIX, "AIX" }, { ELFOSABI_IRIX, "Irix" }, diff --git a/binutils/readelf.c b/binutils/readelf.c index c1bc2c5..7922f8a 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -2612,8 +2612,7 @@ get_osabi_name (unsigned int osabi) case ELFOSABI_NONE: return "UNIX - System V"; case ELFOSABI_HPUX: return "UNIX - HP-UX"; case ELFOSABI_NETBSD: return "UNIX - NetBSD"; - case ELFOSABI_LINUX: return "UNIX - Linux"; - case ELFOSABI_HURD: return "GNU/Hurd"; + case ELFOSABI_GNU: return "UNIX - GNU"; case ELFOSABI_SOLARIS: return "UNIX - Solaris"; case ELFOSABI_AIX: return "UNIX - AIX"; case ELFOSABI_IRIX: return "UNIX - IRIX"; @@ -8587,8 +8586,8 @@ get_symbol_binding (unsigned int binding) else if (binding >= STB_LOOS && binding <= STB_HIOS) { if (binding == STB_GNU_UNIQUE - && (elf_header.e_ident[EI_OSABI] == ELFOSABI_LINUX - /* GNU/Linux is still using the default value 0. */ + && (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); @@ -8640,8 +8639,8 @@ get_symbol_type (unsigned int type) } if (type == STT_GNU_IFUNC - && (elf_header.e_ident[EI_OSABI] == ELFOSABI_LINUX - /* GNU/Linux is still using the default value 0. */ + && (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"; |