projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include common-defs.h instead of defs.h/server.h in shared code
[deliverable/binutils-gdb.git]
/
gdb
/
osabi.c
diff --git
a/gdb/osabi.c
b/gdb/osabi.c
index 3521877e1f10c0a94bf4f508daa6c8dc727f3d12..cdba812fbde1f294bdbe3d44a923a644ac9cde6a 100644
(file)
--- a/
gdb/osabi.c
+++ b/
gdb/osabi.c
@@
-1,7
+1,6
@@
/* OS ABI variant handling for GDB.
/* OS ABI variant handling for GDB.
- Copyright (C) 2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2011
- Free Software Foundation, Inc.
+ Copyright (C) 2001-2014 Free Software Foundation, Inc.
This file is part of GDB.
This file is part of GDB.
@@
-20,9
+19,6
@@
#include "defs.h"
#include "defs.h"
-#include "gdb_assert.h"
-#include "gdb_string.h"
-
#include "osabi.h"
#include "arch-utils.h"
#include "gdbcmd.h"
#include "osabi.h"
#include "arch-utils.h"
#include "gdbcmd.h"
@@
-64,7
+60,6
@@
static const char * const gdb_osabi_names[] =
"Windows CE",
"DJGPP",
"Irix",
"Windows CE",
"DJGPP",
"Irix",
- "Interix",
"HP/UX ELF",
"HP/UX SOM",
"QNX Neutrino",
"HP/UX ELF",
"HP/UX SOM",
"QNX Neutrino",
@@
-73,6
+68,9
@@
static const char * const gdb_osabi_names[] =
"DICOS",
"Darwin",
"Symbian",
"DICOS",
"Darwin",
"Symbian",
+ "OpenVMS",
+ "LynxOS178",
+ "Newlib",
"<invalid>"
};
"<invalid>"
};
@@
-184,7
+182,7
@@
gdbarch_register_osabi (enum bfd_architecture arch, unsigned long machine,
}
\f
}
\f
-/* Sniffer to find the OS ABI for a given file's architecture and flavour.
+/* Sniffer to find the OS ABI for a given file's architecture and flavour.
It is legal to have multiple sniffers for each arch/flavour pair, to
disambiguate one OS's a.out from another, for example. The first sniffer
to return something other than GDB_OSABI_UNKNOWN wins, so a sniffer should
It is legal to have multiple sniffers for each arch/flavour pair, to
disambiguate one OS's a.out from another, for example. The first sniffer
to return something other than GDB_OSABI_UNKNOWN wins, so a sniffer should
@@
-370,14
+368,23
@@
gdbarch_init_osabi (struct gdbarch_info info, struct gdbarch *gdbarch)
/* Limit on the amount of data to be read. */
#define MAX_NOTESZ 128
/* Limit on the amount of data to be read. */
#define MAX_NOTESZ 128
-/* Return non-zero if NOTE matches NAME, DESCSZ and TYPE. */
+/* Return non-zero if NOTE matches NAME, DESCSZ and TYPE. If
+ *SECTSIZE is non-zero, then this reads that many bytes from
+ the start of the section and clears *SECTSIZE. */
static int
static int
-check_note (bfd *abfd, asection *sect, c
onst char *not
e,
+check_note (bfd *abfd, asection *sect, c
har *note, unsigned int *sectsiz
e,
const char *name, unsigned long descsz, unsigned long type)
{
unsigned long notesz;
const char *name, unsigned long descsz, unsigned long type)
{
unsigned long notesz;
+ if (*sectsize)
+ {
+ if (!bfd_get_section_contents (abfd, sect, note, 0, *sectsize))
+ return 0;
+ *sectsize = 0;
+ }
+
/* Calculate the size of this note. */
notesz = strlen (name) + 1;
notesz = ((notesz + 3) & ~3);
/* Calculate the size of this note. */
notesz = strlen (name) + 1;
notesz = ((notesz + 3) & ~3);
@@
-424,14
+431,18
@@
generic_elf_osabi_sniff_abi_tag_sections (bfd *abfd, asection *sect, void *obj)
if (sectsize > MAX_NOTESZ)
sectsize = MAX_NOTESZ;
if (sectsize > MAX_NOTESZ)
sectsize = MAX_NOTESZ;
+ /* We lazily read the section data here. Since we use
+ BFD_DECOMPRESS, we can't use bfd_get_section_contents on a
+ compressed section. But, since note sections are not compressed,
+ deferring the reading until we recognize the section avoids any
+ error. */
note = alloca (sectsize);
note = alloca (sectsize);
- bfd_get_section_contents (abfd, sect, note, 0, sectsize);
/* .note.ABI-tag notes, used by GNU/Linux and FreeBSD. */
if (strcmp (name, ".note.ABI-tag") == 0)
{
/* GNU. */
/* .note.ABI-tag notes, used by GNU/Linux and FreeBSD. */
if (strcmp (name, ".note.ABI-tag") == 0)
{
/* GNU. */
- if (check_note (abfd, sect, note, "GNU", 16, NT_GNU_ABI_TAG))
+ if (check_note (abfd, sect, note,
§size,
"GNU", 16, NT_GNU_ABI_TAG))
{
unsigned int abi_tag = bfd_h_get_32 (abfd, note + 16);
{
unsigned int abi_tag = bfd_h_get_32 (abfd, note + 16);
@@
-467,7
+478,8
@@
generic_elf_osabi_sniff_abi_tag_sections (bfd *abfd, asection *sect, void *obj)
}
/* FreeBSD. */
}
/* FreeBSD. */
- if (check_note (abfd, sect, note, "FreeBSD", 4, NT_FREEBSD_ABI_TAG))
+ if (check_note (abfd, sect, note, §size, "FreeBSD", 4,
+ NT_FREEBSD_ABI_TAG))
{
/* There is no need to check the version yet. */
*osabi = GDB_OSABI_FREEBSD_ELF;
{
/* There is no need to check the version yet. */
*osabi = GDB_OSABI_FREEBSD_ELF;
@@
-479,7
+491,7
@@
generic_elf_osabi_sniff_abi_tag_sections (bfd *abfd, asection *sect, void *obj)
/* .note.netbsd.ident notes, used by NetBSD. */
if (strcmp (name, ".note.netbsd.ident") == 0
/* .note.netbsd.ident notes, used by NetBSD. */
if (strcmp (name, ".note.netbsd.ident") == 0
- && check_note (abfd, sect, note, "NetBSD", 4, NT_NETBSD_IDENT))
+ && check_note (abfd, sect, note,
§size,
"NetBSD", 4, NT_NETBSD_IDENT))
{
/* There is no need to check the version yet. */
*osabi = GDB_OSABI_NETBSD_ELF;
{
/* There is no need to check the version yet. */
*osabi = GDB_OSABI_NETBSD_ELF;
@@
-488,7
+500,8
@@
generic_elf_osabi_sniff_abi_tag_sections (bfd *abfd, asection *sect, void *obj)
/* .note.openbsd.ident notes, used by OpenBSD. */
if (strcmp (name, ".note.openbsd.ident") == 0
/* .note.openbsd.ident notes, used by OpenBSD. */
if (strcmp (name, ".note.openbsd.ident") == 0
- && check_note (abfd, sect, note, "OpenBSD", 4, NT_OPENBSD_IDENT))
+ && check_note (abfd, sect, note, §size, "OpenBSD", 4,
+ NT_OPENBSD_IDENT))
{
/* There is no need to check the version yet. */
*osabi = GDB_OSABI_OPENBSD_ELF;
{
/* There is no need to check the version yet. */
*osabi = GDB_OSABI_OPENBSD_ELF;
@@
-514,11
+527,15
@@
generic_elf_osabi_sniffer (bfd *abfd)
switch (elfosabi)
{
case ELFOSABI_NONE:
switch (elfosabi)
{
case ELFOSABI_NONE:
+ case ELFOSABI_GNU:
/* When the EI_OSABI field in the ELF header is ELFOSABI_NONE
(0), then the ELF structures in the file are conforming to
the base specification for that machine (there are no
OS-specific extensions). In order to determine the real OS
/* When the EI_OSABI field in the ELF header is ELFOSABI_NONE
(0), then the ELF structures in the file are conforming to
the base specification for that machine (there are no
OS-specific extensions). In order to determine the real OS
- in use we must look for OS-specific notes. */
+ in use, we must look for OS-specific notes.
+
+ The same applies for ELFOSABI_GNU: this can mean GNU/Hurd,
+ GNU/Linux, and possibly more. */
bfd_map_over_sections (abfd,
generic_elf_osabi_sniff_abi_tag_sections,
&osabi);
bfd_map_over_sections (abfd,
generic_elf_osabi_sniff_abi_tag_sections,
&osabi);
@@
-532,14
+549,6
@@
generic_elf_osabi_sniffer (bfd *abfd)
osabi = GDB_OSABI_NETBSD_ELF;
break;
osabi = GDB_OSABI_NETBSD_ELF;
break;
- case ELFOSABI_LINUX:
- osabi = GDB_OSABI_LINUX;
- break;
-
- case ELFOSABI_HURD:
- osabi = GDB_OSABI_HURD;
- break;
-
case ELFOSABI_SOLARIS:
osabi = GDB_OSABI_SOLARIS;
break;
case ELFOSABI_SOLARIS:
osabi = GDB_OSABI_SOLARIS;
break;
@@
-554,6
+563,10
@@
generic_elf_osabi_sniffer (bfd *abfd)
generic_elf_osabi_sniff_abi_tag_sections,
&osabi);
break;
generic_elf_osabi_sniff_abi_tag_sections,
&osabi);
break;
+
+ case ELFOSABI_OPENVMS:
+ osabi = GDB_OSABI_OPENVMS;
+ break;
}
if (osabi == GDB_OSABI_UNKNOWN)
}
if (osabi == GDB_OSABI_UNKNOWN)
This page took
0.026944 seconds
and
4
git commands to generate.