Merge commit 'upstream/2.20'

[msp430-binutils.git] / gas / config / tc-mn10300.h

diff --git a/gas/config/tc-mn10300.h b/gas/config/tc-mn10300.h
index 20de21c555228ea48e42c20c593a634136efb8b3..53c41501cfc0226feca6086e6cc024dff16bd641 100644 (file)
--- a/gas/config/tc-mn10300.h
+++ b/gas/config/tc-mn10300.h
@@ -1,5 +1,5 @@
 /* tc-mn10300.h -- Header file for tc-mn10300.c.
 /* tc-mn10300.h -- Header file for tc-mn10300.c.

-   Copyright 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2007
+   Copyright 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008

    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.


@@ -26,8 +26,8 @@
 #define DIFF_EXPR_OK
 #define GLOBAL_OFFSET_TABLE_NAME "_GLOBAL_OFFSET_TABLE_"
 
 #define DIFF_EXPR_OK
 #define GLOBAL_OFFSET_TABLE_NAME "_GLOBAL_OFFSET_TABLE_"
 

-#define TC_FORCE_RELOCATION(FIX)                       \
-  (generic_force_reloc (FIX))
+#define TC_FORCE_RELOCATION(FIX) mn10300_force_relocation (FIX)
+extern bfd_boolean mn10300_force_relocation (struct fix *);

 
 #define TC_FORCE_RELOCATION_LOCAL(FIX)                 \
   (!(FIX)->fx_pcrel                                    \
 
 #define TC_FORCE_RELOCATION_LOCAL(FIX)                 \
   (!(FIX)->fx_pcrel                                    \


@@ -36,14 +36,13 @@
    || (FIX)->fx_r_type == BFD_RELOC_32_GOT_PCREL       \
    || TC_FORCE_RELOCATION (FIX))
 
    || (FIX)->fx_r_type == BFD_RELOC_32_GOT_PCREL       \
    || TC_FORCE_RELOCATION (FIX))
 

-#define md_parse_name(name, exprP, mode, nextcharP) \
-    mn10300_parse_name ((name), (exprP), (mode), (nextcharP))
-int mn10300_parse_name PARAMS ((char const *, expressionS *,
-                               enum expr_mode, char *));
+#define md_parse_name(NAME, EXPRP, MODE, NEXTCHARP) \
+    mn10300_parse_name ((NAME), (EXPRP), (MODE), (NEXTCHARP))
+int mn10300_parse_name (char const *, expressionS *, enum expr_mode, char *);

 
 #define TC_CONS_FIX_NEW(FRAG, OFF, LEN, EXP) \
      mn10300_cons_fix_new ((FRAG), (OFF), (LEN), (EXP))
 
 #define TC_CONS_FIX_NEW(FRAG, OFF, LEN, EXP) \
      mn10300_cons_fix_new ((FRAG), (OFF), (LEN), (EXP))

-void mn10300_cons_fix_new PARAMS ((fragS *, int, int, expressionS *));
+void mn10300_cons_fix_new (fragS *, int, int, expressionS *);

 
 /* This is used to construct expressions out of @GOTOFF, @PLT and @GOT
    symbols.  The relocation type is stored in X_md.  */
 
 /* This is used to construct expressions out of @GOTOFF, @PLT and @GOT
    symbols.  The relocation type is stored in X_md.  */


@@ -66,11 +65,12 @@ void mn10300_cons_fix_new PARAMS ((fragS *, int, int, expressionS *));
 #define TC_FORCE_RELOCATION_SUB_SAME(FIX, SEC) \
   (((SEC)->flags & SEC_CODE) != 0              \
    || ! SEG_NORMAL (SEC)                       \
 #define TC_FORCE_RELOCATION_SUB_SAME(FIX, SEC) \
   (((SEC)->flags & SEC_CODE) != 0              \
    || ! SEG_NORMAL (SEC)                       \

+   || (FIX)->fx_r_type == BFD_RELOC_MN10300_ALIGN \

    || TC_FORCE_RELOCATION (FIX))
 
 /* We validate subtract arguments within tc_gen_reloc(), so don't
    report errors at this point.  */
    || TC_FORCE_RELOCATION (FIX))
 
 /* We validate subtract arguments within tc_gen_reloc(), so don't
    report errors at this point.  */

-#define TC_VALIDATE_FIX_SUB(FIX) 1
+#define TC_VALIDATE_FIX_SUB(FIX, SEG) 1

 
 /* Fixup debug sections since we will never relax them.  Ideally, we
    could do away with this and instead check every single fixup with
 
 /* Fixup debug sections since we will never relax them.  Ideally, we
    could do away with this and instead check every single fixup with


@@ -98,13 +98,29 @@ void mn10300_cons_fix_new PARAMS ((fragS *, int, int, expressionS *));
 
 #define md_number_to_chars number_to_chars_littleendian
 
 
 #define md_number_to_chars number_to_chars_littleendian
 

-/* Don't bother to adjust relocs.  */
-/* #define tc_fix_adjustable(FIX) 0 */

 #define tc_fix_adjustable(FIX) mn10300_fix_adjustable (FIX)
 #define tc_fix_adjustable(FIX) mn10300_fix_adjustable (FIX)

-extern bfd_boolean mn10300_fix_adjustable PARAMS ((struct fix *));
+extern bfd_boolean mn10300_fix_adjustable (struct fix *);

 
 /* We do relaxing in the assembler as well as the linker.  */
 extern const struct relax_type md_relax_table[];
 #define TC_GENERIC_RELAX_TABLE md_relax_table
 
 #define DWARF2_LINE_MIN_INSN_LENGTH 1
 
 /* We do relaxing in the assembler as well as the linker.  */
 extern const struct relax_type md_relax_table[];
 #define TC_GENERIC_RELAX_TABLE md_relax_table
 
 #define DWARF2_LINE_MIN_INSN_LENGTH 1

+
+/* The difference between same-section symbols may be affected by linker
+   relaxation, so do not resolve such expressions in the assembler.  */
+#define md_allow_local_subtract(l,r,s) mn10300_allow_local_subtract (l, r, s)
+extern bfd_boolean mn10300_allow_local_subtract (expressionS *, expressionS *, segT);
+
+#define RELOC_EXPANSION_POSSIBLE
+#define MAX_RELOC_EXPANSION 2
+
+#define TC_FRAG_TYPE bfd_boolean
+
+#define HANDLE_ALIGN(frag) mn10300_handle_align (frag)
+extern void mn10300_handle_align (fragS *);
+
+/* Only allow call frame debug info optimization when linker relaxation is
+   not enabled as otherwise we could generate the DWARF directives without
+   the relocs necessary to patch them up.  */
+#define md_allow_eh_opt (linkrelax == 0)