X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fliboasys.h;h=8228d977f89168d22a553d4a222d892a0ecaa277;hb=09be558e1074c285df631d3d8fa680135b4bd284;hp=59e4a89401121e3f5de9bdfa5755e2f363355809;hpb=87f86b4ec66450e49987cc9cbc1b21e5fde8070c;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/liboasys.h b/bfd/liboasys.h
index 59e4a89401..8228d977f8 100644
--- a/bfd/liboasys.h
+++ b/bfd/liboasys.h
@@ -1,61 +1,77 @@
+/* BFD internal declarations for Oasys file format handling.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1997, 2002, 2005, 2007
+   Free Software Foundation, Inc.
+   Scrawled by Steve Chamberlain of Cygnus Support.
 
+   This file is part of BFD, the Binary File Descriptor library.
 
-typedef struct {
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+typedef struct _oasys_symbol
+{
   asymbol symbol;
 } oasys_symbol_type;
 
-typedef struct oasys_reloc_struct {
+typedef struct _oasys_reloc {
   arelent relent;
-  struct oasys_reloc_struct *next;
+  struct _oasys_reloc *next;
   unsigned int symbol;
 } oasys_reloc_type;
 
 
 #define oasys_symbol(x) ((oasys_symbol_type *)(x))
 #define oasys_per_section(x) ((oasys_per_section_type *)(x->used_by_bfd))
-typedef struct oasys_per_section_struct
+
+typedef struct _oasys_per_section
 {
   asection *section;
   bfd_byte *data;
   bfd_vma offset;
-
+  bfd_boolean had_vma;
   oasys_reloc_type **reloc_tail_ptr;
   bfd_vma pc;
-  /* For output */
-  struct obstack reloc_obstack;
+
+
   file_ptr current_pos;
   unsigned int current_byte;
-  boolean initialized;
+  bfd_boolean initialized;
 } oasys_per_section_type;
 
 #define NSECTIONS 10
 
-  
-
-
-
-typedef struct {
+typedef struct _oasys_ar_obstack {
   file_ptr file_offset;
   bfd *abfd;
 } oasys_ar_obstack_type;
 
 
-typedef struct {
+typedef struct _oasys_module_info {
   file_ptr pos;
   unsigned int size;
   bfd *abfd;
-char *name;
-
+  char *name;
 } oasys_module_info_type;
 
-typedef struct {
+typedef struct _oasys_ar_data {
   oasys_module_info_type *module;
   unsigned int module_count;
   unsigned int module_index;
 } oasys_ar_data_type;
 
-typedef struct {
-
+typedef struct _oasys_data {
   char *strings;
   asymbol *symbols;
   unsigned int symbol_string_length;
@@ -63,8 +79,6 @@ typedef struct {
   file_ptr first_data_record;
 } oasys_data_type;
 
-#define oasys_data(abfd) ((oasys_data_type *)((abfd)->tdata))
-#define oasys_ar_data(abfd) ((oasys_ar_data_type *)((abfd)->tdata))
-
-
+#define OASYS_DATA(abfd)	((abfd)->tdata.oasys_obj_data)
+#define OASYS_AR_DATA(abfd)	((abfd)->tdata.oasys_ar_data)