espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-29 16:38:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

bfd/

Browse Source 
* elfxx-mips.c (mips_elf_merge_obj_attributes): Correct messages
	for the -mdouble-float and -msingle-float cases throughout; make
	all the messages report the output file consistently on the
	left-hand side.

	ld/testsuite/
	* ld-mips-elf/attr-gnu-4-12.d: Adjust the warning expected
	according to changes to BFD.
	* ld-mips-elf/attr-gnu-4-14.d: Likewise.
	* ld-mips-elf/attr-gnu-4-31.d: Likewise.
	* ld-mips-elf/attr-gnu-4-32.d: Likewise.
	* ld-mips-elf/attr-gnu-4-34.d: Likewise.
	* ld-mips-elf/attr-gnu-4-41.d: Likewise.
This commit is contained in:
Maciej W. Rozycki
2012-12-03 15:57:44 +00:00
parent d82184d782
commit 20696deded
9 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bfd/ChangeLog
View File

@ -1,3 +1,10 @@
2012-12-03 Maciej W. Rozycki <macro@codesourcery.com>
* elfxx-mips.c (mips_elf_merge_obj_attributes): Correct messages
for the -mdouble-float and -msingle-float cases throughout; make
all the messages report the output file consistently on the
left-hand side.
2012-11-29 Roland McGrath <mcgrathr@google.com> 2012-11-29 Roland McGrath <mcgrathr@google.com>
* elf-nacl.c (segment_eligible_for_headers): Disallow writable segments. * elf-nacl.c (segment_eligible_for_headers): Disallow writable segments.

66
bfd/elfxx-mips.c
View File

@ -13788,6 +13788,32 @@ mips_elf_merge_obj_attributes (bfd *ibfd, bfd *obfd)
switch (in_attr[Tag_GNU_MIPS_ABI_FP].i) switch (in_attr[Tag_GNU_MIPS_ABI_FP].i)
{ {
case 2: case 2:
_bfd_error_handler
(_("Warning: %B uses -mdouble-float, %B uses -msingle-float"),
obfd, ibfd);
break;
case 3:
_bfd_error_handler
(_("Warning: %B uses hard float, %B uses soft float"),
obfd, ibfd);
break;
case 4:
_bfd_error_handler
(_("Warning: %B uses -mdouble-float, %B uses -mips32r2 -mfp64"),
obfd, ibfd);
break;
default:
abort ();
}
break;
case 2:
switch (in_attr[Tag_GNU_MIPS_ABI_FP].i)
{
case 1:
_bfd_error_handler _bfd_error_handler
(_("Warning: %B uses -msingle-float, %B uses -mdouble-float"), (_("Warning: %B uses -msingle-float, %B uses -mdouble-float"),
obfd, ibfd); obfd, ibfd);
@ -13810,24 +13836,14 @@ mips_elf_merge_obj_attributes (bfd *ibfd, bfd *obfd)
} }
break; break;
case 2: case 3:
switch (in_attr[Tag_GNU_MIPS_ABI_FP].i) switch (in_attr[Tag_GNU_MIPS_ABI_FP].i)
{ {
case 1: case 1:
_bfd_error_handler case 2:
(_("Warning: %B uses -msingle-float, %B uses -mdouble-float"),
ibfd, obfd);
break;
case 3:
_bfd_error_handler
(_("Warning: %B uses hard float, %B uses soft float"),
obfd, ibfd);
break;
case 4: case 4:
_bfd_error_handler _bfd_error_handler
(_("Warning: %B uses -mdouble-float, %B uses -mips32r2 -mfp64"), (_("Warning: %B uses soft float, %B uses hard float"),
obfd, ibfd); obfd, ibfd);
break; break;
@ -13836,35 +13852,19 @@ mips_elf_merge_obj_attributes (bfd *ibfd, bfd *obfd)
} }
break; break;
case 3:
switch (in_attr[Tag_GNU_MIPS_ABI_FP].i)
{
case 1:
case 2:
case 4:
_bfd_error_handler
(_("Warning: %B uses hard float, %B uses soft float"),
ibfd, obfd);
break;
default:
abort ();
}
break;
case 4: case 4:
switch (in_attr[Tag_GNU_MIPS_ABI_FP].i) switch (in_attr[Tag_GNU_MIPS_ABI_FP].i)
{ {
case 1: case 1:
_bfd_error_handler _bfd_error_handler
(_("Warning: %B uses -msingle-float, %B uses -mips32r2 -mfp64"), (_("Warning: %B uses -mips32r2 -mfp64, %B uses -mdouble-float"),
ibfd, obfd); obfd, ibfd);
break; break;
case 2: case 2:
_bfd_error_handler _bfd_error_handler
(_("Warning: %B uses -mdouble-float, %B uses -mips32r2 -mfp64"), (_("Warning: %B uses -mips32r2 -mfp64, %B uses -msingle-float"),
ibfd, obfd); obfd, ibfd);
break; break;
case 3: case 3:

10
ld/testsuite/ChangeLog
View File

@ -1,3 +1,13 @@
2012-12-03 Maciej W. Rozycki <macro@codesourcery.com>
* ld-mips-elf/attr-gnu-4-12.d: Adjust the warning expected
according to changes to BFD.
* ld-mips-elf/attr-gnu-4-14.d: Likewise.
* ld-mips-elf/attr-gnu-4-31.d: Likewise.
* ld-mips-elf/attr-gnu-4-32.d: Likewise.
* ld-mips-elf/attr-gnu-4-34.d: Likewise.
* ld-mips-elf/attr-gnu-4-41.d: Likewise.
2012-12-03 H.J. Lu <hongjiu.lu@intel.com> 2012-12-03 H.J. Lu <hongjiu.lu@intel.com>
PR ld/14904 PR ld/14904

2
ld/testsuite/ld-mips-elf/attr-gnu-4-12.d
View File

@ -1,5 +1,5 @@
#source: attr-gnu-4-1.s #source: attr-gnu-4-1.s
#source: attr-gnu-4-2.s #source: attr-gnu-4-2.s
#ld: -r #ld: -r
#warning: Warning: .* uses -msingle-float, .* uses -mdouble-float #warning: Warning: .* uses -mdouble-float, .* uses -msingle-float
#target: mips*-*-* #target: mips*-*-*

2
ld/testsuite/ld-mips-elf/attr-gnu-4-14.d
View File

@ -1,5 +1,5 @@
#source: attr-gnu-4-1.s #source: attr-gnu-4-1.s
#source: attr-gnu-4-4.s #source: attr-gnu-4-4.s
#ld: -r #ld: -r
#warning: Warning: .* uses -msingle-float, .* uses -mips32r2 -mfp64 #warning: Warning: .* uses -mdouble-float, .* uses -mips32r2 -mfp64
#target: mips*-*-* #target: mips*-*-*

2
ld/testsuite/ld-mips-elf/attr-gnu-4-31.d
View File

@ -1,5 +1,5 @@
#source: attr-gnu-4-3.s #source: attr-gnu-4-3.s
#source: attr-gnu-4-1.s #source: attr-gnu-4-1.s
#ld: -r #ld: -r
#warning: Warning: .* uses hard float, .* uses soft float #warning: Warning: .* uses soft float, .* uses hard float
#target: mips*-*-* #target: mips*-*-*

2
ld/testsuite/ld-mips-elf/attr-gnu-4-32.d
View File

@ -1,5 +1,5 @@
#source: attr-gnu-4-3.s #source: attr-gnu-4-3.s
#source: attr-gnu-4-2.s #source: attr-gnu-4-2.s
#ld: -r #ld: -r
#warning: Warning: .* uses hard float, .* uses soft float #warning: Warning: .* uses soft float, .* uses hard float
#target: mips*-*-* #target: mips*-*-*

2
ld/testsuite/ld-mips-elf/attr-gnu-4-34.d
View File

@ -1,5 +1,5 @@
#source: attr-gnu-4-3.s #source: attr-gnu-4-3.s
#source: attr-gnu-4-4.s #source: attr-gnu-4-4.s
#ld: -r #ld: -r
#warning: Warning: .* uses hard float, .* uses soft float #warning: Warning: .* uses soft float, .* uses hard float
#target: mips*-*-* #target: mips*-*-*

2
ld/testsuite/ld-mips-elf/attr-gnu-4-41.d
View File

@ -1,5 +1,5 @@
#source: attr-gnu-4-4.s #source: attr-gnu-4-4.s
#source: attr-gnu-4-1.s #source: attr-gnu-4-1.s
#ld: -r #ld: -r
#warning: Warning: .* uses -msingle-float, .* uses -mips32r2 -mfp64 #warning: Warning: .* uses -mips32r2 -mfp64, .* uses -mdouble-float
#target: mips*-*-* #target: mips*-*-*