diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 23ff7bc433..580c15e8fc 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-04-24  Tom Tromey  <tromey@adacore.com>
+
+	* lib/gdb.exp (gdb_compile): Don't add -fno-stack-protector for
+	Rust.
+
 2019-04-24  Tom Tromey  <tromey@adacore.com>
 
 	* gdb.arch/amd64-eval.exp: Test bitfield return.
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 1176fdded1..eaf7fc4303 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -3564,7 +3564,8 @@ proc gdb_compile {source dest type options} {
     if { $getting_compiler_info == 0
 	 && [test_compiler_info {gcc-*-*}]
 	 && !([test_compiler_info {gcc-[0-3]-*}]
-	      || [test_compiler_info {gcc-4-0-*}]) } {
+	      || [test_compiler_info {gcc-4-0-*}])
+	 && [lsearch -exact $options rust] == -1} {
         # Put it at the front to not override any user-provided value.
         lappend new_options "early_flags=-fno-stack-protector"
     }