diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2010-10-12 12:06:18 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2010-10-12 12:06:18 +0000 |
| commit | cf3e10419923a5e46f21d6621425a8acd63ddeac (patch) | |
| tree | 5be1ed66daa13e385e7264a0a71e164d6558a82e | |
| parent | bc8359ff68f77dce2448a8057f86f1cd8ab866f7 (diff) | |
| download | gcc-cf3e10419923a5e46f21d6621425a8acd63ddeac.zip gcc-cf3e10419923a5e46f21d6621425a8acd63ddeac.tar.gz gcc-cf3e10419923a5e46f21d6621425a8acd63ddeac.tar.bz2 | |
re PR testsuite/45851 (FAIL: gcc.dg/lto/20090210 link test with WHOPR owing to bad -pthread option.)
gcc/testsuite:
PR testsuite/45851
* lib/lto.exp (lto-get-options-main): Support optional target
selector for dg-extra-ld-options.
gcc:
PR testsuite/45851
* doc/sourcebuild.texi (LTO Testing, dg-extra-ld-options):
Document optional target selector.
From-SVN: r165366
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/doc/sourcebuild.texi | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/lib/lto.exp | 13 |
4 files changed, 24 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bd5743d..8de44b9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-10-12 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + PR testsuite/45851 + * doc/sourcebuild.texi (LTO Testing, dg-extra-ld-options): + Document optional target selector. + 2010-10-12 Joseph Myers <joseph@codesourcery.com> * flag-types.h: New. diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi index 83a0dbf..1f981e7 100644 --- a/gcc/doc/sourcebuild.texi +++ b/gcc/doc/sourcebuild.texi @@ -2300,7 +2300,7 @@ This directive provides a list of one or more sets of compiler options to override @var{LTO_OPTIONS}. Each test will be compiled and run with each of these sets of options. -@item @{ dg-extra-ld-options @var{options} @} +@item @{ dg-extra-ld-options @var{options} [@{ target @var{selector} @}]@} This directive adds @var{options} to the linker options used. @item @{ dg-suppress-ld-options @var{options} @} diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5a1f268..5b7c054 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,11 @@ 2010-10-12 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + PR testsuite/45851 + * lib/lto.exp (lto-get-options-main): Support optional target + selector for dg-extra-ld-options. + +2010-10-12 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + * gcc.dg/pragma-init-fini.c: Skip on i?86-*-solaris2.8 && !gas. * gcc.dg/pragma-init-fini-2.c: XFAIL on i?86-*-solaris2.8 && !gas. diff --git a/gcc/testsuite/lib/lto.exp b/gcc/testsuite/lib/lto.exp index 7d0620f..30b6f06 100644 --- a/gcc/testsuite/lib/lto.exp +++ b/gcc/testsuite/lib/lto.exp @@ -277,8 +277,17 @@ proc lto-get-options-main { src } { warning "lto.exp does not support dg-lto-do $dgdo" } } elseif { ![string compare "dg-extra-ld-options" $cmd] } { - set dg-extra-ld-options [lindex $op 2] - verbose "dg-extra-ld-options for main is ${dg-extra-ld-options}" + if { [llength $op] > 4 } { + error "[lindex $op 0]: too many arguments" + } else { + if { [llength $op] == 3 + || ([llength $op] > 3 + && [dg-process-target [lindex $op 3]] == "S") } { + set dg-extra-ld-options [lindex $op 2] + verbose \ + "dg-extra-ld-options for main is ${dg-extra-ld-options}" + } + } } elseif { ![string compare "dg-suppress-ld-options" $cmd] } { set dg-suppress-ld-options [lindex $op 2] verbose \ |