oops - omitted from previous delta - a reworking of the linker relaxation code.

1 files changed, 717 insertions, 740 deletions

diff --git a/bfd/elf32-ip2k.c b/bfd/elf32-ip2k.c
index dd2bb97f..cd2b970 100644
--- a/bfd/elf32-ip2k.c
+++ b/bfd/elf32-ip2k.c
@@ -1,5 +1,5 @@
 /* Ubicom IP2xxx specific support for 32-bit ELF
-   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -33,143 +33,151 @@ struct misc
   Elf_Internal_Sym *   isymbuf;
 };
 
+struct ip2k_opcode
+{
+  unsigned short opcode;
+  unsigned short mask;
+};
+  
 /* Prototypes.  */
 static reloc_howto_type *ip2k_reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
-static void ip2k_info_to_howto_rela
-  PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static asection * ip2k_elf_gc_mark_hook
-  PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
-	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
-static bfd_boolean ip2k_elf_gc_sweep_hook
-  PARAMS ((bfd *, struct bfd_link_info *, asection *,
-	   const Elf_Internal_Rela *));
+static int ip2k_is_opcode
+  PARAMS ((bfd_byte *, const struct ip2k_opcode *));
 static bfd_vma symbol_value
   PARAMS ((bfd *, Elf_Internal_Shdr *, Elf_Internal_Sym *,
 	   Elf_Internal_Rela *));
+static void ip2k_get_mem
+  PARAMS ((bfd *, bfd_byte *, int, bfd_byte *));
+static bfd_vma ip2k_nominal_page_bits
+  PARAMS ((bfd *, asection *, bfd_vma, bfd_byte *));
+static bfd_boolean ip2k_test_page_insn
+  PARAMS ((bfd *, asection *, Elf_Internal_Rela *, struct misc *));
+static bfd_boolean ip2k_delete_page_insn
+  PARAMS ((bfd *, asection *, Elf_Internal_Rela *, bfd_boolean *, struct misc *));
+static int ip2k_is_switch_table_128
+  PARAMS ((bfd *, asection *, bfd_vma, bfd_byte *));
+static bfd_boolean ip2k_relax_switch_table_128
+  PARAMS ((bfd *, asection *, Elf_Internal_Rela *, bfd_boolean *, struct misc *));
+static int ip2k_is_switch_table_256
+  PARAMS ((bfd *, asection *, bfd_vma, bfd_byte *));
+static bfd_boolean ip2k_relax_switch_table_256
+  PARAMS ((bfd *, asection *, Elf_Internal_Rela *, bfd_boolean *, struct misc *));
+static bfd_boolean ip2k_elf_relax_section
+  PARAMS ((bfd *, asection *, struct bfd_link_info *, bfd_boolean *));
+static bfd_boolean ip2k_elf_relax_section_page
+  PARAMS ((bfd *, asection *, bfd_boolean *, struct misc *, unsigned long, unsigned long));
 static void adjust_all_relocations
   PARAMS ((bfd *, asection *, bfd_vma, bfd_vma, int, int));
 static bfd_boolean ip2k_elf_relax_delete_bytes
   PARAMS ((bfd *, asection *, bfd_vma, int));
-static bfd_boolean ip2k_elf_relax_add_bytes
-  PARAMS ((bfd *, asection *, bfd_vma, const bfd_byte *, int, int));
-static bfd_boolean add_page_insn
-  PARAMS ((bfd *, asection *, Elf_Internal_Rela *, struct misc *));
-static bfd_boolean ip2k_elf_relax_section
-  PARAMS ((bfd *, asection *, struct bfd_link_info *, bfd_boolean *));
-static bfd_boolean relax_switch_dispatch_tables_pass1
-  PARAMS ((bfd *, asection *, bfd_vma, struct misc *));
-static bfd_boolean unrelax_dispatch_table_entries
-  PARAMS ((bfd *, asection *, bfd_vma, bfd_vma, bfd_boolean *, struct misc *));
-static bfd_boolean unrelax_switch_dispatch_tables_passN
-  PARAMS ((bfd *, asection *, bfd_vma, bfd_boolean *, struct misc *));
-static bfd_boolean is_switch_128_dispatch_table_p
-  PARAMS ((bfd *, bfd_vma, bfd_boolean, struct misc *));
-static bfd_boolean is_switch_256_dispatch_table_p
-  PARAMS ((bfd *, bfd_vma, bfd_boolean, struct misc *));
-static bfd_boolean ip2k_elf_relax_section_pass1
-  PARAMS ((bfd *, asection *, bfd_boolean *, struct misc *));
-static bfd_boolean ip2k_elf_relax_section_passN
-  PARAMS ((bfd *, asection *, bfd_boolean *, bfd_boolean *, struct misc *));
+static void ip2k_info_to_howto_rela
+  PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
 static bfd_reloc_status_type ip2k_final_link_relocate
   PARAMS ((reloc_howto_type *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, bfd_vma));
 static bfd_boolean ip2k_elf_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
 	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
+static asection *ip2k_elf_gc_mark_hook
+  PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
+	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
+static bfd_boolean ip2k_elf_gc_sweep_hook
+  PARAMS ((bfd *, struct bfd_link_info *, asection *,
+	   const Elf_Internal_Rela *));
 
-#define IS_OPCODE(CODE0,CODE1,OPCODE) \
-  ((CODE0) == (OPCODE)[0] && (CODE1) == (OPCODE)[1])
-
-#define PAGE_INSN_0		0x00
-#define PAGE_INSN_1		0x10
+static bfd_boolean ip2k_relaxed = FALSE;
 
-static const bfd_byte page_opcode[] =
+static const struct ip2k_opcode ip2k_page_opcode[] =
 {
-   PAGE_INSN_0, PAGE_INSN_1
+  {0x0010, 0xFFF8},	/* page */
+  {0x0000, 0x0000},
 };
 
-#define IS_PAGE_OPCODE(CODE0,CODE1) \
-  IS_OPCODE (CODE0, CODE1, page_opcode)
-
-#define JMP_INSN_0		0xE0
-#define JMP_INSN_1		0x00
+#define IS_PAGE_OPCODE(code) \
+  ip2k_is_opcode (code, ip2k_page_opcode)
 
-static const bfd_byte jmp_opcode[] =
+static const struct ip2k_opcode ip2k_jmp_opcode[] =
 {
-   JMP_INSN_0, JMP_INSN_1
+  {0xE000, 0xE000},	/* jmp */
+  {0x0000, 0x0000},
 };
 
-#define IS_JMP_OPCODE(CODE0,CODE1) \
-  IS_OPCODE (CODE0, CODE1, jmp_opcode)
+#define IS_JMP_OPCODE(code) \
+  ip2k_is_opcode (code, ip2k_jmp_opcode)
 
-#define CALL_INSN_0		0xC0
-#define CALL_INSN_1		0x00
-
-static const bfd_byte call_opcode[] =
+static const struct ip2k_opcode ip2k_call_opcode[] =
 {
-  CALL_INSN_0, CALL_INSN_1
+  {0xC000, 0xE000},	/* call */
+  {0x0000, 0x0000},
 };
 
-#define IS_CALL_OPCODE(CODE0,CODE1) \
-  IS_OPCODE (CODE0, CODE1, call_opcode)
-
-#define ADD_PCL_W_INSN_0	0x1E
-#define ADD_PCL_W_INSN_1	0x09
+#define IS_CALL_OPCODE(code) \
+  ip2k_is_opcode (code, ip2k_call_opcode)
 
-static const bfd_byte add_pcl_w_opcode[] =
+static const struct ip2k_opcode ip2k_snc_opcode[] =
 {
-  ADD_PCL_W_INSN_0, ADD_PCL_W_INSN_1
+  {0xA00B, 0xFFFF},	/* snc */
+  {0x0000, 0x0000},
 };
 
-#define IS_ADD_PCL_W_OPCODE(CODE0,CODE1) \
-  IS_OPCODE (CODE0, CODE1, add_pcl_w_opcode)
-
-#define ADD_W_WREG_INSN_0	0x1C
-#define ADD_W_WREG_INSN_1	0x0A
+#define IS_SNC_OPCODE(code) \
+  ip2k_is_opcode (code, ip2k_snc_opcode)
 
-static const bfd_byte add_w_wreg_opcode[] =
+static const struct ip2k_opcode ip2k_inc_1sp_opcode[] =
 {
-  ADD_W_WREG_INSN_0, ADD_W_WREG_INSN_1
+  {0x2B81, 0xFFFF},	/* inc 1(SP) */
+  {0x0000, 0x0000},
 };
 
-#define IS_ADD_W_WREG_OPCODE(CODE0,CODE1) \
-  IS_OPCODE (CODE0, CODE1, add_w_wreg_opcode)
+#define IS_INC_1SP_OPCODE(code) \
+  ip2k_is_opcode (code, ip2k_inc_1sp_opcode)
 
-#define SNC_INSN_0		0xA0
-#define SNC_INSN_1		0x0B
-
-static const bfd_byte snc_opcode[] =
+static const struct ip2k_opcode ip2k_add_2sp_w_opcode[] =
 {
-   SNC_INSN_0, SNC_INSN_1
+  {0x1F82, 0xFFFF},	/* add 2(SP),w */
+  {0x0000, 0x0000},
 };
 
-#define IS_SNC_OPCODE(CODE0,CODE1) \
-  IS_OPCODE (CODE0, CODE1, snc_opcode)
-
-#define INC_1_SP_INSN_0		0x2B
-#define INC_1_SP_INSN_1		0x81
+#define IS_ADD_2SP_W_OPCODE(code) \
+  ip2k_is_opcode (code, ip2k_add_2sp_w_opcode)
 
-static const bfd_byte inc_1_sp_opcode[] =
+static const struct ip2k_opcode ip2k_add_w_wreg_opcode[] =
 {
-   INC_1_SP_INSN_0, INC_1_SP_INSN_1
+  {0x1C0A, 0xFFFF},	/* add w,wreg */
+  {0x1E0A, 0xFFFF},	/* add wreg,w */
+  {0x0000, 0x0000},
 };
 
-#define IS_INC_1_SP_OPCODE(CODE0,CODE1) \
-  IS_OPCODE (CODE0, CODE1, inc_1_sp_opcode)
+#define IS_ADD_W_WREG_OPCODE(code) \
+  ip2k_is_opcode (code, ip2k_add_w_wreg_opcode)
+
+static const struct ip2k_opcode ip2k_add_pcl_w_opcode[] =
+{
+  {0x1E09, 0xFFFF},	/* add pcl,w */
+  {0x0000, 0x0000},
+};
 
-#define ADD_2_SP_W_INSN_0	0x1F
-#define ADD_2_SP_W_INSN_1	0x82
+#define IS_ADD_PCL_W_OPCODE(code) \
+  ip2k_is_opcode (code, ip2k_add_pcl_w_opcode)
 
-static const bfd_byte add_2_sp_w_opcode[] =
+static const struct ip2k_opcode ip2k_skip_opcodes[] =
 {
-   ADD_2_SP_W_INSN_0, ADD_2_SP_W_INSN_1
+  {0xB000, 0xF000},	/* sb */
+  {0xA000, 0xF000},	/* snb */
+  {0x7600, 0xFE00},	/* cse/csne #lit */
+  {0x5800, 0xFC00},	/* incsnz */
+  {0x4C00, 0xFC00},	/* decsnz */
+  {0x4000, 0xFC00},	/* cse/csne */
+  {0x3C00, 0xFC00},	/* incsz */
+  {0x2C00, 0xFC00},	/* decsz */
+  {0x0000, 0x0000},
 };
 
-#define IS_ADD_2_SP_W_OPCODE(CODE0,CODE1) \
-  IS_OPCODE (CODE0, CODE1, add_2_sp_w_opcode)
+#define IS_SKIP_OPCODE(code) \
+  ip2k_is_opcode (code, ip2k_skip_opcodes)
 
-/* Relocation tables. */
+/* Relocation tables.  */
 static reloc_howto_type ip2k_elf_howto_table [] =
 {
 #define IP2K_HOWTO(t,rs,s,bs,pr,bp,name,sm,dm) \
@@ -187,7 +195,7 @@ static reloc_howto_type ip2k_elf_howto_table [] =
           dm,                   /* dst_mask */ \
           pr)                   /* pcrel_offset */
 
-  /* This reloc does nothing. */
+  /* This reloc does nothing.  */
   IP2K_HOWTO (R_IP2K_NONE, 0,2,32, FALSE, 0, "R_IP2K_NONE", 0, 0),
   /* A 16 bit absolute relocation.  */
   IP2K_HOWTO (R_IP2K_16, 0,1,16, FALSE, 0, "R_IP2K_16", 0, 0xffff),
@@ -219,7 +227,7 @@ static reloc_howto_type ip2k_elf_howto_table [] =
 };
 
 
-/* Map BFD reloc types to IP2K ELF reloc types. */
+/* Map BFD reloc types to IP2K ELF reloc types.  */
 static reloc_howto_type *
 ip2k_reloc_type_lookup (abfd, code)
      bfd * abfd ATTRIBUTE_UNUSED;
@@ -228,7 +236,7 @@ ip2k_reloc_type_lookup (abfd, code)
   /* Note that the ip2k_elf_howto_table is indxed by the R_
      constants.  Thus, the order that the howto records appear in the
      table *must* match the order of the relocation types defined in
-     include/elf/ip2k.h. */
+     include/elf/ip2k.h.  */
 
   switch (code)
     {
@@ -263,13 +271,42 @@ ip2k_reloc_type_lookup (abfd, code)
     case BFD_RELOC_IP2K_EX8DATA:
       return &ip2k_elf_howto_table[ (int) R_IP2K_EX8DATA];
     default:
-      /* Pacify gcc -Wall. */
+      /* Pacify gcc -Wall.  */
       return NULL;
     }
   return NULL;
 }
 
-#define PAGENO(ABSADDR) ((ABSADDR) & 0x1C000)
+static void
+ip2k_get_mem (abfd, addr, length, ptr)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     bfd_byte *addr;
+     int length;
+     bfd_byte *ptr;
+{
+  while (length --)
+    * ptr ++ = bfd_get_8 (abfd, addr ++);
+}
+
+static bfd_boolean
+ip2k_is_opcode (code, opcodes)
+     bfd_byte *code;
+     const struct ip2k_opcode *opcodes;
+{
+  unsigned short insn = (code[0] << 8) | code[1];
+
+  while (opcodes->mask != 0)
+    {
+      if ((insn & opcodes->mask) == opcodes->opcode)
+	return TRUE;
+
+      opcodes ++;
+    }
+
+  return FALSE;
+}
+
+#define PAGENO(ABSADDR) ((ABSADDR) & 0xFFFFC000)
 #define BASEADDR(SEC)	((SEC)->output_section->vma + (SEC)->output_offset)
 
 #define UNDEFINED_SYMBOL (~(bfd_vma)0)
@@ -317,6 +354,115 @@ symbol_value (abfd, symtab_hdr, isymbuf, irel)
     }
 }
 
+/* Returns the expected page state for the given instruction not including
+   the effect of page instructions.  */
+
+static bfd_vma
+ip2k_nominal_page_bits (abfd, sec, addr, contents)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     asection *sec;
+     bfd_vma addr;
+     bfd_byte *contents;
+{
+  bfd_vma page = PAGENO (BASEADDR (sec) + addr);
+
+  /* Check if section flows into this page. If not then the page
+     bits are assumed to match the PC. This will be true unless
+     the user has a page instruction without a call/jump, in which
+     case they are on their own.  */
+  if (PAGENO (BASEADDR (sec)) == page)
+    return page;
+
+  /* Section flows across page boundary. The page bits should match
+     the PC unless there is a possible flow from the previous page,
+     in which case it is not possible to determine the value of the
+     page bits.  */
+  while (PAGENO (BASEADDR (sec) + addr - 2) == page)
+    {
+      bfd_byte code[2];
+
+      addr -= 2;
+      ip2k_get_mem (abfd, contents + addr, 2, code);
+      if (!IS_PAGE_OPCODE (code))
+	continue;
+
+      /* Found a page instruction, check if jump table.  */
+      if (ip2k_is_switch_table_128 (abfd, sec, addr, contents) != -1)
+	/* Jump table => page is conditional.  */
+	continue;
+
+      if (ip2k_is_switch_table_256 (abfd, sec, addr, contents) != -1)
+	/* Jump table => page is conditional.  */
+	continue;
+
+      /* Found a page instruction, check if conditional.  */
+      if (addr >= 2)
+        {
+	  ip2k_get_mem (abfd, contents + addr - 2, 2, code);
+          if (IS_SKIP_OPCODE (code))
+	    /* Page is conditional.  */
+	    continue;
+        }
+
+      /* Unconditional page instruction => page bits should be correct.  */
+      return page;
+    }
+
+  /* Flow from previous page => page bits are impossible to determine.  */
+  return 0;
+}
+
+static bfd_boolean
+ip2k_test_page_insn (abfd, sec, irel, misc)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     asection *sec;
+     Elf_Internal_Rela *irel;
+     struct misc *misc;
+{
+  bfd_vma symval;
+
+  /* Get the value of the symbol referred to by the reloc.  */
+  symval = symbol_value (abfd, misc->symtab_hdr, misc->isymbuf, irel);
+  if (symval == UNDEFINED_SYMBOL)
+    /* This appears to be a reference to an undefined
+       symbol.  Just ignore it--it will be caught by the
+       regular reloc processing.  */
+    return FALSE;
+
+  /* Test if we can delete this page instruction.  */
+  if (PAGENO (symval + irel->r_addend) !=
+      ip2k_nominal_page_bits (abfd, sec, irel->r_offset, misc->contents))
+    return FALSE;
+
+  return TRUE;
+}
+
+static bfd_boolean
+ip2k_delete_page_insn (abfd, sec, irel, again, misc)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     asection *sec;
+     Elf_Internal_Rela *irel;
+     bfd_boolean *again;
+     struct misc *misc;
+{
+  /* Note that we've changed the relocs, section contents, etc.  */
+  elf_section_data (sec)->relocs = misc->irelbase;
+  elf_section_data (sec)->this_hdr.contents = misc->contents;
+  misc->symtab_hdr->contents = (bfd_byte *) misc->isymbuf;
+
+  /* Fix the relocation's type.  */
+  irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info), R_IP2K_NONE);
+
+  /* Delete the PAGE insn.  */
+  if (!ip2k_elf_relax_delete_bytes (abfd, sec, irel->r_offset, 2))
+    return FALSE;
+	
+  /* Modified => will need to iterate relaxation again.  */
+  *again = TRUE;
+  
+  return TRUE;
+}
+
 /* Determine if the instruction sequence matches that for
    the prologue of a switch dispatch table with fewer than
    128 entries.
@@ -346,48 +492,116 @@ symbol_value (abfd, symtab_hdr, isymbuf, irel)
  	   ...
           jmp     $nnnN  */
 
-static bfd_boolean
-is_switch_128_dispatch_table_p (abfd, addr, relaxed, misc)
+static int
+ip2k_is_switch_table_128 (abfd, sec, addr, contents)
      bfd *abfd ATTRIBUTE_UNUSED;
+     asection *sec;
      bfd_vma addr;
-     bfd_boolean relaxed;
+     bfd_byte *contents;
+{
+  bfd_byte code[4];
+  int index = 0;
+  
+  /* Check current page-jmp.  */
+  if (addr + 4 > sec->_cooked_size)
+    return -1;
+
+  ip2k_get_mem (abfd, contents + addr, 4, code);
+
+  if ((! IS_PAGE_OPCODE (code + 0))
+      || (! IS_JMP_OPCODE (code + 2)))
+    return -1;
+  
+  /* Search back.  */
+  while (1)
+    {
+      if (addr < 4)
+	return -1;
+
+      /* Check previous 2 instructions.  */
+      ip2k_get_mem (abfd, contents + addr - 4, 4, code);
+      if ((IS_ADD_W_WREG_OPCODE (code + 0))
+	  && (IS_ADD_PCL_W_OPCODE (code + 2)))
+	return index;
+
+      if ((! IS_PAGE_OPCODE (code + 0))
+	  || (! IS_JMP_OPCODE (code + 2)))
+	return -1;
+
+      index++;
+      addr -= 4;
+    }
+}
+
+static bfd_boolean
+ip2k_relax_switch_table_128 (abfd, sec, irel, again, misc)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     asection *sec;
+     Elf_Internal_Rela *irel;
+     bfd_boolean *again;
      struct misc *misc;
 {
-  bfd_byte code0, code1;
+  Elf_Internal_Rela *irelend = misc->irelbase + sec->reloc_count;
+  Elf_Internal_Rela *ireltest = irel;
+  bfd_byte code[4];
+  bfd_vma addr;
+  
+  /* Test all page instructions.  */
+  addr = irel->r_offset;
+  while (1)
+    {
+      if (addr + 4 > sec->_cooked_size)
+	break;
 
-  if (addr < (3 * 2))
-    return FALSE;
+      ip2k_get_mem (abfd, misc->contents + addr, 4, code);
+      if ((! IS_PAGE_OPCODE (code + 0))
+	  || (! IS_JMP_OPCODE (code + 2)))
+	break;
 
-  code0 = bfd_get_8 (abfd, misc->contents + addr - 2);
-  code1 = bfd_get_8 (abfd, misc->contents + addr - 1);
+      /* Validate relocation entry (every entry should have a matching
+          relocation entry).  */
+      if (ireltest >= irelend)
+        {
+	  _bfd_error_handler (_("ip2k relaxer: switch table without complete matching relocation information."));
+          return FALSE;
+        }
 
-  /* Is it ADD PCL,W */
-  if (! IS_ADD_PCL_W_OPCODE (code0, code1))
-    return FALSE;
+      if (ireltest->r_offset != addr)
+        {
+	  _bfd_error_handler (_("ip2k relaxer: switch table without complete matching relocation information."));
+          return FALSE;
+        }
 
-  code0 = bfd_get_8 (abfd, misc->contents + addr - 4);
-  code1 = bfd_get_8 (abfd, misc->contents + addr - 3);
+      if (! ip2k_test_page_insn (abfd, sec, ireltest, misc))
+	/* Un-removable page insn => nothing can be done.  */
+	return TRUE;
 
-  if (relaxed)
-    /* Is it ADD W,WREG  */
-    return ! IS_ADD_W_WREG_OPCODE (code0, code1);
+      addr += 4;
+      ireltest += 2;
+    }
 
-  else
+  /* Relaxable. Adjust table header.  */
+  ip2k_get_mem (abfd, misc->contents + irel->r_offset - 4, 4, code);
+  if ((! IS_ADD_W_WREG_OPCODE (code + 0))
+      || (! IS_ADD_PCL_W_OPCODE (code + 2)))
     {
-      /* Is it ADD W,WREG  */
-      if (! IS_ADD_W_WREG_OPCODE (code0, code1))
-	return FALSE;
+      _bfd_error_handler (_("ip2k relaxer: switch table header corrupt."));
+      return FALSE;
+    }
+
+  if (!ip2k_elf_relax_delete_bytes (abfd, sec, irel->r_offset - 4, 2))
+    return FALSE;
 
-      code0 = bfd_get_8 (abfd, misc->contents + addr - 6);
-      code1 = bfd_get_8 (abfd, misc->contents + addr - 5);
+  *again = TRUE;
 
-      /* Is it JMP $nnnn  */
-      if (! IS_JMP_OPCODE (code0, code1))
-        return FALSE;
+  /* Delete all page instructions in table.  */
+  while (irel < ireltest)
+    {
+      if (!ip2k_delete_page_insn (abfd, sec, irel, again, misc))
+	return FALSE;
+      irel += 2;
     }
 
-  /* It looks like we've found the prologue for
-     a 1-127 entry switch dispatch table.  */
   return TRUE;
 }
 
@@ -431,353 +645,155 @@ is_switch_128_dispatch_table_p (abfd, addr, relaxed, misc)
           ...
           jmp     $nnnN  */
 
-static bfd_boolean
-is_switch_256_dispatch_table_p (abfd, addr, relaxed,  misc)
+static int
+ip2k_is_switch_table_256 (abfd, sec, addr, contents)
      bfd *abfd ATTRIBUTE_UNUSED;
-     bfd_vma addr;
-     bfd_boolean relaxed;
-     struct misc *misc;
-{
-  bfd_byte code0, code1;
-
-  if (addr < (8 * 2))
-    return FALSE;
-
-  code0 = bfd_get_8 (abfd, misc->contents + addr - 2);
-  code1 = bfd_get_8 (abfd, misc->contents + addr - 1);
-
-  /* Is it INC 1(SP).  */
-  if (! IS_INC_1_SP_OPCODE (code0, code1))
-    return FALSE;
-
-  code0 = bfd_get_8 (abfd, misc->contents + addr - 4);
-  code1 = bfd_get_8 (abfd, misc->contents + addr - 3);
-
-  /* Is it SNC.  */
-  if (! IS_SNC_OPCODE (code0, code1))
-    return FALSE;
-
-  code0 = bfd_get_8 (abfd, misc->contents + addr - 6);
-  code1 = bfd_get_8 (abfd, misc->contents + addr - 5);
-
-  /* Is it ADD 2(SP),W.  */
-  if (! IS_ADD_2_SP_W_OPCODE (code0, code1))
-    return FALSE;
-
-  code0 = bfd_get_8 (abfd, misc->contents + addr - 8);
-  code1 = bfd_get_8 (abfd, misc->contents + addr - 7);
-
-  if (relaxed)
-    /* Is it INC 1(SP).  */
-    return ! IS_INC_1_SP_OPCODE (code0, code1);
-
-  else
-    {
-      /* Is it INC 1(SP).  */
-      if (! IS_INC_1_SP_OPCODE (code0, code1))
-	return FALSE;
-
-      code0 = bfd_get_8 (abfd, misc->contents + addr - 10);
-      code1 = bfd_get_8 (abfd, misc->contents + addr - 9);
-
-      /* Is it SNC.  */
-      if (! IS_SNC_OPCODE (code0, code1))
-        return FALSE;
-
-      code0 = bfd_get_8 (abfd, misc->contents + addr - 12);
-      code1 = bfd_get_8 (abfd, misc->contents + addr - 11);
-
-      /* Is it ADD W,WREG.  */
-      if (! IS_ADD_W_WREG_OPCODE (code0, code1))
-	return FALSE;
-    }
-
-  /* It looks like we've found the prologue for
-     a 128-255 entry switch dispatch table.  */
-  return TRUE;
-}
-
-static bfd_boolean
-relax_switch_dispatch_tables_pass1 (abfd, sec, addr, misc)
-     bfd *abfd;
      asection *sec;
      bfd_vma addr;
-     struct misc *misc;
+     bfd_byte *contents;
 {
-  if (addr + 3 < sec->_cooked_size)
+  bfd_byte code[16];
+  int index = 0;
+  
+  /* Check current page-jmp.  */
+  if (addr + 4 > sec->_cooked_size)
+    return -1;
+
+  ip2k_get_mem (abfd, contents + addr, 4, code);
+  if ((! IS_PAGE_OPCODE (code + 0))
+      || (! IS_JMP_OPCODE (code + 2)))
+    return -1;
+  
+  /* Search back.  */
+  while (1)
     {
-      bfd_byte code0 = bfd_get_8 (abfd, misc->contents + addr + 2);
-      bfd_byte code1 = bfd_get_8 (abfd, misc->contents + addr + 3);
-
-      if (IS_JMP_OPCODE (code0, code1)
-	  && is_switch_128_dispatch_table_p (abfd, addr, FALSE, misc))
-	{
-	  /* Delete ADD W,WREG from prologue.  */
-	  ip2k_elf_relax_delete_bytes (abfd, sec, addr - (2 * 2), (1 * 2));
-	  return TRUE;
-	}
-
-      if (IS_JMP_OPCODE (code0, code1)
-	  && is_switch_256_dispatch_table_p (abfd, addr, FALSE, misc))
-	{
-	  /* Delete ADD W,WREG; SNC ; INC 1(SP) from prologue.  */
-	  ip2k_elf_relax_delete_bytes (abfd, sec, addr - 6 * 2, 3 * 2);
-	  return TRUE;
-	}
+      if (addr < 16)
+	return -1;
+
+      /* Check previous 8 instructions.  */
+      ip2k_get_mem (abfd, contents + addr - 16, 16, code);
+      if ((IS_ADD_W_WREG_OPCODE (code + 0))
+	  && (IS_SNC_OPCODE (code + 2))
+	  && (IS_INC_1SP_OPCODE (code + 4))
+	  && (IS_ADD_2SP_W_OPCODE (code + 6))
+	  && (IS_SNC_OPCODE (code + 8))
+	  && (IS_INC_1SP_OPCODE (code + 10))
+	  && (IS_PAGE_OPCODE (code + 12))
+	  && (IS_JMP_OPCODE (code + 14)))
+	return index;
+
+      if ((IS_ADD_W_WREG_OPCODE (code + 2))
+	  && (IS_SNC_OPCODE (code + 4))
+	  && (IS_INC_1SP_OPCODE (code + 6))
+	  && (IS_ADD_2SP_W_OPCODE (code + 8))
+	  && (IS_SNC_OPCODE (code + 10))
+	  && (IS_INC_1SP_OPCODE (code + 12))
+	  && (IS_JMP_OPCODE (code + 14)))
+	return index;
+      
+      if ((! IS_PAGE_OPCODE (code + 0))
+	  || (! IS_JMP_OPCODE (code + 2)))
+	return -1;
+
+      index++;
+      addr -= 4;
     }
-
-  return TRUE;
 }
 
 static bfd_boolean
-unrelax_dispatch_table_entries (abfd, sec, first, last, changed, misc)
-     bfd *abfd;
+ip2k_relax_switch_table_256 (abfd, sec, irel, again, misc)
+     bfd *abfd ATTRIBUTE_UNUSED;
      asection *sec;
-     bfd_vma first;
-     bfd_vma last;
-     bfd_boolean *changed;
+     Elf_Internal_Rela *irel;
+     bfd_boolean *again;
      struct misc *misc;
 {
-  bfd_vma addr = first;
-
-  while (addr < last)
+  Elf_Internal_Rela *irelend = misc->irelbase + sec->reloc_count;
+  Elf_Internal_Rela *ireltest = irel;
+  bfd_byte code[12];
+  bfd_vma addr;
+  
+  /* Test all page instructions.  */
+  addr = irel->r_offset;
+
+  while (1)
     {
-      bfd_byte code0 = bfd_get_8 (abfd, misc->contents + addr);
-      bfd_byte code1 = bfd_get_8 (abfd, misc->contents + addr + 1);
-
-      /* We are only expecting to find PAGE or JMP insns
-         in the dispatch table. If we find anything else
-         something has gone wrong failed the relaxation
-         which will cause the link to be aborted.  */
-
-      if (IS_PAGE_OPCODE (code0, code1))
-	/* Skip the PAGE and JMP insns.  */
-        addr += 4;
-      else if (IS_JMP_OPCODE (code0, code1))
-         {
-            Elf_Internal_Rela * irelend = misc->irelbase
-					  + sec->reloc_count;
-            Elf_Internal_Rela * irel;
-
-            /* Find the relocation entry.  */
-            for (irel = misc->irelbase; irel < irelend; irel++)
-               {
-                  if (irel->r_offset == addr
-                      && ELF32_R_TYPE (irel->r_info) == R_IP2K_ADDR16CJP)
-                    {
-                      if (! add_page_insn (abfd, sec, irel, misc))
-			/* Something has gone wrong.  */
-                        return FALSE;
-
-		      *changed = TRUE;
-		      break;
-                    }
-               }
-
-	    /* If we fell off the end something has gone wrong.  */
-	    if (irel >= irelend)
-	      /* Something has gone wrong.  */
-	      return FALSE;
-
-	    /* Skip the PAGE and JMP isns.  */
-	    addr += 4;
-	    /* Acount for the new PAGE insn.  */
-            last += 2;
-          }
-       else
-	 /* Something has gone wrong.  */
-	 return FALSE;
-    }
+      if (addr + 4 > sec->_cooked_size)
+	break;
 
-  return TRUE;
-}
+      ip2k_get_mem (abfd, misc->contents + addr, 4, code);
 
-static bfd_boolean
-unrelax_switch_dispatch_tables_passN (abfd, sec, addr, changed, misc)
-     bfd *abfd;
-     asection *sec;
-     bfd_vma addr;
-     bfd_boolean *changed;
-     struct misc *misc;
-{
-  if (2 <= addr && (addr + 3) < sec->_cooked_size)
-    {
-      bfd_byte code0 = bfd_get_8 (abfd, misc->contents + addr - 2);
-      bfd_byte code1 = bfd_get_8 (abfd, misc->contents + addr - 1);
+      if ((! IS_PAGE_OPCODE (code + 0))
+	  || (! IS_JMP_OPCODE (code + 2)))
+	break;
 
-      if (IS_PAGE_OPCODE (code0, code1))
-	{
-	  addr -= 2;
-	  code0 = bfd_get_8 (abfd, misc->contents + addr + 2);
-          code1 = bfd_get_8 (abfd, misc->contents + addr + 3);
-	}
-      else
-	{
-	  code0 = bfd_get_8 (abfd, misc->contents + addr);
-	  code1 = bfd_get_8 (abfd, misc->contents + addr + 1);
-	}
-
-      if (IS_JMP_OPCODE (code0, code1)
-          && is_switch_128_dispatch_table_p (abfd, addr, TRUE, misc))
+      /* Validate relocation entry (every entry should have a matching
+          relocation entry).  */
+      if (ireltest >= irelend)
         {
-	  bfd_vma first = addr;
-	  bfd_vma last  = first;
-	  bfd_boolean relaxed = TRUE;
-
-	  /* On the final pass we must check if *all* entries in the
-	     dispatch table are relaxed. If *any* are not relaxed
-	     then we must unrelax *all* the entries in the dispach
-	     table and also unrelax the dispatch table prologue.  */
-
-	  /* Find the last entry in the dispach table.  */
-	  while (last < sec->_cooked_size)
-	     {
-	        code0 = bfd_get_8 (abfd, misc->contents + last);
-	        code1 = bfd_get_8 (abfd, misc->contents + last + 1);
-
-		if (IS_PAGE_OPCODE (code0, code1))
-		  relaxed = FALSE;
-		else if (! IS_JMP_OPCODE (code0, code1))
-		    break;
-
-	        last += 2;
-	     }
-
-	  /* We should have found the end of the dispatch table
-	     before reaching the end of the section. If we've have
-	     reached the end then fail the relaxation which will
-	     cause the link to be aborted.  */
-	  if (last >= sec->_cooked_size)
-	    /* Something has gone wrong.  */
-	    return FALSE;
-
-	  /* If we found an unrelaxed entry then
-	     unlrelax all the switch table entries.  */
-	  if (! relaxed )
-	    {
-	      if (! unrelax_dispatch_table_entries (abfd, sec, first,
-						    last, changed, misc))
-		/* Something has gone wrong.  */
-	        return FALSE;
-
-	      if (! is_switch_128_dispatch_table_p (abfd, addr, TRUE, misc))
-		/* Something has gone wrong.  */
-		return FALSE;
-
-              /* Unrelax the prologue.  */
-
-              /* Insert an ADD W,WREG insnstruction.  */
-              if (! ip2k_elf_relax_add_bytes (abfd, sec,
-					      addr - 2,
-					      add_w_wreg_opcode,
-					      sizeof (add_w_wreg_opcode),
-					      0))
-		/* Something has gone wrong.  */
-                return FALSE;
-	    }
-
-          return TRUE;
+          _bfd_error_handler (_("ip2k relaxer: switch table without complete matching relocation information."));
+          return FALSE;
         }
 
-      if (IS_JMP_OPCODE (code0, code1)
-          && is_switch_256_dispatch_table_p (abfd, addr, TRUE, misc))
+      if (ireltest->r_offset != addr)
         {
-          bfd_vma first = addr;
-          bfd_vma last;
-          bfd_boolean relaxed = TRUE;
-
-          /* On the final pass we must check if *all* entries in the
-             dispatch table are relaxed. If *any* are not relaxed
-             then we must unrelax *all* the entries in the dispach
-             table and also unrelax the dispatch table prologue.  */
-
-	  /* Note the 1st PAGE/JMP instructions are part of the
-	     prologue and can safely be relaxed.  */
-
-          code0 = bfd_get_8 (abfd, misc->contents + first);
-          code1 = bfd_get_8 (abfd, misc->contents + first + 1);
-
-	  if (IS_PAGE_OPCODE (code0, code1))
-	    {
-	      first += 2;
-              code0 = bfd_get_8 (abfd, misc->contents + first);
-              code1 = bfd_get_8 (abfd, misc->contents + first + 1);
-	    }
-
-          if (! IS_JMP_OPCODE (code0, code1))
-	    /* Something has gone wrong.  */
-	    return FALSE;
-
-          first += 2;
-	  last = first;
-
-          /* Find the last entry in the dispach table.  */
-          while (last < sec->_cooked_size)
-             {
-                code0 = bfd_get_8 (abfd, misc->contents + last);
-                code1 = bfd_get_8 (abfd, misc->contents + last + 1);
-
-                if (IS_PAGE_OPCODE (code0, code1))
-                  relaxed = FALSE;
-                else if (! IS_JMP_OPCODE (code0, code1))
-                    break;
-
-                last += 2;
-             }
-
-          /* We should have found the end of the dispatch table
-             before reaching the end of the section. If we have
-             reached the end of the section then fail the
-	     relaxation.  */
-          if (last >= sec->_cooked_size)
-            return FALSE;
-
-          /* If we found an unrelaxed entry then
-              unrelax all the switch table entries.  */
-          if (! relaxed)
-	    {
-	      if (! unrelax_dispatch_table_entries (abfd, sec, first,
-						    last, changed, misc))
-		return FALSE;
+          _bfd_error_handler (_("ip2k relaxer: switch table without complete matching relocation information."));
+          return FALSE;
+        }
 
-              if (! is_switch_256_dispatch_table_p (abfd, addr, TRUE, misc))
-		return FALSE;
+      if (!ip2k_test_page_insn (abfd, sec, ireltest, misc))
+	/* Un-removable page insn => nothing can be done.  */
+	return TRUE;
 
-              /* Unrelax the prologue.  */
+      addr += 4;
+      ireltest += 2;
+    }
 
-              /* Insert an INC 1(SP) insnstruction.  */
-              if (! ip2k_elf_relax_add_bytes (abfd, sec,
-                                              addr - 6,
-                                              inc_1_sp_opcode,
-                                              sizeof (inc_1_sp_opcode),
-					      0))
-		return FALSE;
+  /* Relaxable. Adjust table header.  */
+  ip2k_get_mem (abfd, misc->contents + irel->r_offset - 4, 2, code);
+  if (IS_PAGE_OPCODE (code))
+    addr = irel->r_offset - 16;
+  else
+    addr = irel->r_offset - 14;
+
+  ip2k_get_mem (abfd, misc->contents + addr, 12, code);
+  if ((!IS_ADD_W_WREG_OPCODE (code + 0))
+      || (!IS_SNC_OPCODE (code + 2))
+      || (!IS_INC_1SP_OPCODE (code + 4))
+      || (!IS_ADD_2SP_W_OPCODE (code + 6))
+      || (!IS_SNC_OPCODE (code + 8))
+      || (!IS_INC_1SP_OPCODE (code + 10)))
+    {
+      _bfd_error_handler (_("ip2k relaxer: switch table header corrupt."));
+      return FALSE;
+    }
 
-              /* Insert an SNC insnstruction.  */
-              if (! ip2k_elf_relax_add_bytes (abfd, sec,
-					      addr - 6,
-					      snc_opcode,
-					      sizeof (snc_opcode),
-					      0))
-		return FALSE;
+  /* Delete first 3 opcodes.  */
+  if (!ip2k_elf_relax_delete_bytes (abfd, sec, addr + 0, 6))
+    return FALSE;
 
-	      /* Insert an ADD W,WREG insnstruction.  */
-              if (! ip2k_elf_relax_add_bytes (abfd, sec,
-					     addr - 6,
-				 	     add_w_wreg_opcode,
-					     sizeof (add_w_wreg_opcode),
-					     0))
-		return FALSE;
-	    }
+  *again = TRUE;
 
-          return TRUE;
-        }
+  /* Delete all page instructions in table.  */
+  while (irel < ireltest)
+    {
+      if (!ip2k_delete_page_insn (abfd, sec, irel, again, misc))
+	return FALSE;
+      irel += 2;
     }
 
   return TRUE;
 }
 
-/* This function handles relaxing for the ip2k.  */
+/* This function handles relaxing for the ip2k.
+
+   Principle: Start with the first page and remove page instructions that
+   are not require on this first page. By removing page instructions more
+   code will fit into this page - repeat until nothing more can be achieved
+   for this page. Move on to the next page.
+
+   Processing the pages one at a time from the lowest page allows a removal
+   only policy to be used - pages can be removed but are never reinserted.  */
 
 static bfd_boolean
 ip2k_elf_relax_section (abfd, sec, link_info, again)
@@ -791,10 +807,12 @@ ip2k_elf_relax_section (abfd, sec, link_info, again)
   bfd_byte *contents = NULL;
   Elf_Internal_Sym *isymbuf = NULL;
   static asection * first_section = NULL;
-  static asection * last_section = NULL;
-  static bfd_boolean changed = FALSE;
-  static bfd_boolean final_pass = FALSE;
+  static unsigned long search_addr;
+  static unsigned long page_start = 0;
+  static unsigned long page_end = 0;
   static unsigned int pass = 0;
+  static bfd_boolean new_pass = FALSE;
+  static bfd_boolean changed = FALSE;
   struct misc misc;
   asection *stab;
 
@@ -802,21 +820,17 @@ ip2k_elf_relax_section (abfd, sec, link_info, again)
   *again = FALSE;
 
   if (first_section == NULL)
-    first_section = sec;
+    {
+      ip2k_relaxed = TRUE;
+      first_section = sec;
+    }
 
   if (first_section == sec)
     {
-      changed = FALSE;
       pass++;
+      new_pass = TRUE;
     }
 
-  /* If we make too many passes then it's a sign that
-     something is wrong and we fail the relaxation.
-     Note if everything is working correctly then the
-     relaxation should converge reasonably quickly.  */
-  if (pass == 4096)
-    return FALSE;
-
   /* We don't have to do anything for a relocatable link,
      if this section does not have relocs, or if this is
      not a code section.  */
@@ -826,9 +840,6 @@ ip2k_elf_relax_section (abfd, sec, link_info, again)
       || (sec->flags & SEC_CODE) == 0)
     return TRUE;
 
-  if (pass == 1)
-    last_section = sec;
-
   /* If this is the first time we have been called
       for this section, initialise the cooked size.  */
   if (sec->_cooked_size == 0)
@@ -892,58 +903,50 @@ ip2k_elf_relax_section (abfd, sec, link_info, again)
   misc.contents = contents;
 
   /* This is where all the relaxation actually get done.  */
-
-  if (pass == 1)
+  if ((pass == 1) || (new_pass && !changed))
     {
-      /* On the first pass we remove *all* page instructions and
-         relax the prolog for switch dispatch tables. This gets
-	 us to the starting point for subsequent passes where
-	 we add page instructions back in as needed.  */
+      /* On the first pass we simply search for the lowest page that
+         we havn't relaxed yet. Note that the pass count is reset
+         each time a page is complete in order to move on to the next page.
+         If we can't find any more pages then we are finished.  */
+      if (new_pass)
+	{
+	  pass = 1;
+	  new_pass = FALSE;
+	  changed = TRUE; /* Pre-initialize to break out of pass 1.  */
+	  search_addr = 0xFFFFFFFF;
+	}
 
-      if (! ip2k_elf_relax_section_pass1 (abfd, sec, again, &misc))
-	goto error_return;
+      if ((BASEADDR (sec) + sec->_cooked_size < search_addr)
+	  && (BASEADDR (sec) + sec->_cooked_size > page_end))
+	{
+	  if (BASEADDR (sec) <= page_end)
+	    search_addr = page_end + 1;
+	  else
+	    search_addr = BASEADDR (sec);
 
-      changed |= *again;
+	  /* Found a page => more work to do.  */
+	  *again = TRUE;
+	}
     }
   else
     {
-      /* Add page instructions back in as needed but we ignore
-	 the issue with sections (functions) crossing a page
-	 boundary until we have converged to an approximate
-	 solution (i.e. nothing has changed on this relaxation
-	 pass) and we then know roughly where the page boundaries
-	 will end up.
-
-	 After we have have converged to an approximate solution
-	 we set the final pass flag and continue relaxing. On these
-	 final passes if a section (function) cross page boundary
-	 we will add *all* the page instructions back into such
-	 sections.
-
-	 After adding *all* page instructions back into a section
-	 which crosses a page bounbdary we reset the final pass flag
-	 so the we will again interate until we find a new approximate
-	 solution which is closer to the final solution.  */
-
-      if (! ip2k_elf_relax_section_passN (abfd, sec, again, &final_pass,
-					  &misc))
-	goto error_return;
-
-      changed |= *again;
+      if (new_pass)
+	{
+	  new_pass = FALSE;
+	  changed = FALSE;
+	  page_start = PAGENO (search_addr);
+	  page_end = page_start | 0x00003FFF;
+	}
 
-      /* If nothing has changed on this relaxation
-	  pass restart the final relaxaton pass.  */
-      if (! changed && last_section == sec)
+      /* Only process sections in range.  */
+      if ((BASEADDR (sec) + sec->_cooked_size >= page_start)
+	  && (BASEADDR (sec) <= page_end))
 	{
-	  /* If this was the final pass and we didn't reset
-	     the final pass flag then we are done, otherwise
-	     do another final pass.  */
-	  if (! final_pass)
-	    {
-	      final_pass = TRUE;
-	      *again = TRUE;
-	    }
+          if (!ip2k_elf_relax_section_page (abfd, sec, &changed, &misc, page_start, page_end))
+	    return FALSE;
 	}
+      *again = TRUE;
     }
 
   /* Perform some house keeping after relaxing the section.  */
@@ -988,172 +991,72 @@ ip2k_elf_relax_section (abfd, sec, link_info, again)
   return FALSE;
 }
 
-/* This function handles relaxation during the first pass.  */
+/* This function handles relaxation of a section in a specific page.  */
 
 static bfd_boolean
-ip2k_elf_relax_section_pass1 (abfd, sec, again, misc)
+ip2k_elf_relax_section_page (abfd, sec, again, misc, page_start, page_end)
      bfd *abfd;
      asection *sec;
      bfd_boolean *again;
-     struct misc * misc;
+     struct misc *misc;
+     unsigned long page_start;
+     unsigned long page_end;
 {
   Elf_Internal_Rela *irelend = misc->irelbase + sec->reloc_count;
   Elf_Internal_Rela *irel;
-
+  int switch_table_128;
+  int switch_table_256;
+  
   /* Walk thru the section looking for relaxation opertunities.  */
   for (irel = misc->irelbase; irel < irelend; irel++)
     {
-      if (ELF32_R_TYPE (irel->r_info) == (int) R_IP2K_PAGE3)
-      {
-	bfd_byte code0 = bfd_get_8 (abfd,
-				    misc->contents + irel->r_offset);
-	bfd_byte code1 = bfd_get_8 (abfd,
-				    misc->contents + irel->r_offset + 1);
-
-        /* Verify that this is the PAGE opcode.  */
-        if (IS_PAGE_OPCODE (code0, code1))
-	  {
-	    /* Note that we've changed the relocs, section contents, etc.  */
-	    elf_section_data (sec)->relocs = misc->irelbase;
-	    elf_section_data (sec)->this_hdr.contents = misc->contents;
-	    misc->symtab_hdr->contents = (bfd_byte *) misc->isymbuf;
-
-	    /* Handle switch dispatch tables/prologues.  */
-	    if (!  relax_switch_dispatch_tables_pass1 (abfd, sec,
-						       irel->r_offset, misc))
-	      return FALSE;
-
-	    /* Fix the relocation's type.  */
-	    irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
-				         R_IP2K_NONE);
-
-	    /* Delete the PAGE insn.  */
-	    if (! ip2k_elf_relax_delete_bytes (abfd, sec,
-					       irel->r_offset,
-					       sizeof (page_opcode)))
-	      return FALSE;
-
-	    /* That will change things, so, we should relax again.
-	       Note that this is not required, and it may be slow.  */
-	    *again = TRUE;
-	  }
-      }
-    }
+      if (ELF32_R_TYPE (irel->r_info) != (int) R_IP2K_PAGE3)
+	/* Ignore non page instructions.  */
+	continue;
 
-  return TRUE;
-}
+      if (BASEADDR (sec) + irel->r_offset < page_start)
+	/* Ignore page instructions on earlier page - they have
+	   already been processed. Remember that there is code flow
+	   that crosses a page boundary.  */
+	continue;
 
-/* This function handles relaxation for 2nd and subsequent passes.  */
+      if (BASEADDR (sec) + irel->r_offset > page_end)
+	/* Flow beyond end of page => nothing more to do for this page.  */
+	return TRUE;
 
-static bfd_boolean
-ip2k_elf_relax_section_passN (abfd, sec, again, final_pass, misc)
-     bfd *abfd;
-     asection *sec;
-     bfd_boolean *again;
-     bfd_boolean *final_pass;
-     struct misc * misc;
-{
-  Elf_Internal_Rela *irelend = misc->irelbase + sec->reloc_count;
-  Elf_Internal_Rela *irel;
-  bfd_boolean add_all;
+      /* Detect switch tables.  */
+      switch_table_128 = ip2k_is_switch_table_128 (abfd, sec, irel->r_offset, misc->contents);
+      switch_table_256 = ip2k_is_switch_table_256 (abfd, sec, irel->r_offset, misc->contents);
 
-  /* If we are on the final relaxation pass and the section crosses
-     then set a flag to indicate that *all* page instructions need
-     to be added back into this section.  */
-  if (*final_pass)
-    {
-      add_all = (PAGENO (BASEADDR (sec))
-	         != PAGENO (BASEADDR (sec) + sec->_cooked_size));
+      if ((switch_table_128 > 0) || (switch_table_256 > 0))
+	/* If the index is greater than 0 then it has already been processed.  */
+	continue;
 
-      /* If this section crosses a page boundary set the crossed
-	 page boundary flag.  */
-      if (add_all)
-	sec->userdata = sec;
-      else
+      if (switch_table_128 == 0)
 	{
-	  /* If the section had previously crossed a page boundary
-	     but on this pass does not then reset crossed page
-	     boundary flag and rerun the 1st relaxation pass on
-	     this section.  */
-	  if (sec->userdata)
-	    {
-	      sec->userdata = NULL;
-	      if (! ip2k_elf_relax_section_pass1 (abfd, sec, again, misc))
-		return FALSE;
-	    }
+	  if (!ip2k_relax_switch_table_128 (abfd, sec, irel, again, misc))
+	    return FALSE;
+
+	  continue;
 	}
-    }
-  else
-    add_all = FALSE;
 
-  /* Walk thru the section looking for call/jmp
-      instructions which need a page instruction.  */
-  for (irel = misc->irelbase; irel < irelend; irel++)
-    {
-      if (ELF32_R_TYPE (irel->r_info) == (int) R_IP2K_ADDR16CJP)
-      {
-        /* Get the value of the symbol referred to by the reloc.  */
-        bfd_vma symval = symbol_value (abfd, misc->symtab_hdr, misc->isymbuf,
-				       irel);
-	bfd_byte code0, code1;
-
-        if (symval == UNDEFINED_SYMBOL)
-	  {
-	    /* This appears to be a reference to an undefined
-	       symbol.  Just ignore it--it will be caught by the
-	       regular reloc processing.  */
-	    continue;
-	  }
-
-        /* For simplicity of coding, we are going to modify the section
-	   contents, the section relocs, and the BFD symbol table.  We
-	   must tell the rest of the code not to free up this
-	   information.  It would be possible to instead create a table
-	   of changes which have to be made, as is done in coff-mips.c;
-	   that would be more work, but would require less memory when
-	   the linker is run.  */
-
-	/* Get the opcode.  */
-	code0 = bfd_get_8 (abfd, misc->contents + irel->r_offset);
-	code1 = bfd_get_8 (abfd, misc->contents + irel->r_offset + 1);
-
-	if (IS_JMP_OPCODE (code0, code1) || IS_CALL_OPCODE (code0, code1))
-	  {
-	    if (*final_pass)
-	      {
-		if (! unrelax_switch_dispatch_tables_passN (abfd, sec,
-						            irel->r_offset,
-                                                            again, misc))
-		  return FALSE;
-
-                if (*again)
-		  add_all = FALSE;
-	      }
-
-	    code0 = bfd_get_8 (abfd, misc->contents + irel->r_offset - 2);
-	    code1 = bfd_get_8 (abfd, misc->contents + irel->r_offset - 1);
-
-	    if (! IS_PAGE_OPCODE (code0, code1))
-	      {
-		bfd_vma value = symval + irel->r_addend;
-		bfd_vma addr  = BASEADDR (sec) + irel->r_offset;
-
-		if (add_all || PAGENO (addr) != PAGENO (value))
-		  {
-		    if (! add_page_insn (abfd, sec, irel, misc))
-		      return FALSE;
-
-		    /* That will have changed things, so,  we must relax again.  */
-		    *again = TRUE;
-		  }
-	       }
-	   }
-        }
-    }
+      if (switch_table_256 == 0)
+	{
+	  if (!ip2k_relax_switch_table_256 (abfd, sec, irel, again, misc))
+	    return FALSE;
+
+	  continue;
+	}
 
-  /* If anything changed reset the final pass flag.  */
-  if (*again)
-    *final_pass = FALSE;
+      /* Simple relax.  */
+      if (ip2k_test_page_insn (abfd, sec, irel, misc))
+	{
+	  if (!ip2k_delete_page_insn (abfd, sec, irel, again, misc))
+	    return FALSE;
+
+	  continue;
+	}
+    }
 
   return TRUE;
 }
@@ -1186,6 +1089,7 @@ adjust_all_relocations (abfd, sec, addr, endaddr, count, noadj)
   struct elf_link_hash_entry **sym_hashes;
   struct elf_link_hash_entry **end_hashes;
   unsigned int symcount;
+  asection *stab;
 
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
   isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
@@ -1228,6 +1132,132 @@ adjust_all_relocations (abfd, sec, addr, endaddr, count, noadj)
         irel->r_offset += count;
     }
 
+  /* Now fix the stab relocations.  */
+  stab = bfd_get_section_by_name (abfd, ".stab");
+  if (stab)
+    {
+      bfd_byte *stabcontents, *stabend, *stabp;
+
+      irelbase = elf_section_data (stab)->relocs;
+      irelend = irelbase + stab->reloc_count;
+
+      /* Pull out the contents of the stab section.  */
+      if (elf_section_data (stab)->this_hdr.contents != NULL)
+	stabcontents = elf_section_data (stab)->this_hdr.contents;
+      else
+	{
+	  stabcontents = (bfd_byte *) bfd_alloc (abfd, stab->_raw_size);
+	  if (stabcontents == NULL)
+	    return;
+
+	  if (! bfd_get_section_contents (abfd, stab, stabcontents,
+					  (file_ptr) 0, stab->_raw_size))
+	    return;
+
+	  /* We need to remember this.  */
+	  elf_section_data (stab)->this_hdr.contents = stabcontents;
+	}
+
+      stabend = stabcontents + stab->_raw_size;
+
+      for (irel = irelbase; irel < irelend; irel++)
+	{
+	  if (ELF32_R_TYPE (irel->r_info) != R_IP2K_NONE)
+	    {
+	      /* Get the value of the symbol referred to by the reloc.  */
+	      if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
+		{
+		  asection *sym_sec;
+		  
+		  /* A local symbol.  */
+		  isym = isymbuf + ELF32_R_SYM (irel->r_info);
+		  sym_sec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+		  
+		  if (sym_sec == sec)
+		    {
+		      const char *name;
+		      unsigned long strx;
+		      unsigned char type, other;
+		      unsigned short desc;
+		      bfd_vma value;
+		      bfd_vma baseaddr = BASEADDR (sec);
+		      bfd_vma symval = BASEADDR (sym_sec) + isym->st_value
+			+ irel->r_addend;
+		      
+		      if ((baseaddr + addr) <= symval
+			  && symval <= (baseaddr + endaddr))
+			irel->r_addend += count;
+
+		      /* Go hunt up a function and fix its line info if needed.  */
+		      stabp = stabcontents + irel->r_offset - 8; 
+
+		      /* Go pullout the stab entry.  */
+		      strx  = bfd_h_get_32 (abfd, stabp + STRDXOFF);
+		      type  = bfd_h_get_8 (abfd, stabp + TYPEOFF);
+		      other = bfd_h_get_8 (abfd, stabp + OTHEROFF);
+		      desc  = bfd_h_get_16 (abfd, stabp + DESCOFF);
+		      value = bfd_h_get_32 (abfd, stabp + VALOFF);
+		      
+		      name = bfd_get_stab_name (type);
+		      
+		      if (strcmp (name, "FUN") == 0)
+			{
+			  int function_adjusted = 0;
+
+			  if (symval > (baseaddr + addr))
+			    /* Not in this function.  */
+			    continue;
+
+			  /* Hey we got a function hit.  */
+			  stabp += STABSIZE;
+			  for (;stabp < stabend; stabp += STABSIZE)
+			    {
+			      /* Go pullout the stab entry.  */
+			      strx  = bfd_h_get_32 (abfd, stabp + STRDXOFF);
+			      type  = bfd_h_get_8 (abfd, stabp + TYPEOFF);
+			      other = bfd_h_get_8 (abfd, stabp + OTHEROFF);
+			      desc  = bfd_h_get_16 (abfd, stabp + DESCOFF);
+			      value = bfd_h_get_32 (abfd, stabp + VALOFF);
+
+			      name = bfd_get_stab_name (type);
+
+			      if (strcmp (name, "FUN") == 0)
+				{
+				  /* Hit another function entry.  */
+				  if (function_adjusted)
+				    {
+				      /* Adjust the value.  */
+				      value += count;
+				  
+				      /* We need to put it back.  */
+				      bfd_h_put_32 (abfd, value,stabp + VALOFF);
+				    }
+
+				  /* And then bale out.  */
+				  break;
+				}
+
+			      if (strcmp (name, "SLINE") == 0)
+				{
+				  /* Got a line entry.  */
+				  if ((baseaddr + addr) <= (symval + value))
+				    {
+				      /* Adjust the line entry.  */
+				      value += count;
+
+				      /* We need to put it back.  */
+				      bfd_h_put_32 (abfd, value,stabp + VALOFF);
+				      function_adjusted = 1;
+				    }
+				}
+			    }
+			}
+		    }
+		}
+	    }
+	}
+    }
+
   /* When adding an instruction back it is sometimes necessary to move any
      global or local symbol that was referencing the first instruction of
      the moved block to refer to the first instruction of the inserted block.
@@ -1254,103 +1284,20 @@ adjust_all_relocations (abfd, sec, addr, endaddr, count, noadj)
   for (; sym_hashes < end_hashes; sym_hashes++)
     {
       struct elf_link_hash_entry *sym_hash = *sym_hashes;
+
       if ((sym_hash->root.type == bfd_link_hash_defined
 	   || sym_hash->root.type == bfd_link_hash_defweak)
 	  && sym_hash->root.u.def.section == sec)
 	{
           if (addr <= sym_hash->root.u.def.value
               && sym_hash->root.u.def.value < endaddr)
-            {
-	      sym_hash->root.u.def.value += count;
-            }
+	    sym_hash->root.u.def.value += count;
 	}
     }
 
   return;
 }
 
-static bfd_boolean
-add_page_insn (abfd, sec, irel, misc)
-      bfd *abfd;
-      asection *sec;
-      Elf_Internal_Rela *irel;
-      struct misc *misc;
-{
-  /* Note that we've changed the relocs, section contents, etc.  */
-  elf_section_data (sec)->relocs = misc->irelbase;
-  elf_section_data (sec)->this_hdr.contents = misc->contents;
-  misc->symtab_hdr->contents = (bfd_byte *) misc->isymbuf;
-
-  /* Add the PAGE insn.  */
-  if (! ip2k_elf_relax_add_bytes (abfd, sec, irel->r_offset,
-                                  page_opcode,
-                                  sizeof (page_opcode),
-				  sizeof (page_opcode)))
-    return FALSE;
-  else
-    {
-       Elf_Internal_Rela * jrel = irel - 1;
-
-       /* Add relocation for PAGE insn added.  */
-       if (ELF32_R_TYPE (jrel->r_info) != R_IP2K_NONE)
-	 {
-	   bfd_byte code0, code1;
-	   char *msg = NULL;
-
-	   /* Get the opcode.  */
-	   code0 = bfd_get_8 (abfd, misc->contents + irel->r_offset);
-	   code1 = bfd_get_8 (abfd, misc->contents + irel->r_offset + 1);
-
-	   if (IS_JMP_OPCODE (code0, code1))
-	     msg = "\tJMP instruction missing a preceeding PAGE instruction in %s\n\n";
-
-	   else if (IS_CALL_OPCODE (code0, code1))
-	     msg = "\tCALL instruction missing a preceeding PAGE instruction in %s\n\n";
-
-	   if (msg)
-	     {
-	       fprintf (stderr, "\n\t *** LINKER RELAXATION failure ***\n");
-	       fprintf (stderr, msg, sec->owner->filename);
-	     }
-
-	   return FALSE;
-	 }
-
-       jrel->r_addend = irel->r_addend;
-       jrel->r_offset = irel->r_offset - sizeof (page_opcode);
-       jrel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
-                                    R_IP2K_PAGE3);
-     }
-
-   return TRUE;
-}
-
-/* Insert bytes into a section while relaxing.  */
-
-static bfd_boolean
-ip2k_elf_relax_add_bytes (abfd, sec, addr, bytes, count, noadj)
-     bfd *abfd;
-     asection *sec;
-     bfd_vma addr;
-     const bfd_byte *bytes;
-     int count;
-     int noadj;
-{
-  bfd_byte *contents = elf_section_data (sec)->this_hdr.contents;
-  bfd_vma endaddr = sec->_cooked_size;
-
-  /* Make room to insert the bytes.  */
-  memmove (contents + addr + count, contents + addr, endaddr - addr);
-
-  /* Insert the bytes into the section.  */
-  memcpy  (contents + addr, bytes, count);
-
-  sec->_cooked_size += count;
-
-  adjust_all_relocations (abfd, sec, addr, endaddr, count, noadj);
-  return TRUE;
-}
-
 /* Delete some bytes from a section while relaxing.  */
 
 static bfd_boolean
@@ -1410,8 +1357,9 @@ ip2k_final_link_relocate (howto, input_bfd, input_section, contents, rel,
      Elf_Internal_Rela * rel;
      bfd_vma             relocation;
 {
-  bfd_reloc_status_type r = bfd_reloc_ok;
+  static bfd_vma page_addr = 0;
 
+  bfd_reloc_status_type r = bfd_reloc_ok;
   switch (howto->type)
     {
       /* Handle data space relocations.  */
@@ -1429,8 +1377,45 @@ ip2k_final_link_relocate (howto, input_bfd, input_section, contents, rel,
       break;
 
       /* Handle insn space relocations.  */
-    case R_IP2K_ADDR16CJP:
     case R_IP2K_PAGE3:
+      page_addr = BASEADDR (input_section) + rel->r_offset;
+      if ((relocation & IP2K_INSN_MASK) == IP2K_INSN_VALUE)
+	relocation &= ~IP2K_INSN_MASK;
+      else
+	r = bfd_reloc_notsupported;
+      break;
+
+    case R_IP2K_ADDR16CJP:
+      if (BASEADDR (input_section) + rel->r_offset != page_addr + 2)
+	{
+	  /* No preceeding page instruction, verify that it isn't needed.  */
+	  if (PAGENO (relocation + rel->r_addend) !=
+	      ip2k_nominal_page_bits (input_bfd, input_section,
+	      			      rel->r_offset, contents))
+	    _bfd_error_handler (_("ip2k linker: missing page instruction at 0x%08lx (dest = 0x%08lx)."),
+				BASEADDR (input_section) + rel->r_offset,
+				relocation + rel->r_addend);
+        }
+      else if (ip2k_relaxed)
+        {
+          /* Preceeding page instruction. Verify that the page instruction is
+             really needed. One reason for the relaxation to miss a page is if
+             the section is not marked as executable.  */
+	  if (!ip2k_is_switch_table_128 (input_bfd, input_section, rel->r_offset - 2, contents) &&
+	      !ip2k_is_switch_table_256 (input_bfd, input_section, rel->r_offset - 2, contents) &&
+	      (PAGENO (relocation + rel->r_addend) ==
+	       ip2k_nominal_page_bits (input_bfd, input_section,
+	      			      rel->r_offset - 2, contents)))
+	    _bfd_error_handler (_("ip2k linker: redundant page instruction at 0x%08lx (dest = 0x%08lx)."),
+				page_addr,
+				relocation + rel->r_addend);
+        }
+      if ((relocation & IP2K_INSN_MASK) == IP2K_INSN_VALUE)
+	relocation &= ~IP2K_INSN_MASK;
+      else
+	r = bfd_reloc_notsupported;
+      break;
+
     case R_IP2K_LO8INSN:
     case R_IP2K_HI8INSN:
     case R_IP2K_PC_SKIP:
@@ -1561,10 +1546,10 @@ ip2k_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 	      sec = h->root.u.def.section;
 	      relocation = h->root.u.def.value + BASEADDR (sec);
 	    }
+
 	  else if (h->root.type == bfd_link_hash_undefweak)
-	    {
-	      relocation = 0;
-	    }
+	    relocation = 0;
+
 	  else
 	    {
 	      if (! ((*info->callbacks->undefined_symbol)
@@ -1668,9 +1653,7 @@ ip2k_elf_gc_mark_hook (sec, info, rel, h, sym)
 	     && ELF_ST_BIND (sym->st_info) != STB_LOCAL)
 	   && ! ((sym->st_shndx <= 0 || sym->st_shndx >= SHN_LORESERVE)
 		 && sym->st_shndx != SHN_COMMON))
-          {
-            return bfd_section_from_elf_index (sec->owner, sym->st_shndx);
-          }
+	 return bfd_section_from_elf_index (sec->owner, sym->st_shndx);
       }
   return NULL;
 }
@@ -1682,21 +1665,17 @@ ip2k_elf_gc_sweep_hook (abfd, info, sec, relocs)
      asection *sec ATTRIBUTE_UNUSED;
      const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED;
 {
-  /* we don't use got and plt entries for ip2k */
+  /* We don't use got and plt entries for ip2k.  */
   return TRUE;
 }
 
-
-/* -------------------------------------------------------------------- */
-
-
 #define TARGET_BIG_SYM	 bfd_elf32_ip2k_vec
 #define TARGET_BIG_NAME  "elf32-ip2k"
 
 #define ELF_ARCH	 bfd_arch_ip2k
 #define ELF_MACHINE_CODE EM_IP2K
 #define ELF_MACHINE_ALT1 EM_IP2K_OLD
-#define ELF_MAXPAGESIZE  1 /* No pages on the IP2K */
+#define ELF_MAXPAGESIZE  1 /* No pages on the IP2K.  */
 
 #define elf_info_to_howto_rel			NULL
 #define elf_info_to_howto			ip2k_info_to_howto_rela
@@ -1705,12 +1684,10 @@ ip2k_elf_gc_sweep_hook (abfd, info, sec, relocs)
 #define elf_backend_rela_normal			1
 #define elf_backend_gc_mark_hook                ip2k_elf_gc_mark_hook
 #define elf_backend_gc_sweep_hook               ip2k_elf_gc_sweep_hook
-
 #define elf_backend_relocate_section		ip2k_elf_relocate_section
 
 #define elf_symbol_leading_char			'_'
 #define bfd_elf32_bfd_reloc_type_lookup		ip2k_reloc_type_lookup
 #define bfd_elf32_bfd_relax_section		ip2k_elf_relax_section
 
-
 #include "elf32-target.h"