2011-05-09 Paul Brook <paul@codesourcery.com>

	bfd/
	* bfd-in.h (elf32_tic6x_fix_exidx_coverage): Add prototype.
	* bfd-in2.h: Regenerate.
	* elf32-tic6x.c: Include limits.h.
	(tic6x_unwind_edit_type, tic6x_unwind_table_edit,
	_tic6x_elf_section_data): New.
	(elf32_tic6x_section_data): Define.
	(elf32_tic6x_new_section_hook): Allocate target specific data.
	(elf32_tic6x_add_unwind_table_edit): New function.
	(get_tic6x_elf_section_data, elf32_tic6x_adjust_exidx_size,
	elf32_tic6x_insert_cantunwind_after, elf32_tic6x_add_low31,
	elf32_tic6x_copy_exidx_entry): New functions.
	(elf_backend_write_section): Define.

	ld/
	* emultempl/tic6xdsbt.em (merge_exidx_entries): New.
	(compare_output_sec_vma): New function.
	(gld${EMULATION_NAME}_after_allocation): New function.
	(OPTION_NO_MERGE_EXIDX_ENTRIES): Define.
	(PARSE_AND_LIST_OPTIONS): Add --no-merge-exidx-entries.
	(PARSE_AND_LIST_ARGS_CASES): Add OPTION_NO_MERGE_EXIDX_ENTRIES.
	(LDEMUL_AFTER_ALLOCATION): Set.
	* ld.texinfo: Document c6x --no-merge-exidx-entries.

	ld/testsuite/
	* ld-tic6x/discard-unwind.ld: New.
	* ld-tic6x/unwind.ld: New.
	* ld-tic6x/unwind-1.d: New test.
	* ld-tic6x/unwind-1.s: New test.
	* ld-tic6x/unwind-2.d: New test.
	* ld-tic6x/unwind-2.s: New test.
	* ld-tic6x/unwind-3.d: New test.
	* ld-tic6x/unwind-3.s: New test.
	* ld-tic6x/unwind-4.d: New test.
	* ld-tic6x/unwind-4.s: New test.
	* ld-tic6x/unwind-5.d: New test.
	* ld-tic6x/unwind-5.s: New test.
	* ld-tic6x/unwind-6.d: New test.

17 files changed, 393 insertions, 0 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index b2fe365..e7e526b 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,14 @@
+2011-05-09  Paul Brook  <paul@codesourcery.com>
+
+	* emultempl/tic6xdsbt.em (merge_exidx_entries): New.
+	(compare_output_sec_vma): New function.
+	(gld${EMULATION_NAME}_after_allocation): New function.
+	(OPTION_NO_MERGE_EXIDX_ENTRIES): Define.
+	(PARSE_AND_LIST_OPTIONS): Add --no-merge-exidx-entries.
+	(PARSE_AND_LIST_ARGS_CASES): Add OPTION_NO_MERGE_EXIDX_ENTRIES.
+	(LDEMUL_AFTER_ALLOCATION): Set.
+	* ld.texinfo: Document c6x --no-merge-exidx-entries.
+
 2011-05-07  Dave Korn  <dave.korn.cygwin@gmail.com>
 
 	PR ld/12365
diff --git a/ld/emultempl/tic6xdsbt.em b/ld/emultempl/tic6xdsbt.em
index 875148e..d0e345d 100644
--- a/ld/emultempl/tic6xdsbt.em
+++ b/ld/emultempl/tic6xdsbt.em
@@ -31,6 +31,8 @@ static struct elf32_tic6x_params params =
   0, 64
 };
 
+static int merge_exidx_entries = -1;
+
 static int
 is_tic6x_target (void)
 {
@@ -58,6 +60,92 @@ tic6x_after_open (void)
 
   gld${EMULATION_NAME}_after_open ();
 }
+
+static int
+compare_output_sec_vma (const void *a, const void *b)
+{
+  asection *asec = *(asection **) a, *bsec = *(asection **) b;
+  asection *aout = asec->output_section, *bout = bsec->output_section;
+  bfd_vma avma, bvma;
+  
+  /* If there's no output section for some reason, compare equal.  */
+  if (!aout || !bout)
+    return 0;
+  
+  avma = aout->vma + asec->output_offset;
+  bvma = bout->vma + bsec->output_offset;
+  
+  if (avma > bvma)
+    return 1;
+  else if (avma < bvma)
+    return -1;
+  
+  return 0;
+}
+
+static void
+gld${EMULATION_NAME}_after_allocation (void)
+{
+  int layout_changed = 0;
+
+  if (!link_info.relocatable)
+    {
+      /* Build a sorted list of input text sections, then use that to process
+	 the unwind table index.  */
+      unsigned int list_size = 10;
+      asection **sec_list = (asection **)
+          xmalloc (list_size * sizeof (asection *));
+      unsigned int sec_count = 0;
+
+      LANG_FOR_EACH_INPUT_STATEMENT (is)
+	{
+	  bfd *abfd = is->the_bfd;
+	  asection *sec;
+	  
+	  if ((abfd->flags & (EXEC_P | DYNAMIC)) != 0)
+	    continue;
+	  
+	  for (sec = abfd->sections; sec != NULL; sec = sec->next)
+	    {
+	      asection *out_sec = sec->output_section;
+
+	      if (out_sec
+		  && elf_section_data (sec)
+		  && elf_section_type (sec) == SHT_PROGBITS
+		  && (elf_section_flags (sec) & SHF_EXECINSTR) != 0
+		  && (sec->flags & SEC_EXCLUDE) == 0
+		  && sec->sec_info_type != ELF_INFO_TYPE_JUST_SYMS
+		  && out_sec != bfd_abs_section_ptr)
+		{
+		  if (sec_count == list_size)
+		    {
+		      list_size *= 2;
+		      sec_list = (asection **) 
+                          xrealloc (sec_list, list_size * sizeof (asection *));
+		    }
+
+		  sec_list[sec_count++] = sec;
+		}
+	    }
+	}
+	
+      qsort (sec_list, sec_count, sizeof (asection *), &compare_output_sec_vma);
+      
+      if (elf32_tic6x_fix_exidx_coverage (sec_list, sec_count, &link_info,
+					   merge_exidx_entries))
+	layout_changed = 1;
+      
+      free (sec_list);
+    }
+
+  /* bfd_elf32_discard_info just plays with debugging sections,
+     ie. doesn't affect any code, so we can delay resizing the
+     sections.  */
+  if (bfd_elf_discard_info (link_info.output_bfd, & link_info))
+    layout_changed = 1;
+
+  gld${EMULATION_NAME}_map_segments (layout_changed);
+}
 EOF
 
 # This code gets inserted into the generic elf32.sc linker script
@@ -65,11 +153,13 @@ EOF
 PARSE_AND_LIST_PROLOGUE='
 #define OPTION_DSBT_INDEX		300
 #define OPTION_DSBT_SIZE		301
+#define OPTION_NO_MERGE_EXIDX_ENTRIES   302
 '
 
 PARSE_AND_LIST_LONGOPTS='
   {"dsbt-index", required_argument, NULL, OPTION_DSBT_INDEX},
   {"dsbt-size", required_argument, NULL, OPTION_DSBT_SIZE},
+  { "no-merge-exidx-entries", no_argument, NULL, OPTION_NO_MERGE_EXIDX_ENTRIES },
 '
 
 PARSE_AND_LIST_OPTIONS='
@@ -77,6 +167,7 @@ PARSE_AND_LIST_OPTIONS='
   fprintf (file, _("\t\t\tUse this as the DSBT index for the output object\n"));
   fprintf (file, _("  --dsbt-size <index>\n"));
   fprintf (file, _("\t\t\tUse this as the number of entries in the DSBT table\n"));
+  fprintf (file, _("  --no-merge-exidx-entries    Disable merging exidx entries\n"));
 '
 
 PARSE_AND_LIST_ARGS_CASES='
@@ -100,6 +191,9 @@ PARSE_AND_LIST_ARGS_CASES='
 	einfo (_("%P%F: invalid --dsbt-size %s\n"), optarg);
       }
       break;
+   case OPTION_NO_MERGE_EXIDX_ENTRIES:
+      merge_exidx_entries = 0;
 '
 
 LDEMUL_AFTER_OPEN=tic6x_after_open
+LDEMUL_AFTER_ALLOCATION=gld${EMULATION_NAME}_after_allocation
diff --git a/ld/ld.texinfo b/ld/ld.texinfo
index 800f0d4..0b58396 100644
--- a/ld/ld.texinfo
+++ b/ld/ld.texinfo
@@ -2637,6 +2637,10 @@ to @var{index}.  The default is 0, which is appropriate for generating
 executables.  If a shared library is generated with a DSBT index of 0, the
 @code{R_C6000_DSBT_INDEX} relocs are copied into the output file.
 
+@kindex --no-merge-exidx-entries
+The @samp{--no-merge-exidx-entries} switch disables the merging of adjacent
+exidx entries in frame unwind info.
+
 @end table
 
 @c man end
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 02581cc..6ef5919 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,19 @@
+2011-05-09  Paul Brook  <paul@codesourcery.com>
+
+	* ld-tic6x/discard-unwind.ld: New.
+	* ld-tic6x/unwind.ld: New.
+	* ld-tic6x/unwind-1.d: New test.
+	* ld-tic6x/unwind-1.s: New test.
+	* ld-tic6x/unwind-2.d: New test.
+	* ld-tic6x/unwind-2.s: New test.
+	* ld-tic6x/unwind-3.d: New test.
+	* ld-tic6x/unwind-3.s: New test.
+	* ld-tic6x/unwind-4.d: New test.
+	* ld-tic6x/unwind-4.s: New test.
+	* ld-tic6x/unwind-5.d: New test.
+	* ld-tic6x/unwind-5.s: New test.
+	* ld-tic6x/unwind-6.d: New test.
+
 2011-05-07  Dave Korn  <dave.korn.cygwin@gmail.com>
 
 	PR ld/12365
diff --git a/ld/testsuite/ld-tic6x/discard-unwind.ld b/ld/testsuite/ld-tic6x/discard-unwind.ld
new file mode 100644
index 0000000..00582c1
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/discard-unwind.ld
@@ -0,0 +1,15 @@
+/* Script for unwinding ld tests */
+SECTIONS
+{
+  /* Read-only sections, merged into text segment: */
+  . = 0x8000;
+  .text           :
+  {
+    *(.before)
+    *(.text)
+    *(.after)
+    *(.c6xabi.extab*)
+  } =0
+  /DISCARD/ : { *(.c6xabi.exidx*) }
+  .c6xabi.attribues 0 : { *(.c6xabi.atttributes) }
+}
diff --git a/ld/testsuite/ld-tic6x/unwind-1.d b/ld/testsuite/ld-tic6x/unwind-1.d
new file mode 100644
index 0000000..11a24d4
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/unwind-1.d
@@ -0,0 +1,10 @@
+#ld: -T unwind.ld
+#objdump: -s
+
+.*:     file format.*
+
+#...
+Contents of section .c6xabi.exidx:
+ 9000 (00f8ff7f 07020083 1cf8ff7f 01000000|7ffff800 83000207 7ffff81c 00000001)  .*
+Contents of section .far:
+#...
diff --git a/ld/testsuite/ld-tic6x/unwind-1.s b/ld/testsuite/ld-tic6x/unwind-1.s
new file mode 100644
index 0000000..5783a40
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/unwind-1.s
@@ -0,0 +1,25 @@
+	.cfi_sections .c6xabi.exidx
+	.text
+	.global _start
+	.type _start, %function
+_start:
+	.cfi_startproc
+	.cfi_offset B3, 0
+	.cfi_def_cfa_offset 8
+	nop
+	.p2align 6
+	.cfi_endproc
+	.personalityindex 3
+	.endp
+
+	# Section with no unwinding information.
+	# Linker should insert a cantunwind entry.
+	.section .after, "xa"
+	.global __c6xabi_unwind_cpp_pr3
+	.type __c6xabi_unwind_cpp_pr3, %function
+__c6xabi_unwind_cpp_pr3:
+	nop
+	.p2align 6
+
+	.section .far
+	.word 0
diff --git a/ld/testsuite/ld-tic6x/unwind-2.d b/ld/testsuite/ld-tic6x/unwind-2.d
new file mode 100644
index 0000000..11a24d4
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/unwind-2.d
@@ -0,0 +1,10 @@
+#ld: -T unwind.ld
+#objdump: -s
+
+.*:     file format.*
+
+#...
+Contents of section .c6xabi.exidx:
+ 9000 (00f8ff7f 07020083 1cf8ff7f 01000000|7ffff800 83000207 7ffff81c 00000001)  .*
+Contents of section .far:
+#...
diff --git a/ld/testsuite/ld-tic6x/unwind-2.s b/ld/testsuite/ld-tic6x/unwind-2.s
new file mode 100644
index 0000000..dbfd3bd
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/unwind-2.s
@@ -0,0 +1,23 @@
+	.cfi_sections .c6xabi.exidx
+	.text
+
+	.global __c6xabi_unwind_cpp_pr3
+	.type __c6xabi_unwind_cpp_pr3, %function
+__c6xabi_unwind_cpp_pr3:
+	.global _start
+	.type _start, %function
+_start:
+	.cfi_startproc
+	.cfi_offset B3, 0
+	.cfi_def_cfa_offset 8
+	nop
+	.p2align 6
+	.cfi_endproc
+	.personalityindex 3
+	.endp
+
+	# last text section has unwind information. Linker should append a
+	# terminating cantunwind entry.
+
+	.section .far
+	.word 0
diff --git a/ld/testsuite/ld-tic6x/unwind-3.d b/ld/testsuite/ld-tic6x/unwind-3.d
new file mode 100644
index 0000000..9ec69a0
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/unwind-3.d
@@ -0,0 +1,11 @@
+#ld: -T unwind.ld
+#objdump: -s
+
+.*:     file format.*
+
+#...
+Contents of section .c6xabi.exidx:
+ 9000 (00f8ff7f 07020083 1cf8ff7f 01000000|7ffff800 83000207 7ffff81c 00000001)  .*
+ 9010 (38f8ff7f 07040083 54f8ff7f 01000000|7ffff838 82000407 7ffff854 00000001)  .*
+Contents of section .far:
+#...
diff --git a/ld/testsuite/ld-tic6x/unwind-3.s b/ld/testsuite/ld-tic6x/unwind-3.s
new file mode 100644
index 0000000..480ee49
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/unwind-3.s
@@ -0,0 +1,39 @@
+	.cfi_sections .c6xabi.exidx
+	.text
+	# section without unwind info
+	.global _start
+	.type _start, %function
+_start:
+	b .s2 _before
+	nop 5
+	.p2align 6
+
+	# Section that will be placed first
+	.section .before, "xa"
+	.type _before, %function
+_before:
+	.cfi_startproc
+	.cfi_offset B3, 0
+	.cfi_def_cfa_offset 8
+	nop
+	.p2align 6
+	.cfi_endproc
+	.personalityindex 3
+	.endp
+
+	# section that will be placed last
+	.section .after, "xa"
+	.global __c6xabi_unwind_cpp_pr3
+	.type __c6xabi_unwind_cpp_pr3, %function
+__c6xabi_unwind_cpp_pr3:
+	.cfi_startproc
+	.cfi_offset B10, 0
+	.cfi_def_cfa_offset 8
+	nop
+	.p2align 6
+	.cfi_endproc
+	.personalityindex 3
+	.endp
+
+	.section .far
+	.word 0
diff --git a/ld/testsuite/ld-tic6x/unwind-4.d b/ld/testsuite/ld-tic6x/unwind-4.d
new file mode 100644
index 0000000..e5c628e
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/unwind-4.d
@@ -0,0 +1,11 @@
+#ld: -T unwind.ld
+#objdump: -s
+
+.*:     file format.*
+
+#...
+Contents of section .c6xabi.exidx:
+ 9000 (00f8ff7f 07020083 1cf8ff7f 7af8ff7f|7ffff800 83000207 7ffff81c 7ffff87a)  .*
+ 9010 (38f8ff7f 07020083 56f8ff7f 01000000|7ffff838 83000207 7ffff856 00000001)  .*
+Contents of section .far:
+#...
diff --git a/ld/testsuite/ld-tic6x/unwind-4.s b/ld/testsuite/ld-tic6x/unwind-4.s
new file mode 100644
index 0000000..83f3d0d
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/unwind-4.s
@@ -0,0 +1,68 @@
+	.cfi_sections .c6xabi.exidx
+	.text
+	# out of line table entry
+	.global _start
+	.type _start, %function
+_start:
+	.cfi_startproc
+	.cfi_offset B3, 0
+	.cfi_def_cfa_offset 8
+	nop
+	.p2align 6
+	.cfi_endproc
+	.personalityindex 3
+	.handlerdata
+	.word 0
+	.endp
+
+	# entry that can be merged
+	.cfi_startproc
+	.cfi_offset B3, 0
+	.cfi_def_cfa_offset 8
+	nop
+	.p2align 6
+	.cfi_endproc
+	.personalityindex 3
+	.endp
+
+	# Section that will be placed first
+	.section .before, "xa"
+	.type _before, %function
+_before:
+	.cfi_startproc
+	.cfi_offset B3, 0
+	.cfi_def_cfa_offset 8
+	nop
+	.p2align 6
+	.cfi_endproc
+	.personalityindex 3
+	.endp
+
+	# section that will be placed last
+	.section .after, "xa"
+	.global __c6xabi_unwind_cpp_pr3
+	.type __c6xabi_unwind_cpp_pr3, %function
+__c6xabi_unwind_cpp_pr3:
+	# entry that can be merged
+	.cfi_startproc
+	.cfi_offset B3, 0
+	.cfi_def_cfa_offset 8
+	nop
+	.cfi_endproc
+	.personalityindex 3
+	.endp
+
+	# final function is cantunwind, so output table size is smaller
+	# than sum of input sections
+	.global foo
+	.type foo, %function
+foo:
+	.cfi_startproc
+	nop
+	.p2align 6
+	.cfi_endproc
+	.cantunwind
+	.endp
+
+	.section .far
+	.word 0
diff --git a/ld/testsuite/ld-tic6x/unwind-5.d b/ld/testsuite/ld-tic6x/unwind-5.d
new file mode 100644
index 0000000..4928874
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/unwind-5.d
@@ -0,0 +1,7 @@
+#ld: -T discard-unwind.ld
+#objdump: -s
+
+.*:     file format.*
+
+# Check we don't crash when discarding unwind info.
+#...
diff --git a/ld/testsuite/ld-tic6x/unwind-5.s b/ld/testsuite/ld-tic6x/unwind-5.s
new file mode 100644
index 0000000..b4fc213
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/unwind-5.s
@@ -0,0 +1,16 @@
+	.cfi_sections .c6xabi.exidx
+	.text
+	.global __c6xabi_unwind_cpp_pr3
+	.type __c6xabi_unwind_cpp_pr3, %function
+__c6xabi_unwind_cpp_pr3:
+	.global _start
+	.type _start, %function
+_start:
+	.cfi_startproc
+	.cfi_offset B3, 0
+	.cfi_def_cfa_offset 8
+	nop
+	.p2align 6
+	.cfi_endproc
+	.personalityindex 3
+	.endp
diff --git a/ld/testsuite/ld-tic6x/unwind-6.d b/ld/testsuite/ld-tic6x/unwind-6.d
new file mode 100644
index 0000000..5de8ee6
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/unwind-6.d
@@ -0,0 +1,13 @@
+#ld: -T unwind.ld
+#source unwind-4.s
+#as: -mgenerate-rel
+#objdump: -s
+
+.*:     file format.*
+
+#...
+Contents of section .c6xabi.exidx:
+ 9000 (00f8ff7f 07020083 1cf8ff7f 7af8ff7f|7ffff800 83000207 7ffff81c 7ffff87a)  .*
+ 9010 (38f8ff7f 07020083 56f8ff7f 01000000|7ffff838 83000207 7ffff856 00000001)  .*
+Contents of section .far:
+#...
diff --git a/ld/testsuite/ld-tic6x/unwind.ld b/ld/testsuite/ld-tic6x/unwind.ld
new file mode 100644
index 0000000..a4f8722
--- /dev/null
+++ b/ld/testsuite/ld-tic6x/unwind.ld
@@ -0,0 +1,20 @@
+/* Script for unwinding ld tests */
+SECTIONS
+{
+  /* Read-only sections, merged into text segment: */
+  . = 0x8000;
+  .text           :
+  {
+    *(.before)
+    *(.text)
+    *(.after)
+    *(.c6xabi.extab*)
+  } =0
+  . = 0x9000;
+  .c6xabi.exidx : { *(.c6xabi.exidx*) }
+  . = 0xa000;
+  .got            : { *(.got) *(.got.plt)}
+  . = 0x12340000;
+  .far : { *(.far) }
+  .c6xabi.attribues 0 : { *(.c6xabi.atttributes) }
+}