OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bfd/

Browse Source 
* elf32-tic6x.c (elf32_tic6x_final_link): New function.
	(elf32_tic6x_merge_attributes): Do not warn for PID or PIC
	mismatch.  Choose the lower of the two values.
	(bfd_elf32_bfd_final_link): New macro.

ld/testsuite/
	* ld-tic6x/shared-nopic.d: New test.
	* ld-tic6x/shared-nopid.d: New test.
	* ld-tic6x/attr-pid-21.d: Don't expect a warning; check readelf
	output instead.
	* ld-tic6x/attr-pid-12.d: Likewise.
	* ld-tic6x/attr-pic-01.d: Likewise.
	* ld-tic6x/attr-pic-10.d: Likewise.
	* ld-tic6x/attr-pid-01.d: Likewise.
	* ld-tic6x/attr-pid-10.d: Likewise.
	* ld-tic6x/attr-pid-02.d: Likewise.
	* ld-tic6x/attr-pid-20.d: Likewise.
	* ld-tic6x/got-reloc-inrange.d: Pass -mpic and -mpid options to gas.
This commit is contained in:
Bernd Schmidt 2011-05-05 16:05:19 +00:00
parent a3fcb948d3
commit c6a8f6e0ed
14 changed files with 109 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bfd/ChangeLog
View File

@ -1,3 +1,10 @@
2011-05-05 Bernd Schmidt <bernds@codesourcery.com>
* elf32-tic6x.c (elf32_tic6x_final_link): New function.
(elf32_tic6x_merge_attributes): Do not warn for PID or PIC
mismatch. Choose the lower of the two values.
(bfd_elf32_bfd_final_link): New macro.
2011-04-28 Tristan Gingold <gingold@adacore.com>
* coff-rs6000.c (_bfd_xcoff_swap_aux_in): Adjust for x_file.

47
bfd/elf32-tic6x.c
View File

@ -1519,6 +1519,31 @@ elf32_tic6x_link_hash_table_create (bfd *abfd)
return &ret->elf.root;
}
static bfd_boolean
elf32_tic6x_final_link (bfd *abfd, struct bfd_link_info *info)
{
if (info->shared)
{
obj_attribute *out_attr;
out_attr = elf_known_obj_attributes_proc (abfd);
if (out_attr[Tag_ABI_PIC].i == 0)
{
_bfd_error_handler (_("warning: generating a shared library "
"containing non-PIC code"));
}
if (out_attr[Tag_ABI_PID].i == 0)
{
_bfd_error_handler (_("warning: generating a shared library "
"containing non-PID code"));
}
}
/* Invoke the regular ELF backend linker to do all the work. */
if (!bfd_elf_final_link (abfd, info))
return FALSE;
return TRUE;
}
/* Destroy a C6X ELF linker hash table. */
static void
@ -3764,24 +3789,10 @@ elf32_tic6x_merge_attributes (bfd *ibfd, bfd *obfd)
}
break;
case Tag_ABI_PID:
if (out_attr[i].i != in_attr[i].i)
{
_bfd_error_handler
(_("warning: %B and %B differ in position-dependence of "
"data addressing"),
obfd, ibfd);
}
break;
case Tag_ABI_PIC:
if (out_attr[i].i != in_attr[i].i)
{
_bfd_error_handler
(_("warning: %B and %B differ in position-dependence of "
"code addressing"),
obfd, ibfd);
}
case Tag_ABI_PID:
if (out_attr[i].i > in_attr[i].i)
out_attr[i].i = in_attr[i].i;
break;
case Tag_ABI_array_object_alignment:
@ -3944,6 +3955,8 @@ elf32_tic6x_copy_private_data (bfd * ibfd, bfd * obfd)
elf32_tic6x_size_dynamic_sections
#define elf_backend_finish_dynamic_sections \
elf32_tic6x_finish_dynamic_sections
#define bfd_elf32_bfd_final_link \
elf32_tic6x_final_link
#define elf_info_to_howto elf32_tic6x_info_to_howto
#define elf_info_to_howto_rel elf32_tic6x_info_to_howto_rel

15
ld/testsuite/ChangeLog
View File

@ -1,3 +1,18 @@
2011-05-05 Bernd Schmidt <bernds@codesourcery.com>
* ld-tic6x/shared-nopic.d: New test.
* ld-tic6x/shared-nopid.d: New test.
* ld-tic6x/attr-pid-21.d: Don't expect a warning; check readelf
output instead.
* ld-tic6x/attr-pid-12.d: Likewise.
* ld-tic6x/attr-pic-01.d: Likewise.
* ld-tic6x/attr-pic-10.d: Likewise.
* ld-tic6x/attr-pid-01.d: Likewise.
* ld-tic6x/attr-pid-10.d: Likewise.
* ld-tic6x/attr-pid-02.d: Likewise.
* ld-tic6x/attr-pid-20.d: Likewise.
* ld-tic6x/got-reloc-inrange.d: Pass -mpic and -mpid options to gas.
2011-05-03 Paul Brook <paul@codesourcery.com>

6
ld/testsuite/ld-tic6x/attr-pic-01.d
View File

@ -3,4 +3,8 @@
#ld: -r -melf32_tic6x_le
#source: attr-pic-0.s
#source: attr-pic-1.s
#warning: .*differ in position-dependence of code addressing
#readelf: -A
Attribute Section: c6xabi
File Attributes
Tag_ISA: C674x

6
ld/testsuite/ld-tic6x/attr-pic-10.d
View File

@ -3,4 +3,8 @@
#ld: -r -melf32_tic6x_le
#source: attr-pic-1.s
#source: attr-pic-0.s
#warning: .*differ in position-dependence of code addressing
#readelf: -A
Attribute Section: c6xabi
File Attributes
Tag_ISA: C674x

7
ld/testsuite/ld-tic6x/attr-pid-01.d
View File

@ -3,4 +3,9 @@
#ld: -r -melf32_tic6x_le
#source: attr-pid-0.s
#source: attr-pid-1.s
#warning: .*differ in position-dependence of data addressing
#readelf: -A
Attribute Section: c6xabi
File Attributes
Tag_ISA: C674x

7
ld/testsuite/ld-tic6x/attr-pid-02.d
View File

@ -3,4 +3,9 @@
#ld: -r -melf32_tic6x_le
#source: attr-pid-0.s
#source: attr-pid-2.s
#warning: .*differ in position-dependence of data addressing
#readelf: -A
Attribute Section: c6xabi
File Attributes
Tag_ISA: C674x

7
ld/testsuite/ld-tic6x/attr-pid-10.d
View File

@ -3,4 +3,9 @@
#ld: -r -melf32_tic6x_le
#source: attr-pid-1.s
#source: attr-pid-0.s
#warning: .*differ in position-dependence of data addressing
#readelf: -A
Attribute Section: c6xabi
File Attributes
Tag_ISA: C674x

8
ld/testsuite/ld-tic6x/attr-pid-12.d
View File

@ -3,4 +3,10 @@
#ld: -r -melf32_tic6x_le
#source: attr-pid-1.s
#source: attr-pid-2.s
#warning: .*differ in position-dependence of data addressing
#readelf: -A
Attribute Section: c6xabi
File Attributes
Tag_ISA: C674x
Tag_ABI_PID: Data addressing position-independent, GOT near DP

6
ld/testsuite/ld-tic6x/attr-pid-20.d
View File

@ -3,4 +3,8 @@
#ld: -r -melf32_tic6x_le
#source: attr-pid-2.s
#source: attr-pid-0.s
#warning: .*differ in position-dependence of data addressing
#readelf: -A
Attribute Section: c6xabi
File Attributes
Tag_ISA: C674x

7
ld/testsuite/ld-tic6x/attr-pid-21.d
View File

@ -3,4 +3,9 @@
#ld: -r -melf32_tic6x_le
#source: attr-pid-2.s
#source: attr-pid-1.s
#warning: .*differ in position-dependence of data addressing
#readelf: -A
Attribute Section: c6xabi
File Attributes
Tag_ISA: C674x
Tag_ABI_PID: Data addressing position-independent, GOT near DP

2
ld/testsuite/ld-tic6x/got-reloc-inrange.d
View File

@ -1,5 +1,5 @@
#name: C6X GOT relocations, no overflow
#as: -mlittle-endian -mdsbt
#as: -mlittle-endian -mdsbt -mpic -mpid=near
#ld: -melf32_tic6x_le -Tdsbt-inrange.ld --dsbt-index 4 -shared
#source: got-reloc-global.s
#objdump: -dr

5
ld/testsuite/ld-tic6x/shared-nopic.d Normal file
View File

@ -0,0 +1,5 @@
#name: C6X shared library without PIC code
#as: -mlittle-endian -mdsbt -mpid=near
#ld: -melf32_tic6x_le -Tdsbt-inrange.ld --dsbt-index 4 -shared
#source: got-reloc-global.s
#warning: non-PIC code

5
ld/testsuite/ld-tic6x/shared-nopid.d Normal file
View File

@ -0,0 +1,5 @@
#name: C6X shared library without PIC code
#as: -mlittle-endian -mdsbt -mpic
#ld: -melf32_tic6x_le -Tdsbt-inrange.ld --dsbt-index 4 -shared
#source: got-reloc-global.s
#warning: non-PID code