PR binutils/13558

[deliverable/binutils-gdb.git] / bfd / mach-o.h

diff --git a/bfd/mach-o.h b/bfd/mach-o.h
index 123eddafef9cdef8f3dadb105e1978d9a2bdf3f2..67ee43db827c3024867eef58c91463c4518befd4 100644 (file)
--- a/bfd/mach-o.h
+++ b/bfd/mach-o.h
@@ -23,6 +23,7 @@
 #ifndef _BFD_MACH_O_H_
 #define _BFD_MACH_O_H_
 
+#include "sysdep.h"
 #include "bfd.h"
 #include "mach-o/loader.h"
 
@@ -42,6 +43,18 @@ typedef struct bfd_mach_o_header
 }
 bfd_mach_o_header;
 
+typedef struct bfd_mach_o_asymbol
+{
+  /* The actual symbol which the rest of BFD works with.  */
+  asymbol symbol;
+
+  /* Mach-O symbol fields.  */
+  unsigned char n_type;
+  unsigned char n_sect;
+  unsigned short n_desc;
+}
+bfd_mach_o_asymbol;
+
 #define BFD_MACH_O_SEGNAME_SIZE 16
 #define BFD_MACH_O_SECTNAME_SIZE 16
 
@@ -64,6 +77,12 @@ typedef struct bfd_mach_o_section
   /* Corresponding bfd section.  */
   asection *bfdsection;
 
+  /* An array holding the indirect symbols for this section.
+     NULL values indicate local symbols.
+     The number of symbols is determined from the section size and type.  */
+
+  bfd_mach_o_asymbol **indirect_syms;
+
   /* Simply linked list.  */
   struct bfd_mach_o_section *next;
 }
@@ -105,26 +124,12 @@ typedef struct bfd_mach_o_reloc_info
 }
 bfd_mach_o_reloc_info;
 
-typedef struct bfd_mach_o_asymbol
-{
-  /* The actual symbol which the rest of BFD works with.  */
-  asymbol symbol;
-
-  /* Mach-O symbol fields.  */
-  unsigned char n_type;
-  unsigned char n_sect;
-  unsigned short n_desc;
-}
-bfd_mach_o_asymbol;
-
 /* The symbol table is sorted like this:
  (1) local.
        (otherwise in order of generation)
  (2) external defined
        (sorted by name)
- (3) external undefined
-       (sorted by name)
- (4) common
+ (3) external undefined / common
        (sorted by name)
 */
 
@@ -549,18 +554,6 @@ typedef struct mach_o_data_struct
   bfd_mach_o_symtab_command *symtab;
   bfd_mach_o_dysymtab_command *dysymtab;
 
-  /* Base values used for building the dysymtab for a single-module object.  */  
-  unsigned long nlocal;
-  unsigned long ndefext;
-  unsigned long nundefext;
-
-  /* If this is non-zero, then the pointer below is populated.  */
-  unsigned long nindirect;
-  /* A set of synthetic symbols representing the 'indirect' ones in the file.
-     These should be sorted (a) by the section they represent and (b) by the
-     order that they appear within each section.  */
-  asymbol **indirect_syms;
-
   /* A place to stash dwarf2 info for this bfd.  */
   void *dwarf2_find_line_info;
 
@@ -691,8 +684,10 @@ typedef struct bfd_mach_o_backend_data
 }
 bfd_mach_o_backend_data;
 
-/* Symbol type tests.  */
+/* Values used in symbol.udata.i, to signal that the mach-o-specific data in the
+   symbol are not yet set, or need validation (where this is possible).  */
 
-#define IS_MACHO_INDIRECT(x) (((x) & BFD_MACH_O_N_TYPE) == BFD_MACH_O_N_INDR)
+#define SYM_MACHO_FIELDS_UNSET ((bfd_vma) -1)
+#define SYM_MACHO_FIELDS_NOT_VALIDATED ((bfd_vma) -2)
 
 #endif /* _BFD_MACH_O_H_ */