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.

13 files changed, 268 insertions, 0 deletions

diff --git a/ld/testsuite/ld-tic6x/discard-unwind.ld b/ld/testsuite/ld-tic6x/discard-unwind.ld
new file mode 100644
index 0000000000..00582c1e7b
--- /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 0000000000..11a24d4a0b
--- /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 0000000000..5783a40161
--- /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 0000000000..11a24d4a0b
--- /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 0000000000..dbfd3bdeb1
--- /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 0000000000..9ec69a0aaa
--- /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 0000000000..480ee49d26
--- /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 0000000000..e5c628ef5f
--- /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 0000000000..83f3d0d78d
--- /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 0000000000..492887415c
--- /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 0000000000..b4fc213364
--- /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 0000000000..5de8ee6d56
--- /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 0000000000..a4f87229f4
--- /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) }
+}