From 5ff559107a34a664abf7db01cc9db93e3597d466 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 9 Aug 2016 16:41:12 -0700 Subject: [PATCH] Skip LTO tests for --disable-plugin Don't run LTO tests if compiler is configured with --disable-plugin. PR ld/20436 * testsuite/lib/ld-lib.exp (check_gcc_plugin_enabled): New proc. (check_lto_available): Return 0 if check_gcc_plugin_enabled returns 0. (check_lto_fat_available): Likewise. (check_lto_shared_available): Likewise. --- ld/ChangeLog | 10 ++++++++++ ld/testsuite/lib/ld-lib.exp | 28 +++++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index e3ca95336ba..cc7d9158707 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,13 @@ +2016-08-09 H.J. Lu + + PR ld/20436 + * testsuite/lib/ld-lib.exp (check_gcc_plugin_enabled): New + proc. + (check_lto_available): Return 0 if check_gcc_plugin_enabled + returns 0. + (check_lto_fat_available): Likewise. + (check_lto_shared_available): Likewise. + 2016-08-09 Roland McGrath * emulparams/armelf.sh (GENERATE_PIE_SCRIPT): Set to yes. diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index cd9e930cab9..b3cdb70a388 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp @@ -1808,13 +1808,35 @@ proc check_sysroot_available { } { return $ld_sysroot_available_saved } +# Returns 1 if plugin is enabled in gcc. Returns 0 otherwise. +proc check_gcc_plugin_enabled { } { + global CC + + if {![info exists CC]} { + set CC [find_gcc] + } + if { $CC == "" } { + return 0 + } + set state [remote_exec host $CC -v] + for { set i 0 } { $i < [llength $state] } { incr i } { + set v [lindex $state $i] + if { [ string match "*--disable-plugin*" $v ] } { + verbose "plugin is disabled by $v" + return 0; + } + } + + return 1; +} + # Returns true if the target compiler supports LTO proc check_lto_available { } { global lto_available_saved global CC if {![info exists lto_available_saved]} { - if { [which $CC] == 0 } { + if { ![check_gcc_plugin_enabled] } { set lto_available_saved 0 return 0 } @@ -1857,7 +1879,7 @@ proc check_lto_fat_available { } { global CC if {![info exists lto_fat_available_saved]} { - if { [which $CC] == 0 } { + if { ![check_gcc_plugin_enabled] } { set lto_fat_available_saved 0 return 0 } @@ -1900,7 +1922,7 @@ proc check_lto_shared_available { } { global CC if {![info exists lto_shared_available_saved]} { - if { [which $CC] == 0 } { + if { ![check_gcc_plugin_enabled] } { set lto_shared_available_saved 0 return 0 } -- 2.30.2