Use bool in gas

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

diff --git a/gas/config/tc-mn10300.h b/gas/config/tc-mn10300.h
index bf7ef6001d75caac8b47b8bfd60d0f3cf184da52..07735a47745bb26312eded592619b970542525db 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.
-   Copyright (C) 1996-2016 Free Software Foundation, Inc.
+   Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -26,14 +26,22 @@
 #define GLOBAL_OFFSET_TABLE_NAME "_GLOBAL_OFFSET_TABLE_"
 
 #define TC_FORCE_RELOCATION(FIX) mn10300_force_relocation (FIX)
-extern bfd_boolean mn10300_force_relocation (struct fix *);
+extern bool mn10300_force_relocation (struct fix *);
+
+/* tc-mn10300.c uses TC_FORCE_RELOCATION_LOCAL, a macro that should
+   only appear in write.c.  The use is likely incorrect.  Duplicating
+   the definition here rather than expanding it in
+   TC_FORCE_RELOCATION_LOCAL at least ensures write.c changes will be
+   flagged immediately with a compile error.  */
+#define GENERIC_FORCE_RELOCATION_LOCAL(FIX)    \
+  (!(FIX)->fx_pcrel                            \
+   || TC_FORCE_RELOCATION (FIX))
 
 #define TC_FORCE_RELOCATION_LOCAL(FIX)                 \
-  (!(FIX)->fx_pcrel                                    \
+  (GENERIC_FORCE_RELOCATION_LOCAL (FIX)                        \
    || (FIX)->fx_r_type == BFD_RELOC_32_PLT_PCREL       \
    || (FIX)->fx_r_type == BFD_RELOC_MN10300_GOT32      \
-   || (FIX)->fx_r_type == BFD_RELOC_32_GOT_PCREL       \
-   || TC_FORCE_RELOCATION (FIX))
+   || (FIX)->fx_r_type == BFD_RELOC_32_GOT_PCREL)
 
 #define md_parse_name(NAME, EXPRP, MODE, NEXTCHARP) \
     mn10300_parse_name ((NAME), (EXPRP), (MODE), (NEXTCHARP))
@@ -63,8 +71,8 @@ void mn10300_cons_fix_new (fragS *, int, int, expressionS *,
    linker, but this fix is simpler, and it pretty much only affects
    object size a little bit.  */
 #define TC_FORCE_RELOCATION_SUB_SAME(FIX, SEC) \
-  (((SEC)->flags & SEC_CODE) != 0              \
-   || ! SEG_NORMAL (SEC)                       \
+  (GENERIC_FORCE_RELOCATION_SUB_SAME (FIX, SEC)        \
+   || ((SEC)->flags & SEC_CODE) != 0           \
    || (FIX)->fx_r_type == BFD_RELOC_MN10300_ALIGN \
    || TC_FORCE_RELOCATION (FIX))
 
@@ -99,7 +107,7 @@ void mn10300_cons_fix_new (fragS *, int, int, expressionS *,
 #define md_number_to_chars number_to_chars_littleendian
 
 #define tc_fix_adjustable(FIX) mn10300_fix_adjustable (FIX)
-extern bfd_boolean mn10300_fix_adjustable (struct fix *);
+extern bool mn10300_fix_adjustable (struct fix *);
 
 /* We do relaxing in the assembler as well as the linker.  */
 extern const struct relax_type md_relax_table[];
@@ -110,12 +118,12 @@ extern const struct relax_type md_relax_table[];
 /* 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);
+extern bool mn10300_allow_local_subtract (expressionS *, expressionS *, segT);
 
 #define RELOC_EXPANSION_POSSIBLE
 #define MAX_RELOC_EXPANSION 2
 
-#define TC_FRAG_TYPE bfd_boolean
+#define TC_FRAG_TYPE bool
 
 #define HANDLE_ALIGN(frag) mn10300_handle_align (frag)
 extern void mn10300_handle_align (fragS *);