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

Ensure softfloat and singlefloat take precedence in consistency checks

Browse Source 
gas/

	* tc-mips.c (check_fpabi): Move softfloat and singlefloat
	checks higher.

gas/testsuite/

	* gas/mips/attr-gnu-4-5-msingle-float.l: New file.
	* gas/mips/attr-gnu-4-5-msingle-float.s: Likewise.
	* gas/mips/attr-gnu-4-5-msoft-float.l: Likewise.
	* gas/mips/attr-gnu-4-5-msoft-float.s: Likewise.
	* gas/mips/attr-gnu-4-6-msingle-float.l: Update expected output.
	* gas/mips/attr-gnu-4-6-msoft-float.l: Likewise.
	* gas/mips/attr-gnu-4-7-msingle-float.l: Likewise.
	* gas/mips/attr-gnu-4-7-msoft-float.l: Likewise.
	* gas/mips/mips.exp: Update expected output for FP ABI 5,6,7.
This commit is contained in:
Matthew Fortune 2014-09-15 10:32:38 +01:00
parent 64034f58a5
commit ea79f94a7a
12 changed files with 45 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gas/ChangeLog
View File

@ -1,3 +1,8 @@
2014-09-15 Matthew Fortune <matthew.fortune@imgtec.com>
* tc-mips.c (check_fpabi): Move softfloat and singlefloat
checks higher.
2014-09-12 Jose E. Marchesi <jose.marchesi@oracle.com>
* config/tc-sparc.c (sparc_ip): Update the set of allowed hwcaps

24
gas/config/tc-mips.c
View File

@ -3672,39 +3672,44 @@ fpabi_requires (int fpabi, const char *what)
static void
check_fpabi (int fpabi)
{
bfd_boolean needs_check = FALSE;
switch (fpabi)
{
case Val_GNU_MIPS_ABI_FP_DOUBLE:
if (file_mips_opts.soft_float)
fpabi_incompatible_with (fpabi, "softfloat");
else if (file_mips_opts.single_float)
fpabi_incompatible_with (fpabi, "singlefloat");
if (file_mips_opts.gp == 64 && file_mips_opts.fp == 32)
fpabi_incompatible_with (fpabi, "gp=64 fp=32");
else if (file_mips_opts.gp == 32 && file_mips_opts.fp == 64)
fpabi_incompatible_with (fpabi, "gp=32 fp=64");
else
needs_check = TRUE;
break;
case Val_GNU_MIPS_ABI_FP_XX:
if (mips_abi != O32_ABI)
fpabi_requires (fpabi, "-mabi=32");
else if (file_mips_opts.soft_float)
fpabi_incompatible_with (fpabi, "softfloat");
else if (file_mips_opts.single_float)
fpabi_incompatible_with (fpabi, "singlefloat");
else if (file_mips_opts.fp != 0)
fpabi_requires (fpabi, "fp=xx");
else
needs_check = TRUE;
break;
case Val_GNU_MIPS_ABI_FP_64A:
case Val_GNU_MIPS_ABI_FP_64:
if (mips_abi != O32_ABI)
fpabi_requires (fpabi, "-mabi=32");
else if (file_mips_opts.soft_float)
fpabi_incompatible_with (fpabi, "softfloat");
else if (file_mips_opts.single_float)
fpabi_incompatible_with (fpabi, "singlefloat");
else if (file_mips_opts.fp != 64)
fpabi_requires (fpabi, "fp=64");
else if (fpabi == Val_GNU_MIPS_ABI_FP_64 && !file_mips_opts.oddspreg)
fpabi_incompatible_with (fpabi, "nooddspreg");
else if (fpabi == Val_GNU_MIPS_ABI_FP_64A && file_mips_opts.oddspreg)
fpabi_requires (fpabi, "nooddspreg");
else
needs_check = TRUE;
break;
case Val_GNU_MIPS_ABI_FP_SINGLE:
@ -3729,11 +3734,6 @@ check_fpabi (int fpabi)
" floating-point ABI"), Tag_GNU_MIPS_ABI_FP, fpabi);
break;
}
if (needs_check && file_mips_opts.soft_float)
fpabi_incompatible_with (fpabi, "softfloat");
else if (needs_check && file_mips_opts.single_float)
fpabi_incompatible_with (fpabi, "singlefloat");
}
/* Perform consistency checks on the current options. */

12
gas/testsuite/ChangeLog
View File

@ -1,3 +1,15 @@
2014-09-15 Matthew Fortune <matthew.fortune@imgtec.com>
* gas/mips/attr-gnu-4-5-msingle-float.l: New file.
* gas/mips/attr-gnu-4-5-msingle-float.s: Likewise.
* gas/mips/attr-gnu-4-5-msoft-float.l: Likewise.
* gas/mips/attr-gnu-4-5-msoft-float.s: Likewise.
* gas/mips/attr-gnu-4-6-msingle-float.l: Update expected output.
* gas/mips/attr-gnu-4-6-msoft-float.l: Likewise.
* gas/mips/attr-gnu-4-7-msingle-float.l: Likewise.
* gas/mips/attr-gnu-4-7-msoft-float.l: Likewise.
* gas/mips/mips.exp: Update expected output for FP ABI 5,6,7.
2014-09-12 Andrew Bennett <andrew.bennett@imgtec.com>
* gas/mips/mips.exp: Add mips*-img-elf* target triple.

2
gas/testsuite/gas/mips/attr-gnu-4-5-msingle-float.l Normal file
View File

@ -0,0 +1,2 @@
.*: Assembler messages:
.*: Warning: .gnu_attribute 4,5 is incompatible with `singlefloat'

1
gas/testsuite/gas/mips/attr-gnu-4-5-msingle-float.s Normal file
View File

@ -0,0 +1 @@
.gnu_attribute 4,5

2
gas/testsuite/gas/mips/attr-gnu-4-5-msoft-float.l Normal file
View File

@ -0,0 +1,2 @@
.*: Assembler messages:
.*: Warning: .gnu_attribute 4,5 is incompatible with `softfloat'

1
gas/testsuite/gas/mips/attr-gnu-4-5-msoft-float.s Normal file
View File

@ -0,0 +1 @@
.gnu_attribute 4,5

2
gas/testsuite/gas/mips/attr-gnu-4-6-msingle-float.l
View File

@ -1,2 +1,2 @@
.*: Assembler messages:
.*: Warning: .gnu_attribute 4,6 is incompatible with `fp=32'
.*: Warning: .gnu_attribute 4,6 is incompatible with `singlefloat'

2
gas/testsuite/gas/mips/attr-gnu-4-6-msoft-float.l
View File

@ -1,2 +1,2 @@
.*: Assembler messages:
.*: Warning: .gnu_attribute 4,6 is incompatible with `fp=32'
.*: Warning: .gnu_attribute 4,6 is incompatible with `softfloat'

2
gas/testsuite/gas/mips/attr-gnu-4-7-msingle-float.l
View File

@ -1,2 +1,2 @@
.*: Assembler messages:
.*: Warning: .gnu_attribute 4,6 is incompatible with `fp=32'
.*: Warning: .gnu_attribute 4,6 is incompatible with `singlefloat'

2
gas/testsuite/gas/mips/attr-gnu-4-7-msoft-float.l
View File

@ -1,2 +1,2 @@
.*: Assembler messages:
.*: Warning: .gnu_attribute 4,6 is incompatible with `fp=32'
.*: Warning: .gnu_attribute 4,6 is incompatible with `softfloat'

12
gas/testsuite/gas/mips/mips.exp
View File

@ -1327,9 +1327,9 @@ if { [istarget mips*-*-vxworks*] } {
[mips_arch_list_matching mips32r2]
run_list_test_arches "attr-gnu-4-5-64" "-64 -mfp64" \
[mips_arch_list_matching mips3]
run_list_test_arches "attr-gnu-4-5" "-32 -msingle-float" \
run_list_test_arches "attr-gnu-4-5-msingle-float" "-32 -msingle-float" \
[mips_arch_list_matching mips1]
run_list_test_arches "attr-gnu-4-5" "-32 -msoft-float" \
run_list_test_arches "attr-gnu-4-5-msoft-float" "-32 -msoft-float" \
[mips_arch_list_matching mips1]
run_dump_test_arches "attr-gnu-4-5" \
[mips_arch_list_matching mips2 !r5900]
@ -1340,9 +1340,9 @@ if { [istarget mips*-*-vxworks*] } {
[mips_arch_list_matching mips32r2]
run_list_test_arches "attr-gnu-4-6-64" "-64 -mfp64" \
[mips_arch_list_matching mips3]
run_list_test_arches "attr-gnu-4-6" "-32 -msingle-float" \
run_list_test_arches "attr-gnu-4-6-msingle-float" "-32 -msingle-float" \
[mips_arch_list_matching mips1]
run_list_test_arches "attr-gnu-4-6" "-32 -msoft-float" \
run_list_test_arches "attr-gnu-4-6-msoft-float" "-32 -msoft-float" \
[mips_arch_list_matching mips1]
run_list_test_arches "attr-gnu-4-6" "-32 -mfpxx" \
[mips_arch_list_matching mips2 !r5900]
@ -1355,9 +1355,9 @@ if { [istarget mips*-*-vxworks*] } {
[mips_arch_list_matching mips32r2]
run_list_test_arches "attr-gnu-4-7-64" "-64 -mfp64" \
[mips_arch_list_matching mips3]
run_list_test_arches "attr-gnu-4-7" "-32 -msingle-float" \
run_list_test_arches "attr-gnu-4-7-msingle-float" "-32 -msingle-float" \
[mips_arch_list_matching mips1]
run_list_test_arches "attr-gnu-4-7" "-32 -msoft-float" \
run_list_test_arches "attr-gnu-4-7-msoft-float" "-32 -msoft-float" \
[mips_arch_list_matching mips1]
run_list_test_arches "attr-gnu-4-7" "-32 -mfpxx" \
[mips_arch_list_matching mips2 !r5900]