diff --git a/gdb/testsuite/gdb.base/options.exp b/gdb/testsuite/gdb.base/options.exp
index d10e7f8d66f..8fd968de1ad 100644
--- a/gdb/testsuite/gdb.base/options.exp
+++ b/gdb/testsuite/gdb.base/options.exp
@@ -31,6 +31,7 @@
# - thread apply
# - taas
+load_lib compile-support.exp
load_lib completion-support.exp
standard_testfile .c
diff --git a/gdb/testsuite/gdb.compile/compile-ifunc.exp b/gdb/testsuite/gdb.compile/compile-ifunc.exp
index 4f671c6453f..07de52c3f67 100644
--- a/gdb/testsuite/gdb.compile/compile-ifunc.exp
+++ b/gdb/testsuite/gdb.compile/compile-ifunc.exp
@@ -13,6 +13,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
+load_lib compile-support.exp
+
if {[skip_ifunc_tests]} {
return 0
}
diff --git a/gdb/testsuite/gdb.compile/compile-ops.exp b/gdb/testsuite/gdb.compile/compile-ops.exp
index 76f284f52f3..cff2f946c93 100644
--- a/gdb/testsuite/gdb.compile/compile-ops.exp
+++ b/gdb/testsuite/gdb.compile/compile-ops.exp
@@ -16,6 +16,7 @@
# Some coverage testing of DWARF operators for the compiler
# integration.
+load_lib compile-support.exp
load_lib dwarf.exp
# This test can only be run on targets which support DWARF-2 and use gas.
diff --git a/gdb/testsuite/gdb.compile/compile-print.exp b/gdb/testsuite/gdb.compile/compile-print.exp
index 051cfabe3ea..5d01c1a53d0 100644
--- a/gdb/testsuite/gdb.compile/compile-print.exp
+++ b/gdb/testsuite/gdb.compile/compile-print.exp
@@ -13,6 +13,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
+load_lib compile-support.exp
+
standard_testfile
if { [prepare_for_testing "failed to prepare" "$testfile"] } {
diff --git a/gdb/testsuite/gdb.compile/compile-setjmp.exp b/gdb/testsuite/gdb.compile/compile-setjmp.exp
index 89a65fb0da1..c883b2bd570 100644
--- a/gdb/testsuite/gdb.compile/compile-setjmp.exp
+++ b/gdb/testsuite/gdb.compile/compile-setjmp.exp
@@ -13,6 +13,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
+load_lib compile-support.exp
+
standard_testfile .c compile-setjmp-mod.c
if { [prepare_for_testing "failed to prepare" $testfile] } {
diff --git a/gdb/testsuite/gdb.compile/compile-tls.exp b/gdb/testsuite/gdb.compile/compile-tls.exp
index f9c9ee5e2f7..beffe7fd5be 100644
--- a/gdb/testsuite/gdb.compile/compile-tls.exp
+++ b/gdb/testsuite/gdb.compile/compile-tls.exp
@@ -13,6 +13,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see . */
+load_lib compile-support.exp
+
standard_testfile .c
if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
diff --git a/gdb/testsuite/gdb.compile/compile.exp b/gdb/testsuite/gdb.compile/compile.exp
index f2515586c39..c712070872a 100644
--- a/gdb/testsuite/gdb.compile/compile.exp
+++ b/gdb/testsuite/gdb.compile/compile.exp
@@ -13,6 +13,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
+load_lib compile-support.exp
+
standard_testfile .c compile-shlib.c compile-constvar.S compile-nodebug.c
set options {}
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 23e3cc0c2d4..5067e240507 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -4195,26 +4195,6 @@ proc skip_libstdcxx_probe_tests {} {
return [skip_libstdcxx_probe_tests_prompt "$gdb_prompt $"]
}
-# Return 1 if we should skip tests of the "compile" feature.
-# This must be invoked after the inferior has been started.
-
-proc skip_compile_feature_tests {} {
- global gdb_prompt
-
- set result 0
- gdb_test_multiple "compile code -- ;" "check for working compile command" {
- "Could not load libcc1.*\r\n$gdb_prompt $" {
- set result 1
- }
- -re "Command not supported on this host\\..*\r\n$gdb_prompt $" {
- set result 1
- }
- -re "\r\n$gdb_prompt $" {
- }
- }
- return $result
-}
-
# Helper for gdb_is_target_* procs. TARGET_NAME is the name of the target
# we're looking for (used to build the test name). TARGET_STACK_REGEXP
# is a regexp that will match the output of "maint print target-stack" if