0xfffe0020, /* dst_mask */
false), /* pcrel_offset */
+ /* 6 bit offset from the call table base pointer. */
+ HOWTO (R_V850_CALLT_6_7_OFFSET, /* type */
+ 0, /* rightshift */
+ 1, /* size (0 = byte, 1 = short, 2 = long) */
+ 7, /* bitsize */
+ false, /* pc_relative */
+ 0, /* bitpos */
+ complain_overflow_dont, /* complain_on_overflow */
+ v850_elf_reloc, /* special_function */
+ "R_V850_CALLT_6_7_OFFSET", /* name */
+ false, /* partial_inplace */
+ 0x3f, /* src_mask */
+ 0x3f, /* dst_mask */
+ false), /* pcrel_offset */
+
+ /* 16 bit offset from the call table base pointer. */
+ HOWTO (R_V850_CALLT_16_16_OFFSET, /* type */
+ 0, /* rightshift */
+ 1, /* size (0 = byte, 1 = short, 2 = long) */
+ 16, /* bitsize */
+ false, /* pc_relative */
+ 0, /* bitpos */
+ complain_overflow_dont, /* complain_on_overflow */
+ v850_elf_reloc, /* special_function */
+ "R_V850_CALLT_16_16_OFFSET", /* name */
+ false, /* partial_inplace */
+ 0xffff, /* src_mask */
+ 0xffff, /* dst_mask */
+ false), /* pcrel_offset */
+
/* end-sanitize-v850e */
};
{ BFD_RELOC_V850_SDA_15_16_OFFSET, R_V850_SDA_15_16_OFFSET },
{ BFD_RELOC_V850_ZDA_16_16_OFFSET, R_V850_ZDA_16_16_OFFSET },
{ BFD_RELOC_V850_ZDA_15_16_OFFSET, R_V850_ZDA_15_16_OFFSET },
- { BFD_RELOC_V850_TDA_6_8_OFFSET, R_V850_TDA_6_8_OFFSET },
- { BFD_RELOC_V850_TDA_7_8_OFFSET, R_V850_TDA_7_8_OFFSET },
- { BFD_RELOC_V850_TDA_7_7_OFFSET, R_V850_TDA_7_7_OFFSET },
+ { BFD_RELOC_V850_TDA_6_8_OFFSET, R_V850_TDA_6_8_OFFSET },
+ { BFD_RELOC_V850_TDA_7_8_OFFSET, R_V850_TDA_7_8_OFFSET },
+ { BFD_RELOC_V850_TDA_7_7_OFFSET, R_V850_TDA_7_7_OFFSET },
{ BFD_RELOC_V850_TDA_16_16_OFFSET, R_V850_TDA_16_16_OFFSET },
/* start-sanitize-v850e */
- { BFD_RELOC_V850_TDA_4_5_OFFSET, R_V850_TDA_4_5_OFFSET },
- { BFD_RELOC_V850_TDA_4_4_OFFSET, R_V850_TDA_4_4_OFFSET },
+ { BFD_RELOC_V850_TDA_4_5_OFFSET, R_V850_TDA_4_5_OFFSET },
+ { BFD_RELOC_V850_TDA_4_4_OFFSET, R_V850_TDA_4_4_OFFSET },
{ BFD_RELOC_V850_SDA_16_16_SPLIT_OFFSET, R_V850_SDA_16_16_SPLIT_OFFSET },
{ BFD_RELOC_V850_ZDA_16_16_SPLIT_OFFSET, R_V850_ZDA_16_16_SPLIT_OFFSET },
+ { BFD_RELOC_V850_CALLT_6_7_OFFSET, R_V850_CALLT_6_7_OFFSET },
+ { BFD_RELOC_V850_CALLT_16_16_OFFSET, R_V850_CALLT_16_16_OFFSET },
/* end-sanitize-v850e */
};
/* Map a bfd relocation into the appropriate howto structure */
static reloc_howto_type *
v850_elf_reloc_type_lookup (abfd, code)
- bfd *abfd;
- bfd_reloc_code_real_type code;
+ bfd * abfd;
+ bfd_reloc_code_real_type code;
{
unsigned int i;
/* Set the howto pointer for an V850 ELF reloc. */
static void
v850_elf_info_to_howto_rel (abfd, cache_ptr, dst)
- bfd *abfd;
- arelent *cache_ptr;
- Elf32_Internal_Rel *dst;
+ bfd * abfd;
+ arelent * cache_ptr;
+ Elf32_Internal_Rel * dst;
{
unsigned int r_type;
static boolean
v850_elf_check_relocs (abfd, info, sec, relocs)
- bfd *abfd;
- struct bfd_link_info *info;
- asection *sec;
- const Elf_Internal_Rela *relocs;
+ bfd * abfd;
+ struct bfd_link_info * info;
+ asection * sec;
+ const Elf_Internal_Rela * relocs;
{
boolean ret = true;
bfd *dynobj;
case R_V850_32:
case R_V850_16:
case R_V850_8:
+/* start-sanitize-v850e */
+ case R_V850_CALLT_6_7_OFFSET:
+ case R_V850_CALLT_16_16_OFFSET:
+/* end-sanitize-v850e */
break;
/* start-sanitize-v850e */
if ((h->other & V850_OTHER_MASK) != (other & V850_OTHER_MASK)
&& (h->other & V850_OTHER_ERROR) == 0)
{
- const char *msg;
-
+ const char * msg;
+ static char buff[100]; /* XXX */
+
switch (h->other & V850_OTHER_MASK)
{
default:
- msg = "Variable cannot occupy in multiple small data regions";
+ msg = "cannot occupy in multiple small data regions";
break;
case V850_OTHER_SDA | V850_OTHER_ZDA | V850_OTHER_TDA:
- msg = "Variable can only be in one of the small, zero, and tiny data regions";
+ msg = "can only be in one of the small, zero, and tiny data regions";
break;
case V850_OTHER_SDA | V850_OTHER_ZDA:
- msg = "Variable cannot be in both small and zero data regions simultaneously";
+ msg = "cannot be in both small and zero data regions simultaneously";
break;
case V850_OTHER_SDA | V850_OTHER_TDA:
- msg = "Variable cannot be in both small and tiny data regions simultaneously";
+ msg = "cannot be in both small and tiny data regions simultaneously";
break;
case V850_OTHER_ZDA | V850_OTHER_TDA:
- msg = "Variable cannot be in both zero and tiny data regions simultaneously";
+ msg = "cannot be in both zero and tiny data regions simultaneously";
break;
}
- (*info->callbacks->warning) (info, msg, h->root.root.string,
- abfd, h->root.u.def.section, 0);
+ sprintf (buff, "Variable '%s' %s", h->root.root.string, msg );
+ info->callbacks->warning (info, buff, h->root.root.string,
+ abfd, h->root.u.def.section, 0);
bfd_set_error (bfd_error_bad_value);
h->other |= V850_OTHER_ERROR;
return bfd_reloc_notsupported;
case R_V850_22_PCREL:
- if (relocation > 0x1ffff || relocation < -0x200000)
+ if (relocation > 0x1fffff || relocation < -0x200000)
return bfd_reloc_overflow;
if ((relocation % 2) != 0)
bfd_put_32 (abfd, insn, (bfd_byte *)data + reloc->address);
return bfd_reloc_ok;
+
+ case R_V850_CALLT_6_7_OFFSET:
+ if ((long) relocation > 0x7e || (long) relocation < 0)
+ return bfd_reloc_overflow;
+
+ if (relocation & 1)
+ return bfd_reloc_dangerous;
+
+ insn = bfd_get_16 (abfd, (bfd_byte *) data + reloc->address);
+ insn &= 0xff80;
+ insn |= (relocation >> 1);
+
+ bfd_put_16 (abfd, insn, (bfd_byte *)data + reloc->address);
+ return bfd_reloc_ok;
+
+ case R_V850_CALLT_16_16_OFFSET:
+ bfd_put_16 (abfd, relocation, (bfd_byte *)data + reloc->address);
+ return bfd_reloc_ok;
+
/* end-sanitize-v850e */
}
/*ARGSUSED*/
static boolean
v850_elf_is_local_label_name (abfd, name)
- bfd *abfd;
- const char *name;
+ bfd * abfd;
+ const char * name;
{
return ((name[0] == '.' && (name[1] == 'L' || name[1] == '.'))
|| (name[0] == '_' && name[1] == '.' && name[2] == 'L'
+ input_section->output_offset);
value -= offset;
- if ((long)value > 0x1ffff || (long)value < -0x200000)
+ if ((long)value > 0x1fffff || (long)value < -0x200000)
return bfd_reloc_overflow;
if ((value % 2) != 0)
value = (value >> 16) + ((value & 0x8000) != 0);
if ((long)value > 0x7fff || (long)value < -0x8000)
- return bfd_reloc_overflow;
+ {
+ /* This relocation cannot overflow. */
+
+ value = 0;
+ }
bfd_put_16 (input_bfd, value, hit_data);
return bfd_reloc_ok;
value += (short)bfd_get_16 (input_bfd, hit_data);
value >>= 16;
- if ((long)value > 0x7fff || (long)value < -0x8000)
- return bfd_reloc_overflow;
-
bfd_put_16 (input_bfd, value, hit_data);
return bfd_reloc_ok;
return bfd_reloc_ok;
case R_V850_ZDA_16_16_OFFSET:
+ if (sym_sec == NULL)
+ return bfd_reloc_undefined;
+
value -= sym_sec->output_section->vma;
value += (short) bfd_get_16 (input_bfd, hit_data);
return bfd_reloc_ok;
case R_V850_ZDA_15_16_OFFSET:
+ if (sym_sec == NULL)
+ return bfd_reloc_undefined;
+
insn = bfd_get_16 (input_bfd, hit_data);
value -= sym_sec->output_section->vma;
return bfd_reloc_ok;
case R_V850_SDA_16_16_OFFSET:
+ if (sym_sec == NULL)
+ return bfd_reloc_undefined;
+
{
unsigned long gp;
struct bfd_link_hash_entry * h;
}
case R_V850_SDA_15_16_OFFSET:
+ if (sym_sec == NULL)
+ return bfd_reloc_undefined;
+
{
unsigned long gp;
struct bfd_link_hash_entry * h;
+ h->u.def.section->output_offset);
value -= ep;
- value += ((insn & 0x7e) << 2);
+ value += ((insn & 0x7e) << 1);
if ((long) value > 0xfc || (long) value < 0)
return bfd_reloc_overflow;
}
case R_V850_SDA_16_16_SPLIT_OFFSET:
+ if (sym_sec == NULL)
+ return bfd_reloc_undefined;
+
{
unsigned long gp;
struct bfd_link_hash_entry * h;
}
case R_V850_ZDA_16_16_SPLIT_OFFSET:
+ if (sym_sec == NULL)
+ return bfd_reloc_undefined;
+
insn = bfd_get_32 (input_bfd, hit_data);
value -= sym_sec->output_section->vma;
bfd_put_32 (input_bfd, insn, hit_data);
return bfd_reloc_ok;
-/* end-sanitize-v850e */
+ case R_V850_CALLT_6_7_OFFSET:
+ {
+ unsigned long ctbp;
+ struct bfd_link_hash_entry * h;
+
+ /* Get the value of __ctbp. */
+ h = bfd_link_hash_lookup (info->hash, "__ctbp", false, false, true);
+ if (h == (struct bfd_link_hash_entry *) NULL
+ || h->type != bfd_link_hash_defined)
+ return (bfd_reloc_dangerous + 1); /* Actually this indicates that __ctbp could not be found. */
+
+ ctbp = (h->u.def.value
+ + h->u.def.section->output_section->vma
+ + h->u.def.section->output_offset);
+ value -= ctbp;
+
+ insn = bfd_get_16 (input_bfd, hit_data);
+
+ value += ((insn & 0x3f) << 1);
+
+ if ((long) value > 0x7e || (long) value < 0)
+ return bfd_reloc_overflow;
+
+ insn &= 0xff80;
+ insn |= (value >> 1);
+ bfd_put_16 (input_bfd, insn, hit_data);
+ return bfd_reloc_ok;
+ }
+ case R_V850_CALLT_16_16_OFFSET:
+ if (sym_sec == NULL)
+ return bfd_reloc_undefined;
+
+ {
+ unsigned long ctbp;
+ struct bfd_link_hash_entry * h;
+
+ /* Get the value of __ctbp. */
+ h = bfd_link_hash_lookup (info->hash, "__ctbp", false, false, true);
+ if (h == (struct bfd_link_hash_entry *) NULL
+ || h->type != bfd_link_hash_defined)
+ return (bfd_reloc_dangerous + 1);
+
+ ctbp = (h->u.def.value
+ + h->u.def.section->output_section->vma
+ + h->u.def.section->output_offset);
+
+ value -= sym_sec->output_section->vma;
+ value -= (ctbp - sym_sec->output_section->vma);
+ value += (short) bfd_get_16 (input_bfd, hit_data);
+
+ if ((long) value > 0xffff || (long) value < 0)
+ return bfd_reloc_overflow;
+
+ bfd_put_16 (input_bfd, value, hit_data);
+ return bfd_reloc_ok;
+ }
+
+/* end-sanitize-v850e */
case R_V850_NONE:
return bfd_reloc_ok;
relocation = (h->root.u.def.value
+ sec->output_section->vma
+ sec->output_offset);
+#if 0
+fprintf (stderr, "defined: sec: %s, name: %s, value: %x + %x + %x gives: %x\n",
+ sec->name, h->root.root.string, h->root.u.def.value, sec->output_section->vma, sec->output_offset, relocation);
+#endif
}
else if (h->root.type == bfd_link_hash_undefweak)
- relocation = 0;
+ {
+#if 0
+fprintf (stderr, "undefined: sec: %s, name: %s\n",
+ sec->name, h->root.root.string);
+#endif
+ relocation = 0;
+ }
else
{
if (! ((*info->callbacks->undefined_symbol)
(info, h->root.root.string, input_bfd,
input_section, rel->r_offset)))
return false;
+#if 0
+fprintf (stderr, "unknown: name: %s\n", h->root.root.string);
+#endif
relocation = 0;
}
}
break;
case bfd_reloc_undefined:
- fprintf (stderr, "undef2 %s\n", name );
if (! ((*info->callbacks->undefined_symbol)
(info, name, input_bfd, input_section,
rel->r_offset)))
msg = "could not locate special linker symbol __ep";
goto common_error;
+ case (bfd_reloc_dangerous + 1):
+ msg = "could not locate special linker symbol __ctbp";
+ goto common_error;
+
default:
msg = "internal error: unknown error";
/* fall through */
case E_V850_ARCH: (void) bfd_default_set_arch_mach (abfd, bfd_arch_v850, 0); break;
/* start-sanitize-v850e */
case E_V850E_ARCH: (void) bfd_default_set_arch_mach (abfd, bfd_arch_v850, bfd_mach_v850e); break;
-/* end-sanitize-v850e */
-/* start-sanitize-v850eq */
case E_V850EQ_ARCH: (void) bfd_default_set_arch_mach (abfd, bfd_arch_v850, bfd_mach_v850eq); break;
-/* end-sanitize-v850eq */
+/* end-sanitize-v850e */
}
}
default:
case 0: val = E_V850_ARCH; break;
/* start-sanitize-v850e */
- case bfd_mach_v850e: val = E_V850E_ARCH; break;
-/* end-sanitize-v850e */
-/* start-sanitize-v850eq */
+ case bfd_mach_v850e: val = E_V850E_ARCH; break;
case bfd_mach_v850eq: val = E_V850EQ_ARCH; break;
-/* end-sanitize-v850eq */
+/* end-sanitize-v850e */
}
elf_elfheader (abfd)->e_flags &=~ EF_V850_ARCH;
{
_bfd_error_handler ("%s: Architecture mismatch with previous modules",
bfd_get_filename (ibfd));
+#if 0
bfd_set_error (bfd_error_bad_value);
return false;
+#else
+ return true;
+#endif
}
return true;
default:
case E_V850_ARCH: fprintf (file, ": v850 architecture"); break;
/* start-sanitize-v850e */
- case E_V850E_ARCH: fprintf (file, ": v850e architecture"); break;
-/* end-sanitize-v850e */
-/* start-sanitize-v850eq */
+ case E_V850E_ARCH: fprintf (file, ": v850e architecture"); break;
case E_V850EQ_ARCH: fprintf (file, ": v850eq architecture"); break;
-/* end-sanitize-v850eq */
+/* end-sanitize-v850e */
}
fputc ('\n', file);
projects / deliverable / binutils-gdb.git / blobdiff