Fix PR remote/21852: Remote run without specifying a local binary crashes GDB

diff --git a/gdb/remote.c b/gdb/remote.c
index ff59a0f81f..c9bcb163e7 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -1825,7 +1825,7 @@  remote_add_inferior (int fake_pid_p, int pid, int attached,
   /* If no main executable is currently open then attempt to
      open the file that was executed to create this inferior.  */
   if (try_open_exec && get_exec_file (0) == NULL)
-    exec_file_locate_attach (pid, 0, 1);
+    exec_file_locate_attach (pid, 1, 1);
 
   return inf;
 }
diff --git a/gdb/testsuite/gdb.server/normal.c b/gdb/testsuite/gdb.server/normal.c
new file mode 100644
index 0000000000..f0eb1541fd
--- /dev/null
+++ b/gdb/testsuite/gdb.server/normal.c
@@ -0,0 +1,24 @@ 
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2013-2017 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* This test is just a normal return 0.  */
+
+int
+main (int argc, char *argv[])
+{
+  return 0;
+}
diff --git a/gdb/testsuite/gdb.server/run-without-local-binary.exp b/gdb/testsuite/gdb.server/run-without-local-binary.exp
new file mode 100644
index 0000000000..5af2d1bb25
--- /dev/null
+++ b/gdb/testsuite/gdb.server/run-without-local-binary.exp
@@ -0,0 +1,56 @@ 
+# Copyright 2017 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+load_lib gdbserver-support.exp
+
+if {[skip_gdbserver_tests]} {
+    return
+}
+
+standard_testfile normal.c
+
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
+    return -1
+}
+
+# Test running GDB without providing a local binary for it.  In order
+# to do that, we unset GDBFLAGS before running GDB.  We also start
+# gdbserver "by hand".  For more details about this test, see PR
+# remote/21852.
+save_vars { GDBFLAGS } {
+    set GDBFLAGS ""
+    gdb_exit
+    gdb_start
+
+    gdb_test_no_output "set remote exec-file $binfile" \
+	"set remote exec-file"
+
+    # Let's start gdbserver in extended-remote mode now.
+    set res [gdbserver_start "--multi" ""]
+    set gdbserver_protocol [lindex $res 0]
+    if { [string first "extended-" $gdbserver_protocol] != 0} {
+	set gdbserver_protocol "extended-$gdbserver_protocol"
+    }
+    set gdbserver_gdbport [lindex $res 1]
+    set use_gdb_stub 0
+
+    gdb_test "target ${gdbserver_protocol} ${gdbserver_gdbport}" \
+	"Remote debugging using $gdbserver_gdbport" \
+	"connect to gdbserver"
+
+    gdb_test "run" \
+	"\\\[Inferior $decimal \\\(process $decimal\\\) exited normally\\\]" \
+	"run test program until the end"
+}