aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bfd/bfd-in2.h2
-rw-r--r--bfd/elf32-mips.c2
-rw-r--r--bfd/elf64-mips.c3
-rw-r--r--bfd/elfn32-mips.c3
-rw-r--r--bfd/libbfd.h2
-rw-r--r--bfd/reloc.c2
-rw-r--r--gas/config/tc-mips.c16
-rw-r--r--ld/testsuite/ld-mips-elf/reloc-local-overflow.d4
-rw-r--r--ld/testsuite/ld-mips-elf/reloc-local-overflow.s11
9 files changed, 20 insertions, 25 deletions
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 64e74ad..14d3763 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -2611,7 +2611,7 @@ to compensate for the borrow when the low bits are added. */
BFD_RELOC_MICROMIPS_HIGHER,
BFD_RELOC_MIPS_SCN_DISP,
BFD_RELOC_MICROMIPS_SCN_DISP,
- BFD_RELOC_MIPS_REL16,
+ BFD_RELOC_MIPS_16,
BFD_RELOC_MIPS_RELGOT,
BFD_RELOC_MIPS_JALR,
BFD_RELOC_MICROMIPS_JALR,
diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c
index b08c27e..b611515 100644
--- a/bfd/elf32-mips.c
+++ b/bfd/elf32-mips.c
@@ -1978,7 +1978,7 @@ struct elf_reloc_map {
static const struct elf_reloc_map mips_reloc_map[] =
{
{ BFD_RELOC_NONE, R_MIPS_NONE },
- { BFD_RELOC_16, R_MIPS_16 },
+ { BFD_RELOC_MIPS_16, R_MIPS_16 },
{ BFD_RELOC_32, R_MIPS_32 },
/* There is no BFD reloc for R_MIPS_REL32. */
{ BFD_RELOC_64, R_MIPS_64 },
diff --git a/bfd/elf64-mips.c b/bfd/elf64-mips.c
index a97f422..8097e7c 100644
--- a/bfd/elf64-mips.c
+++ b/bfd/elf64-mips.c
@@ -3683,7 +3683,7 @@ struct elf_reloc_map {
static const struct elf_reloc_map mips_reloc_map[] =
{
{ BFD_RELOC_NONE, R_MIPS_NONE },
- { BFD_RELOC_16, R_MIPS_16 },
+ { BFD_RELOC_MIPS_16, R_MIPS_16 },
{ BFD_RELOC_32, R_MIPS_32 },
/* There is no BFD reloc for R_MIPS_REL32. */
{ BFD_RELOC_64, R_MIPS_64 },
@@ -3713,7 +3713,6 @@ static const struct elf_reloc_map mips_reloc_map[] =
{ BFD_RELOC_MIPS_CALL_HI16, R_MIPS_CALL_HI16 },
{ BFD_RELOC_MIPS_CALL_LO16, R_MIPS_CALL_LO16 },
{ BFD_RELOC_MIPS_SCN_DISP, R_MIPS_SCN_DISP },
- { BFD_RELOC_MIPS_REL16, R_MIPS_REL16 },
/* Use of R_MIPS_ADD_IMMEDIATE and R_MIPS_PJUMP is deprecated. */
{ BFD_RELOC_MIPS_RELGOT, R_MIPS_RELGOT },
{ BFD_RELOC_MIPS_JALR, R_MIPS_JALR },
diff --git a/bfd/elfn32-mips.c b/bfd/elfn32-mips.c
index 2027230..7cae394 100644
--- a/bfd/elfn32-mips.c
+++ b/bfd/elfn32-mips.c
@@ -3513,7 +3513,7 @@ struct elf_reloc_map {
static const struct elf_reloc_map mips_reloc_map[] =
{
{ BFD_RELOC_NONE, R_MIPS_NONE },
- { BFD_RELOC_16, R_MIPS_16 },
+ { BFD_RELOC_MIPS_16, R_MIPS_16 },
{ BFD_RELOC_32, R_MIPS_32 },
/* There is no BFD reloc for R_MIPS_REL32. */
{ BFD_RELOC_CTOR, R_MIPS_32 },
@@ -3543,7 +3543,6 @@ static const struct elf_reloc_map mips_reloc_map[] =
{ BFD_RELOC_MIPS_CALL_HI16, R_MIPS_CALL_HI16 },
{ BFD_RELOC_MIPS_CALL_LO16, R_MIPS_CALL_LO16 },
{ BFD_RELOC_MIPS_SCN_DISP, R_MIPS_SCN_DISP },
- { BFD_RELOC_MIPS_REL16, R_MIPS_REL16 },
/* Use of R_MIPS_ADD_IMMEDIATE and R_MIPS_PJUMP is deprecated. */
{ BFD_RELOC_MIPS_RELGOT, R_MIPS_RELGOT },
{ BFD_RELOC_MIPS_JALR, R_MIPS_JALR },
diff --git a/bfd/libbfd.h b/bfd/libbfd.h
index 8c02e29..4a3020c 100644
--- a/bfd/libbfd.h
+++ b/bfd/libbfd.h
@@ -1285,7 +1285,7 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
"BFD_RELOC_MICROMIPS_HIGHER",
"BFD_RELOC_MIPS_SCN_DISP",
"BFD_RELOC_MICROMIPS_SCN_DISP",
- "BFD_RELOC_MIPS_REL16",
+ "BFD_RELOC_MIPS_16",
"BFD_RELOC_MIPS_RELGOT",
"BFD_RELOC_MIPS_JALR",
"BFD_RELOC_MICROMIPS_JALR",
diff --git a/bfd/reloc.c b/bfd/reloc.c
index 76c309b..eb8dba3 100644
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -2293,7 +2293,7 @@ ENUMX
ENUMX
BFD_RELOC_MICROMIPS_SCN_DISP
ENUMX
- BFD_RELOC_MIPS_REL16
+ BFD_RELOC_MIPS_16
ENUMX
BFD_RELOC_MIPS_RELGOT
ENUMX
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 9b895a6..406a04a 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -7919,7 +7919,7 @@ append_insn (struct mips_cl_insn *ip, expressionS *address_expr,
|| reloc_type[0] == BFD_RELOC_MIPS_HIGHEST
|| reloc_type[0] == BFD_RELOC_MIPS_HIGHER
|| reloc_type[0] == BFD_RELOC_MIPS_SCN_DISP
- || reloc_type[0] == BFD_RELOC_MIPS_REL16
+ || reloc_type[0] == BFD_RELOC_MIPS_16
|| reloc_type[0] == BFD_RELOC_MIPS_RELGOT
|| reloc_type[0] == BFD_RELOC_MIPS16_GPREL
|| hi16_reloc_p (reloc_type[0])
@@ -9083,7 +9083,7 @@ macro_build (expressionS *ep, const char *name, const char *fmt, ...)
|| *r == BFD_RELOC_LO16
|| *r == BFD_RELOC_MIPS_GOT_OFST
|| (mips_opts.micromips
- && (*r == BFD_RELOC_16
+ && (*r == BFD_RELOC_MIPS_16
|| *r == BFD_RELOC_MIPS_GOT16
|| *r == BFD_RELOC_MIPS_CALL16
|| *r == BFD_RELOC_MIPS_GOT_HI16
@@ -14577,7 +14577,7 @@ static const struct percent_op_match mips_percent_op[] =
{"%got", BFD_RELOC_MIPS_GOT16},
{"%gp_rel", BFD_RELOC_GPREL16},
{"%gprel", BFD_RELOC_GPREL16},
- {"%half", BFD_RELOC_16},
+ {"%half", BFD_RELOC_MIPS_16},
{"%highest", BFD_RELOC_MIPS_HIGHEST},
{"%higher", BFD_RELOC_MIPS_HIGHER},
{"%neg", BFD_RELOC_MIPS_SUB},
@@ -15841,9 +15841,10 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
break;
}
- /* Handle BFD_RELOC_8, since it's easy. Punt on other bfd relocations
- that have no MIPS ELF equivalent. */
- if (fixP->fx_r_type != BFD_RELOC_8)
+ /* Handle BFD_RELOC_8 and BFD_RELOC_16. Punt on other bfd
+ relocations that have no MIPS ELF equivalent. */
+ if (fixP->fx_r_type != BFD_RELOC_8
+ && fixP->fx_r_type != BFD_RELOC_16)
{
howto = bfd_reloc_type_lookup (stdoutput, fixP->fx_r_type);
if (!howto)
@@ -15853,7 +15854,6 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
gas_assert (fixP->fx_size == 2
|| fixP->fx_size == 4
|| fixP->fx_r_type == BFD_RELOC_8
- || fixP->fx_r_type == BFD_RELOC_16
|| fixP->fx_r_type == BFD_RELOC_64
|| fixP->fx_r_type == BFD_RELOC_CTOR
|| fixP->fx_r_type == BFD_RELOC_MIPS_SUB
@@ -15958,7 +15958,6 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
case BFD_RELOC_MIPS_HIGHEST:
case BFD_RELOC_MIPS_HIGHER:
case BFD_RELOC_MIPS_SCN_DISP:
- case BFD_RELOC_MIPS_REL16:
case BFD_RELOC_MIPS_RELGOT:
case BFD_RELOC_MIPS_JALR:
case BFD_RELOC_HI16:
@@ -16044,6 +16043,7 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
case BFD_RELOC_RVA:
case BFD_RELOC_32:
case BFD_RELOC_32_PCREL:
+ case BFD_RELOC_MIPS_16:
case BFD_RELOC_16:
case BFD_RELOC_8:
/* If we are deleting this reloc entry, we must fill in the
diff --git a/ld/testsuite/ld-mips-elf/reloc-local-overflow.d b/ld/testsuite/ld-mips-elf/reloc-local-overflow.d
index 98c5ddb..1405b2d 100644
--- a/ld/testsuite/ld-mips-elf/reloc-local-overflow.d
+++ b/ld/testsuite/ld-mips-elf/reloc-local-overflow.d
@@ -1,6 +1,6 @@
#name: MIPS reloc against local symbol overflow
#source: reloc-local-overflow.s
-#ld: -Tdata 0x10000 -e 0
-#error: \A[^\n]*:\(\.data\+0x1000\): relocation truncated to fit: R_MIPS_16 against `\.data'\Z
+#ld: -Tdata 0x10000000 -e 0
+#error: \A[^\n]*:\(\.text\+0x0\): relocation truncated to fit: R_MIPS_26 against `\.data'\Z
# Verify that the section name (`.data') is printed rather than `no symbol'.
diff --git a/ld/testsuite/ld-mips-elf/reloc-local-overflow.s b/ld/testsuite/ld-mips-elf/reloc-local-overflow.s
index a07255c..6d50c7b 100644
--- a/ld/testsuite/ld-mips-elf/reloc-local-overflow.s
+++ b/ld/testsuite/ld-mips-elf/reloc-local-overflow.s
@@ -1,8 +1,5 @@
- .data
- .space 0x1000
+ .text
+ j init
- .align 2
- .type bar, @object
-bar:
- .half bar
- .size bar, . - bar
+ .data
+init:
generated by cgit v1.1 at 2024-10-18 08:13:11 +0000