From 6c9a7fb62fcddbcafba8ab765e6fe190482c3d0a Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Tue, 28 Jun 2016 11:08:58 +0100 Subject: [PATCH] MIPS/LD/testsuite: Accept any UNIX OS/ABI with GNU attribute tests Remove failures with FreeBSD targets, e.g: regexp_diff match failure regexp "^ OS/ABI: UNIX - System V$" line " OS/ABI: UNIX - FreeBSD" FAIL: ld-mips-elf/attr-gnu-4-50 introduced with commit 351cdf24d223 ("[MIPS] Implement O32 FPXX, FP64 and FP64A ABI extensions"). ld/ * testsuite/ld-mips-elf/attr-gnu-4-10.d: Match any UNIX OS/ABI. * testsuite/ld-mips-elf/attr-gnu-4-50.d: Likewise. * testsuite/ld-mips-elf/attr-gnu-4-60.d: Likewise. * testsuite/ld-mips-elf/attr-gnu-4-70.d: Likewise. --- ld/ChangeLog | 7 +++++++ ld/testsuite/ld-mips-elf/attr-gnu-4-10.d | 2 +- ld/testsuite/ld-mips-elf/attr-gnu-4-50.d | 2 +- ld/testsuite/ld-mips-elf/attr-gnu-4-60.d | 2 +- ld/testsuite/ld-mips-elf/attr-gnu-4-70.d | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index c59fe65cd2b..79c495d1c7d 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,10 @@ +2016-06-28 Maciej W. Rozycki + + * testsuite/ld-mips-elf/attr-gnu-4-10.d: Match any UNIX OS/ABI. + * testsuite/ld-mips-elf/attr-gnu-4-50.d: Likewise. + * testsuite/ld-mips-elf/attr-gnu-4-60.d: Likewise. + * testsuite/ld-mips-elf/attr-gnu-4-70.d: Likewise. + 2016-06-28 Alan Modra PR ld/20302 diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-10.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-10.d index 7dd45cf86fb..e3a1c9c0d00 100644 --- a/ld/testsuite/ld-mips-elf/attr-gnu-4-10.d +++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-10.d @@ -8,7 +8,7 @@ ELF Header: Class: ELF32 Data: 2's complement,.* Version: 1 \(current\) - OS/ABI: UNIX - System V + OS/ABI: UNIX - .* ABI Version: 0 Type: REL \(Relocatable file\) Machine: MIPS R3000 diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-50.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-50.d index 651277dc8d9..5dc46d32aff 100644 --- a/ld/testsuite/ld-mips-elf/attr-gnu-4-50.d +++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-50.d @@ -8,7 +8,7 @@ ELF Header: Class: ELF32 Data: 2's complement,.* Version: 1 \(current\) - OS/ABI: UNIX - System V + OS/ABI: UNIX - .* ABI Version: 0 Type: REL \(Relocatable file\) Machine: MIPS R3000 diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-60.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-60.d index 80977a86df6..ea80c189a23 100644 --- a/ld/testsuite/ld-mips-elf/attr-gnu-4-60.d +++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-60.d @@ -8,7 +8,7 @@ ELF Header: Class: ELF32 Data: 2's complement,.* Version: 1 \(current\) - OS/ABI: UNIX - System V + OS/ABI: UNIX - .* ABI Version: 3 Type: REL \(Relocatable file\) Machine: MIPS R3000 diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-70.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-70.d index 3cd32504378..edbd61fa7cb 100644 --- a/ld/testsuite/ld-mips-elf/attr-gnu-4-70.d +++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-70.d @@ -8,7 +8,7 @@ ELF Header: Class: ELF32 Data: 2's complement,.* Version: 1 \(current\) - OS/ABI: UNIX - System V + OS/ABI: UNIX - .* ABI Version: 3 Type: REL \(Relocatable file\) Machine: MIPS R3000 -- 2.30.2