RISC-V: Support assembler modifier %got_pcrel_hi.

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

diff --git a/gas/config/tc-msp430.h b/gas/config/tc-msp430.h
index 86c9117d83497a93b62c86b06c83be104f4d69c0..50feca48887f254f924d822a41699ac0a0cd9147 100644 (file)
--- a/gas/config/tc-msp430.h
+++ b/gas/config/tc-msp430.h
@@ -1,5 +1,5 @@
 /* This file is tc-msp430.h
-   Copyright (C) 2002-2016 Free Software Foundation, Inc.
+   Copyright (C) 2002-2020 Free Software Foundation, Inc.
 
    Contributed by Dmitry Diky <diwil@mail.ru>
 
@@ -116,8 +116,9 @@ extern long md_pcrel_from_section (struct fix *, segT);
    msp430_relax_frag (SEG, FRAGP, STRETCH)
 extern long msp430_relax_frag (segT, fragS *, long);
 
-#define TC_FORCE_RELOCATION_LOCAL(FIX) \
-   msp430_force_relocation_local (FIX)
+#define TC_FORCE_RELOCATION_LOCAL(FIX)         \
+  (GENERIC_FORCE_RELOCATION_LOCAL (FIX)                \
+   || msp430_force_relocation_local (FIX))
 extern int msp430_force_relocation_local (struct fix *);
 
 /* We need to add reference symbols for .data/.bss.  */
@@ -130,7 +131,7 @@ extern int msp430_enable_polys;
 #define tc_fix_adjustable(FIX) msp430_fix_adjustable (FIX)
 extern bfd_boolean             msp430_fix_adjustable (struct fix *);
 
-/* Allow hexadeciaml numbers with 'h' suffix.  Note that if the number
+/* Allow hexadecimal numbers with 'h' suffix.  Note that if the number
    starts with a letter it will be interpreted as a symbol name not a
    constant.  Thus "beach" is a symbol not the hex value 0xbeac.  So
    is A5A5h...  */
@@ -159,9 +160,9 @@ extern bfd_boolean msp430_allow_local_subtract (expressionS *, expressionS *, se
    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           \
+  (GENERIC_FORCE_RELOCATION_SUB_SAME (FIX, SEC)        \
+   || ((SEC)->flags & SEC_CODE) != 0           \
    || ((SEC)->flags & SEC_DEBUGGING) != 0      \
-   || ! SEG_NORMAL (SEC)                       \
    || TC_FORCE_RELOCATION (FIX))
 
 /* We validate subtract arguments within tc_gen_reloc(),