X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=bfd%2Felf32-v850.c;h=2a43479fdb09ede235894085f039b68156a2d319;hb=15d82b260c208ede0e7e608ef88735faf5a14544;hp=c29d14520baf3e6e8979ddf7f7c71b5ef40e1a82;hpb=98ab32a58a80e7123ca2c93bb526136a3c3caaac;p=binutils-gdb.git

diff --git a/bfd/elf32-v850.c b/bfd/elf32-v850.c
index c29d14520ba..2a43479fdb0 100644
--- a/bfd/elf32-v850.c
+++ b/bfd/elf32-v850.c
@@ -293,6 +293,21 @@ static reloc_howto_type v850_elf_howto_table[] =
 	 0x7f,				/* dst_mask */
 	 false),			/* pcrel_offset */
 
+  /* 16 bit offset from the tiny data area pointer!  */
+  HOWTO (R_V850_TDA_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_TDA_16_16_OFFSET",	/* name */
+	 false,				/* partial_inplace */
+	 0xffff,			/* src_mask */
+	 0xfff,				/* dst_mask */
+	 false),			/* pcrel_offset */
+
 /* start-sanitize-v850e */
   
   /* 5 bit offset from the tiny data area pointer.  */
@@ -355,6 +370,36 @@ static reloc_howto_type v850_elf_howto_table[] =
 	 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 */
 };
 
@@ -381,14 +426,17 @@ static const struct v850_elf_reloc_map v850_elf_reloc_map[] =
   { 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 */
 };
 
@@ -396,8 +444,8 @@ static const struct v850_elf_reloc_map v850_elf_reloc_map[] =
 /* 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;
 
@@ -420,9 +468,9 @@ v850_elf_reloc_type_lookup (abfd, code)
 /* 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;
 
@@ -438,10 +486,10 @@ v850_elf_info_to_howto_rel (abfd, cache_ptr, dst)
 
 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;
@@ -493,6 +541,10 @@ v850_elf_check_relocs (abfd, info, sec, relocs)
 	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 */
@@ -520,6 +572,7 @@ v850_elf_check_relocs (abfd, info, sec, relocs)
 	case R_V850_TDA_6_8_OFFSET:
 	case R_V850_TDA_7_8_OFFSET:
 	case R_V850_TDA_7_7_OFFSET:
+	case R_V850_TDA_16_16_OFFSET:
 	  other = V850_OTHER_TDA;
 	  common = ".tcommon";
 	  /* fall through */
@@ -533,29 +586,31 @@ v850_elf_check_relocs (abfd, info, sec, relocs)
 	      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;
@@ -596,6 +651,10 @@ v850_elf_reloc (abfd, reloc, symbol, data, isection, obfd, err)
      bfd *       obfd;
      char **     err;
 {
+  long relocation;
+  long insn;
+
+  
   /* If there is an output BFD,
      and the symbol is not a section name (which is only defined at final link time),
      and either we are not putting the addend into the instruction
@@ -623,191 +682,214 @@ v850_elf_reloc (abfd, reloc, symbol, data, isection, obfd, err)
     return bfd_reloc_undefined;
 
   /* We handle final linking of some relocs ourselves.  */
-    {
-      long relocation, insn;
-
-      /* Is the address of the relocation really within the section?  */
-      if (reloc->address > isection->_cooked_size)
-	return bfd_reloc_outofrange;
-
-      /* Work out which section the relocation is targetted at and the
-	 initial relocation command value.  */
-
-      /* Get symbol value.  (Common symbols are special.)  */
-      if (bfd_is_com_section (symbol->section))
-	relocation = 0;
-      else
-	relocation = symbol->value;
-
-      /* Convert input-section-relative symbol value to absolute + addend.  */
-      relocation += symbol->section->output_section->vma;
-      relocation += symbol->section->output_offset;
-      relocation += reloc->addend;
-
-      if (reloc->howto->pc_relative == true)
-	{
-	  /* Here the variable relocation holds the final address of the
-	     symbol we are relocating against, plus any addend.  */
-	  relocation -= isection->output_section->vma + isection->output_offset;
-
-	  /* Deal with pcrel_offset */
-	  relocation -= reloc->address;
-	}
-
-      /* I've got no clue... */
-      reloc->addend = 0;	
-
-      switch (reloc->howto->type)
-	{
-	default:
-	  /* fprintf (stderr, "reloc type %d not SUPPORTED\n", reloc->howto->type ); */
-	  return bfd_reloc_notsupported;
-
-	case R_V850_22_PCREL:
-	  if (relocation > 0x1ffff || relocation < -0x200000)
-	    return bfd_reloc_overflow;
-
-	  if ((relocation % 2) != 0)
-	    return bfd_reloc_dangerous;
-
-	  insn = bfd_get_32 (abfd, (bfd_byte *) data + reloc->address);
-	  insn &= ~0xfffe003f;
-	  insn |= (((relocation & 0xfffe) << 16)
-		   | ((relocation & 0x3f0000) >> 16));
-	  bfd_put_32 (abfd, insn, (bfd_byte *)data + reloc->address);
-	  return bfd_reloc_ok;
-
-	case R_V850_9_PCREL:
-	  if (relocation > 0xff || relocation < -0x100)
-	    return bfd_reloc_overflow;
-
-	  if ((relocation % 2) != 0)
-	    return bfd_reloc_dangerous;
-
-	  insn = bfd_get_16 (abfd, (bfd_byte *) data + reloc->address);
-	  insn &= ~ 0xf870;
-	  insn |= ((relocation & 0x1f0) << 7) | ((relocation & 0x0e) << 3);
-	  bfd_put_16 (abfd, insn, (bfd_byte *)data + reloc->address);
-	  return bfd_reloc_ok;
-
-	case R_V850_HI16_S:
-	  relocation += bfd_get_16 (abfd, (bfd_byte *) data + reloc->address);
-	  relocation = (relocation >> 16) + ((relocation & 0x8000) != 0);
-	  bfd_put_16 (abfd, relocation, (bfd_byte *)data + reloc->address);
-	  return bfd_reloc_ok;
-
-	case R_V850_HI16:
-	  relocation += bfd_get_16 (abfd, (bfd_byte *) data + reloc->address);
-	  relocation = (relocation >> 16);
-	  bfd_put_16 (abfd, relocation, (bfd_byte *)data + reloc->address);
-	  return bfd_reloc_ok;
-
-	case R_V850_16:
-	case R_V850_LO16:
-	  relocation += (short)bfd_get_16 (abfd, (bfd_byte *) data + reloc->address);
-	  
-	case R_V850_SDA_16_16_OFFSET:
-	case R_V850_ZDA_16_16_OFFSET:
-	  if ((long)relocation > 0x7fff || (long)relocation < -0x8000)
-	    return bfd_reloc_overflow;
-	  bfd_put_16 (abfd, relocation, (bfd_byte *)data + reloc->address);
-	  return bfd_reloc_ok;
 
-	case R_V850_SDA_15_16_OFFSET:
-	case R_V850_ZDA_15_16_OFFSET:
-	  if ((long)relocation > 0x7ffe || (long)relocation < -0x8000)
-	    return bfd_reloc_overflow;
-
-	  if (relocation & 1)
-	    return bfd_reloc_dangerous;
-	    
-	  insn  = bfd_get_16 (abfd, (bfd_byte *) data + reloc->address);
-	  insn &= 1;
-	  insn |= (relocation >> 1) & ~1;
-
-	  bfd_put_16 (abfd, insn, (bfd_byte *)data + reloc->address);
-	  return bfd_reloc_ok;
-
-	case R_V850_TDA_6_8_OFFSET:
-	  if ((long) relocation > 0xfc || (long) relocation < 0)
-	    return bfd_reloc_overflow;
-	
-	  if (relocation & 3)
-	    return bfd_reloc_dangerous;
-	
-	  insn  = bfd_get_16 (abfd, (bfd_byte *) data + reloc->address);
-	  insn &= 0xff81;
-	  insn |= (relocation >> 1);
-
-	  bfd_put_16 (abfd, insn, (bfd_byte *)data + reloc->address);
-	  return bfd_reloc_ok;
-    
-	case R_V850_TDA_7_8_OFFSET:
-	  if ((long) relocation > 0xfe || (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_TDA_7_7_OFFSET:
-	  if ((long) relocation > 0x7f || (long) relocation < 0)
-	    return bfd_reloc_overflow;
-
-	  insn  = bfd_get_16 (abfd, (bfd_byte *) data + reloc->address);
-	  insn &= 0xff80;
-	  insn |= relocation;
+  /* Is the address of the relocation really within the section?  */
+  if (reloc->address > isection->_cooked_size)
+    return bfd_reloc_outofrange;
+  
+  /* Work out which section the relocation is targetted at and the
+     initial relocation command value.  */
+  
+  /* Get symbol value.  (Common symbols are special.)  */
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+  
+  /* Convert input-section-relative symbol value to absolute + addend.  */
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+  relocation += reloc->addend;
+  
+  if (reloc->howto->pc_relative == true)
+    {
+      /* Here the variable relocation holds the final address of the
+	 symbol we are relocating against, plus any addend.  */
+      relocation -= isection->output_section->vma + isection->output_offset;
+      
+      /* Deal with pcrel_offset */
+      relocation -= reloc->address;
+    }
+  
+  /* I've got no clue... */
+  reloc->addend = 0;	
+  
+  switch (reloc->howto->type)
+    {
+    default:
+      /* fprintf (stderr, "reloc type %d not SUPPORTED\n", reloc->howto->type ); */
+      return bfd_reloc_notsupported;
+      
+    case R_V850_22_PCREL:
+      if (relocation > 0x1ffff || relocation < -0x200000)
+	return bfd_reloc_overflow;
+      
+      if ((relocation % 2) != 0)
+	return bfd_reloc_dangerous;
+      
+      insn = bfd_get_32 (abfd, (bfd_byte *) data + reloc->address);
+      insn &= ~0xfffe003f;
+      insn |= (((relocation & 0xfffe) << 16)
+	       | ((relocation & 0x3f0000) >> 16));
+      bfd_put_32 (abfd, insn, (bfd_byte *)data + reloc->address);
+      return bfd_reloc_ok;
+      
+    case R_V850_9_PCREL:
+      if (relocation > 0xff || relocation < -0x100)
+	return bfd_reloc_overflow;
+      
+      if ((relocation % 2) != 0)
+	return bfd_reloc_dangerous;
+      
+      insn = bfd_get_16 (abfd, (bfd_byte *) data + reloc->address);
+      insn &= ~ 0xf870;
+      insn |= ((relocation & 0x1f0) << 7) | ((relocation & 0x0e) << 3);
+      bfd_put_16 (abfd, insn, (bfd_byte *)data + reloc->address);
+      return bfd_reloc_ok;
+      
+    case R_V850_HI16_S:
+      relocation += bfd_get_16 (abfd, (bfd_byte *) data + reloc->address);
+      relocation = (relocation >> 16) + ((relocation & 0x8000) != 0);
+      bfd_put_16 (abfd, relocation, (bfd_byte *)data + reloc->address);
+      return bfd_reloc_ok;
+      
+    case R_V850_HI16:
+      relocation += bfd_get_16 (abfd, (bfd_byte *) data + reloc->address);
+      relocation = (relocation >> 16);
+      bfd_put_16 (abfd, relocation, (bfd_byte *)data + reloc->address);
+      return bfd_reloc_ok;
+      
+    case R_V850_LO16:
+      relocation += (short)bfd_get_16 (abfd, (bfd_byte *) data + reloc->address);
+      /* Do not complain if value has top bit set, as this has been anticipated.  */
+      bfd_put_16 (abfd, relocation, (bfd_byte *)data + reloc->address);
+      return bfd_reloc_ok;
 
-	  bfd_put_16 (abfd, insn, (bfd_byte *)data + reloc->address);
-	  return bfd_reloc_ok;
-    
+    case R_V850_16:
+      relocation += (short)bfd_get_16 (abfd, (bfd_byte *) data + reloc->address);
+      /* drop through */
+      
+    case R_V850_SDA_16_16_OFFSET:
+    case R_V850_ZDA_16_16_OFFSET:
+    case R_V850_TDA_16_16_OFFSET:
+      if ((long)relocation > 0x7fff || (long)relocation < -0x8000)
+	return bfd_reloc_overflow;
+      bfd_put_16 (abfd, relocation, (bfd_byte *)data + reloc->address);
+      return bfd_reloc_ok;
+      
+    case R_V850_SDA_15_16_OFFSET:
+    case R_V850_ZDA_15_16_OFFSET:
+      if ((long)relocation > 0x7ffe || (long)relocation < -0x8000)
+	return bfd_reloc_overflow;
+      
+      if (relocation & 1)
+	return bfd_reloc_dangerous;
+      
+      insn  = bfd_get_16 (abfd, (bfd_byte *) data + reloc->address);
+      insn &= 1;
+      insn |= (relocation >> 1) & ~1;
+      
+      bfd_put_16 (abfd, insn, (bfd_byte *)data + reloc->address);
+      return bfd_reloc_ok;
+      
+    case R_V850_TDA_6_8_OFFSET:
+      if ((long) relocation > 0xfc || (long) relocation < 0)
+	return bfd_reloc_overflow;
+      
+      if (relocation & 3)
+	return bfd_reloc_dangerous;
+      
+      insn  = bfd_get_16 (abfd, (bfd_byte *) data + reloc->address);
+      insn &= 0xff81;
+      insn |= (relocation >> 1);
+      
+      bfd_put_16 (abfd, insn, (bfd_byte *)data + reloc->address);
+      return bfd_reloc_ok;
+      
+    case R_V850_TDA_7_8_OFFSET:
+      if ((long) relocation > 0xfe || (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_TDA_7_7_OFFSET:
+      if ((long) relocation > 0x7f || (long) relocation < 0)
+	return bfd_reloc_overflow;
+      
+      insn  = bfd_get_16 (abfd, (bfd_byte *) data + reloc->address);
+      insn &= 0xff80;
+      insn |= relocation;
+      
+      bfd_put_16 (abfd, insn, (bfd_byte *)data + reloc->address);
+      return bfd_reloc_ok;
+      
 /* start-sanitize-v850e */
-	case R_V850_TDA_4_5_OFFSET:
-	  if ((long) relocation > 0x1e || (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 &= 0xfff0;
-	  insn |= (relocation >> 1);
-
-	  bfd_put_16 (abfd, insn, (bfd_byte *)data + reloc->address);
-	  return bfd_reloc_ok;
-    
-	case R_V850_TDA_4_4_OFFSET:
-	  if ((long) relocation > 0xf || (long) relocation < 0)
-	    return bfd_reloc_overflow;
-	
-	  insn  = bfd_get_16 (abfd, (bfd_byte *) data + reloc->address);
-	  insn &= 0xfff0;
-	  insn |= relocation;
-	  
-	  bfd_put_16 (abfd, insn, (bfd_byte *)data + reloc->address);
-	  return bfd_reloc_ok;
-    
-	case R_V850_ZDA_16_16_SPLIT_OFFSET:
-	case R_V850_SDA_16_16_SPLIT_OFFSET:
-	  if ((long) relocation > 0xffff || (long) relocation < 0)
-	    return bfd_reloc_overflow;
-
-	  insn  = bfd_get_32 (abfd, (bfd_byte *) data + reloc->address);
-	  
-	  insn &= 0x0001ffdf;
-	  insn |= (relocation & 1) << 5;
-	  insn |= (relocation & ~1) << 16;
-	  
-	  bfd_put_32 (abfd, insn, (bfd_byte *)data + reloc->address);
-	  return bfd_reloc_ok;
+    case R_V850_TDA_4_5_OFFSET:
+      if ((long) relocation > 0x1e || (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 &= 0xfff0;
+      insn |= (relocation >> 1);
+      
+      bfd_put_16 (abfd, insn, (bfd_byte *)data + reloc->address);
+      return bfd_reloc_ok;
+      
+    case R_V850_TDA_4_4_OFFSET:
+      if ((long) relocation > 0xf || (long) relocation < 0)
+	return bfd_reloc_overflow;
+      
+      insn  = bfd_get_16 (abfd, (bfd_byte *) data + reloc->address);
+      insn &= 0xfff0;
+      insn |= relocation;
+      
+      bfd_put_16 (abfd, insn, (bfd_byte *)data + reloc->address);
+      return bfd_reloc_ok;
+      
+    case R_V850_ZDA_16_16_SPLIT_OFFSET:
+    case R_V850_SDA_16_16_SPLIT_OFFSET:
+      if ((long) relocation > 0xffff || (long) relocation < 0)
+	return bfd_reloc_overflow;
+      
+      insn  = bfd_get_32 (abfd, (bfd_byte *) data + reloc->address);
+      
+      insn &= 0x0001ffdf;
+      insn |= (relocation & 1) << 5;
+      insn |= (relocation & ~1) << 16;
+      
+      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 */
-	}
     }
 
   return bfd_reloc_continue;
@@ -817,8 +899,8 @@ v850_elf_reloc (abfd, reloc, symbol, data, isection, obfd, err)
 /*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'
@@ -920,6 +1002,9 @@ v850_elf_final_link_relocate (howto, input_bfd, output_bfd,
       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);
 
@@ -930,6 +1015,9 @@ v850_elf_final_link_relocate (howto, input_bfd, output_bfd,
       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;
@@ -959,6 +1047,9 @@ v850_elf_final_link_relocate (howto, input_bfd, output_bfd,
       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;
@@ -985,6 +1076,9 @@ v850_elf_final_link_relocate (howto, input_bfd, output_bfd,
       }
 
     case R_V850_SDA_15_16_OFFSET:
+      if (sym_sec == NULL)
+	return bfd_reloc_undefined;
+	  
       {
 	unsigned long                gp;
 	struct bfd_link_hash_entry * h;
@@ -1108,6 +1202,31 @@ v850_elf_final_link_relocate (howto, input_bfd, output_bfd,
 	return bfd_reloc_ok;
       }
     
+    case R_V850_TDA_16_16_OFFSET:
+      {
+	unsigned long                ep;
+	struct bfd_link_hash_entry * h;
+
+	/* Get the value of __ep.  */
+	h = bfd_link_hash_lookup (info->hash, "__ep", false, false, true);
+	if (h == (struct bfd_link_hash_entry *) NULL
+	    || h->type != bfd_link_hash_defined)
+	  return bfd_reloc_other;
+
+	ep = (h->u.def.value
+	      + h->u.def.section->output_section->vma
+	      + h->u.def.section->output_offset);
+	value -= ep;
+	
+	value += (short) bfd_get_16 (input_bfd, hit_data);
+
+	if ((long)value > 0x7fff || (long)value < -0x8000)
+	  return bfd_reloc_overflow;
+
+	bfd_put_16 (input_bfd, value, hit_data);
+	return bfd_reloc_ok;
+      }
+
 /* start-sanitize-v850e */
     case R_V850_TDA_4_5_OFFSET:
       {
@@ -1168,6 +1287,9 @@ v850_elf_final_link_relocate (howto, input_bfd, output_bfd,
       }
     
     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;
@@ -1202,6 +1324,9 @@ v850_elf_final_link_relocate (howto, input_bfd, output_bfd,
       }
 
     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;
@@ -1218,8 +1343,65 @@ v850_elf_final_link_relocate (howto, input_bfd, output_bfd,
       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_continue;  /* 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_other;
+
+	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;
@@ -1424,10 +1606,8 @@ v850_elf_object_p (abfd)
     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;
-/* start-sanitize-v850eq */
+/* end-sanitize-v850e */
     }
 }
 
@@ -1444,11 +1624,9 @@ v850_elf_final_write_processing (abfd, linker)
     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;
@@ -1529,8 +1707,12 @@ v850_elf_merge_private_bfd_data (ibfd, obfd)
     {
       _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;
@@ -1553,11 +1735,9 @@ v850_elf_print_private_bfd_data (abfd, ptr)
     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);