diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2010-11-05 19:34:19 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2010-11-05 19:34:19 +0000 |
| commit | 73f22c498e2c8a3073ec5daf746713d9fc032e09 (patch) | |
| tree | 4ec8ca1a44126ae8ced50f131f36fbda3488157d /gcc | |
| parent | 897145e3e11c868abb2b5ec23ef5f65a87914270 (diff) | |
| download | gcc-73f22c498e2c8a3073ec5daf746713d9fc032e09.zip gcc-73f22c498e2c8a3073ec5daf746713d9fc032e09.tar.gz gcc-73f22c498e2c8a3073ec5daf746713d9fc032e09.tar.bz2 | |
i386.exp (FLAGS): Remove.
* gcc.target/i386/i386.exp (FLAGS): Remove.
Wrap gcc_target_compile with $clearcap_ldflags added to options.
From-SVN: r166377
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.target/i386/i386.exp | 17 |
2 files changed, 19 insertions, 3 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 203f3e0..fda07c3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-11-05 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * gcc.target/i386/i386.exp (FLAGS): Remove. + Wrap gcc_target_compile with $clearcap_ldflags added to options. + 2010-11-05 Jakub Jelinek <jakub@redhat.com> PR c++/46160 diff --git a/gcc/testsuite/gcc.target/i386/i386.exp b/gcc/testsuite/gcc.target/i386/i386.exp index 65abf58..32dbf5e 100644 --- a/gcc/testsuite/gcc.target/i386/i386.exp +++ b/gcc/testsuite/gcc.target/i386/i386.exp @@ -188,13 +188,24 @@ proc check_effective_target_xop { } { # If the linker used understands -M <mapfile>, pass it to clear hardware # capabilities set by the Sun assembler. -set FLAGS "" set clearcap_ldflags "-Wl,-M,$srcdir/$subdir/clearcap.map" if [check_no_compiler_messages mapfile executable { int main (void) { return 0; } } $clearcap_ldflags ] { - set FLAGS $clearcap_ldflags + + if { [info procs gcc_target_compile] != [list] \ + && [info procs saved_gcc_target_compile] == [list] } { + rename gcc_target_compile saved_gcc_target_compile + + proc gcc_target_compile { source dest type options } { + global clearcap_ldflags + # Always pass -Wl,-M,<mapfile>, but don't let it show up in gcc.sum. + lappend options "additional_flags=$clearcap_ldflags" + + return [saved_gcc_target_compile $source $dest $type $options] + } + } } # If a testcase doesn't have special options, use these. @@ -221,7 +232,7 @@ set tests [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] set tests [prune $tests $srcdir/$subdir/vect-args.c] # Main loop. -dg-runtest $tests $FLAGS $DEFAULT_CFLAGS +dg-runtest $tests "" $DEFAULT_CFLAGS # All done. dg-finish |