2012-02-21 Tristan Gingold <gingold@adacore.com>

	* config/tc-i386.h (OBJ_MACH_O): New section.
	(TC_FORCE_RELOCATION): Use obj_mach_o_force_reloc.
	(TC_FORCE_RELOCATION_SUB_SAME): New
	(TC_FORCE_RELOCATION_SUB_LOCAL): New.
	(TC_VALIDATE_FIX_SUB): New.
	* frags.h (struct frag): OBJ_FRAG_TYPE, new field.
	* symbols.c (colon): obj_frob_colon: New hook.
	* write.c (write_object_file): md_pre_relax_hook, new
	hook.
	* config/obj-macho.c (obj_mach_o_frob_colon): New.
	(obj_mach_o_frob_label): Record sub-section labels.
	(obj_mach_o_frob_symbol): Rename from obj_macho_frob_symbol.
	(obj_mach_o_set_subsections): New.
	(obj_mach_o_pre_relax_hook): New.
	(obj_mach_o_in_different_subsection): New.
	(obj_mach_o_force_reloc_sub_same): New.
	(obj_mach_o_force_reloc_sub_local): New.
	(obj_mach_o_force_reloc): New.
	* config/obj-macho.h (OBJ_SYMFIELD_TYPE): New.
	(obj_frob_colon): New Define.
	(obj_mach_o_frob_label): Renamed.
	(obj_mach_o_frob_symbol): Renamed.
	(OBJ_FRAG_TYPE): New.
	(obj_mach_o_in_different_subsection, obj_mach_o_force_reloc,
	 obj_mach_o_force_reloc_sub_same,
	 obj_mach_o_force_reloc_sub_local): New declarations.

1 files changed, 41 insertions, 12 deletions

diff --git a/gas/config/obj-macho.h b/gas/config/obj-macho.h
index e081ba0ec2d..0ac8df4174a 100644
--- a/gas/config/obj-macho.h
+++ b/gas/config/obj-macho.h
@@ -35,7 +35,7 @@
 extern void mach_o_begin (void);
 
 /* All our align expressions are power of two.  */
-#define USE_ALIGN_PTWO
+#define USE_ALIGN_PTWO 1
 
 /* Common symbols can carry alignment information.  */
 #ifndef S_SET_ALIGN
@@ -56,22 +56,50 @@ extern const pseudo_typeS mach_o_pseudo_table[];
 #define obj_read_begin_hook()	{;}
 #define obj_symbol_new_hook(s)	{;}
 
-#define obj_frob_label(s) obj_macho_frob_label(s)
-extern void obj_macho_frob_label (struct symbol *);
+#define EMIT_SECTION_SYMBOLS		0
+
+struct obj_mach_o_symbol_data
+{
+  /* If the symbol represents a subsection, this is the size of the subsection.
+     This is used to check whether a local symbol belongs to a subsection.  */
+  valueT subsection_size;
+};
+#define OBJ_SYMFIELD_TYPE struct obj_mach_o_symbol_data
+
+#define obj_frob_colon obj_mach_o_frob_colon
+extern void obj_mach_o_frob_colon (const char *);
+
+/* Called when a label is defined.  Mach-O uses this to create subsections.  */
+#define obj_frob_label obj_mach_o_frob_label
+extern void obj_mach_o_frob_label (symbolS *);
+
+#define obj_frob_symbol(s, punt) punt = obj_mach_o_frob_symbol(s)
+extern int obj_mach_o_frob_symbol (struct symbol *);
+
+#define OBJ_PROCESS_STAB(SEG,W,S,T,O,D)	obj_mach_o_process_stab(W,S,T,O,D)
+extern void obj_mach_o_process_stab (int, const char *,int, int, int);
+
+struct obj_mach_o_frag_data
+{
+  /* Symbol that corresponds to the subsection.  */
+  symbolS *subsection;
+};
+  
+#define OBJ_FRAG_TYPE struct obj_mach_o_frag_data
 
-#define obj_frob_symbol(s, punt) punt = obj_macho_frob_symbol(s)
-extern int obj_macho_frob_symbol (struct symbol *);
+#define md_pre_relax_hook obj_mach_o_pre_relax_hook()
+extern void obj_mach_o_pre_relax_hook (void);
 
 #define md_post_relax_hook obj_mach_o_post_relax_hook()
-void obj_mach_o_post_relax_hook (void);
+extern void obj_mach_o_post_relax_hook (void);
 
 #define obj_frob_file_after_relocs obj_mach_o_frob_file_after_relocs
 extern void obj_mach_o_frob_file_after_relocs (void);
 
-void obj_mach_o_reorder_section_relocs (asection *, arelent **, unsigned int);
-
 #define SET_SECTION_RELOCS(sec, relocs, n) \
   obj_mach_o_reorder_section_relocs (sec, relocs, n)
+extern void obj_mach_o_reorder_section_relocs (asection *, arelent **,
+					       unsigned int);
 
 /* Emit relocs for local subtracts, to cater for subsections-via-symbols.  */
 #define md_allow_local_subtract(LEFT, RIGHT, SECTION) \
@@ -79,9 +107,10 @@ void obj_mach_o_reorder_section_relocs (asection *, arelent **, unsigned int);
 extern int obj_mach_o_allow_local_subtract (expressionS *, expressionS *,
 					    segT);
 
-#define EMIT_SECTION_SYMBOLS		0
-
-#define OBJ_PROCESS_STAB(SEG,W,S,T,O,D)	obj_mach_o_process_stab(W,S,T,O,D)
-extern void obj_mach_o_process_stab (int, const char *,int, int, int);
+struct fix;
+extern int obj_mach_o_in_different_subsection (symbolS *a, symbolS *b);
+extern int obj_mach_o_force_reloc (struct fix *fix);
+extern int obj_mach_o_force_reloc_sub_same (struct fix *fix, segT seg);
+extern int obj_mach_o_force_reloc_sub_local (struct fix *fix, segT seg);
 
 #endif /* _OBJ_MACH_O_H */