gas/

[deliverable/binutils-gdb.git] / gas / config / tc-mcore.h

diff --git a/gas/config/tc-mcore.h b/gas/config/tc-mcore.h
index 70d45793161e8624bf25f401a174ec3a8851a76f..4ab84e45b75d48147aedfd963f3cf9cedd900644 100644 (file)
--- a/gas/config/tc-mcore.h
+++ b/gas/config/tc-mcore.h
@@ -1,6 +1,7 @@
 /* This file is tc-mcore.h
 
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1999, 2000, 2001, 2002, 2003
+   Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -51,15 +52,14 @@
 #define LOCAL_LABELS_FB 1
 
 #define TC_COFF_SIZEMACHDEP(frag) tc_coff_sizemachdep (frag)
+int tc_coff_sizemachdep PARAMS ((struct frag *));
 
 extern const struct relax_type md_relax_table[];
 #define TC_GENERIC_RELAX_TABLE md_relax_table
 #define md_end md_mcore_end
 
 /* Want the section information too...  */
-#define MD_PCREL_FROM_SECTION(FIXP, SEC) md_pcrel_from_section (FIXP, SEC)
-
-#define MD_APPLY_FIX3  /* We want the segment as well.  */
+#define MD_PCREL_FROM_SECTION(FIX, SEC) md_pcrel_from_section (FIX, SEC)
 
 #ifdef  OBJ_COFF
 
@@ -73,7 +73,8 @@ struct mcore_tc_sy
 #define TC_SYMFIELD_TYPE struct mcore_tc_sy
 
 # if defined TE_PE
-#  define TC_FORCE_RELOCATION(x) ((x)->fx_r_type == BFD_RELOC_RVA)
+#  define TC_FORCE_RELOCATION(x) \
+     ((x)->fx_r_type == BFD_RELOC_RVA || generic_force_reloc (x))
 # endif
 
 #endif /* OBJ_COFF */
@@ -88,12 +89,19 @@ struct mcore_tc_sy
 /* Other special sections not generated by the assembler: .reginfo,
    .liblist, .conflict, .gptab, .got, .dynamic, .rel.dyn.  */
 
+/* No shared lib support, so we don't need to ensure externally
+   visible symbols can be overridden.  */
+#define EXTERN_FORCE_RELOC 0
+
 /* When relaxing, we need to emit various relocs we otherwise wouldn't.  */
 #define TC_FORCE_RELOCATION(fix) mcore_force_relocation (fix)
 extern int mcore_force_relocation PARAMS ((struct fix *));
 
-#define obj_fix_adjustable(fixP) mcore_fix_adjustable (fixP)
-extern boolean mcore_fix_adjustable PARAMS ((struct fix *));
+#define tc_fix_adjustable(FIX) mcore_fix_adjustable (FIX)
+extern bfd_boolean mcore_fix_adjustable PARAMS ((struct fix *));
+
+/* Values passed to md_apply_fix3 don't include the symbol value.  */
+#define MD_APPLY_SYM_VALUE(FIX) 0
 
 #endif /* OBJ_ELF */
 
@@ -115,7 +123,6 @@ extern void      md_create_short_jump
 extern void      md_create_long_jump
   PARAMS ((char *, addressT, addressT, fragS *, symbolS *));
 extern void      md_convert_frag               PARAMS ((bfd *, segT, fragS *));
-extern int       md_apply_fix3                 PARAMS ((fixS *, valueT *, segT));
 extern void      md_operand                    PARAMS ((expressionS *));
 extern int       md_estimate_size_before_relax PARAMS ((fragS *, segT));
 extern void      md_number_to_chars            PARAMS ((char *, valueT, int));