diff options
| author | Maciej W. Rozycki <macro@linux-mips.org> | 2012-12-03 15:57:44 +0000 |
|---|---|---|
| committer | Maciej W. Rozycki <macro@linux-mips.org> | 2012-12-03 15:57:44 +0000 |
| commit | 20696deded3ddcf936795f73f53a7a702a6955b1 (patch) | |
| tree | fac0580e8d4e43c526932a22f1d306c701fd9437 /ld | |
| parent | d82184d78220ce42e0f54ce9fbb0688860ff0388 (diff) | |
| download | fsf-binutils-gdb-20696deded3ddcf936795f73f53a7a702a6955b1.zip fsf-binutils-gdb-20696deded3ddcf936795f73f53a7a702a6955b1.tar.gz fsf-binutils-gdb-20696deded3ddcf936795f73f53a7a702a6955b1.tar.bz2 | |
bfd/
* 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.
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/testsuite/ChangeLog | 10 | ||||
| -rw-r--r-- | ld/testsuite/ld-mips-elf/attr-gnu-4-12.d | 2 | ||||
| -rw-r--r-- | ld/testsuite/ld-mips-elf/attr-gnu-4-14.d | 2 | ||||
| -rw-r--r-- | ld/testsuite/ld-mips-elf/attr-gnu-4-31.d | 2 | ||||
| -rw-r--r-- | ld/testsuite/ld-mips-elf/attr-gnu-4-32.d | 2 | ||||
| -rw-r--r-- | ld/testsuite/ld-mips-elf/attr-gnu-4-34.d | 2 | ||||
| -rw-r--r-- | ld/testsuite/ld-mips-elf/attr-gnu-4-41.d | 2 |
7 files changed, 16 insertions, 6 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index fd49cd6..f88ff96 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -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> PR ld/14904 diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-12.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-12.d index 447621c..77a13bc 100644 --- a/ld/testsuite/ld-mips-elf/attr-gnu-4-12.d +++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-12.d @@ -1,5 +1,5 @@ #source: attr-gnu-4-1.s #source: attr-gnu-4-2.s #ld: -r -#warning: Warning: .* uses -msingle-float, .* uses -mdouble-float +#warning: Warning: .* uses -mdouble-float, .* uses -msingle-float #target: mips*-*-* diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-14.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-14.d index b940889..1b65c20 100644 --- a/ld/testsuite/ld-mips-elf/attr-gnu-4-14.d +++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-14.d @@ -1,5 +1,5 @@ #source: attr-gnu-4-1.s #source: attr-gnu-4-4.s #ld: -r -#warning: Warning: .* uses -msingle-float, .* uses -mips32r2 -mfp64 +#warning: Warning: .* uses -mdouble-float, .* uses -mips32r2 -mfp64 #target: mips*-*-* diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-31.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-31.d index cac5812..d63d537 100644 --- a/ld/testsuite/ld-mips-elf/attr-gnu-4-31.d +++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-31.d @@ -1,5 +1,5 @@ #source: attr-gnu-4-3.s #source: attr-gnu-4-1.s #ld: -r -#warning: Warning: .* uses hard float, .* uses soft float +#warning: Warning: .* uses soft float, .* uses hard float #target: mips*-*-* diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-32.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-32.d index dd066dd..bc587a7 100644 --- a/ld/testsuite/ld-mips-elf/attr-gnu-4-32.d +++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-32.d @@ -1,5 +1,5 @@ #source: attr-gnu-4-3.s #source: attr-gnu-4-2.s #ld: -r -#warning: Warning: .* uses hard float, .* uses soft float +#warning: Warning: .* uses soft float, .* uses hard float #target: mips*-*-* diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-34.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-34.d index 33a987a..9834132 100644 --- a/ld/testsuite/ld-mips-elf/attr-gnu-4-34.d +++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-34.d @@ -1,5 +1,5 @@ #source: attr-gnu-4-3.s #source: attr-gnu-4-4.s #ld: -r -#warning: Warning: .* uses hard float, .* uses soft float +#warning: Warning: .* uses soft float, .* uses hard float #target: mips*-*-* diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-41.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-41.d index a00e626..a30a03d 100644 --- a/ld/testsuite/ld-mips-elf/attr-gnu-4-41.d +++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-41.d @@ -1,5 +1,5 @@ #source: attr-gnu-4-4.s #source: attr-gnu-4-1.s #ld: -r -#warning: Warning: .* uses -msingle-float, .* uses -mips32r2 -mfp64 +#warning: Warning: .* uses -mips32r2 -mfp64, .* uses -mdouble-float #target: mips*-*-* |