diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4cb3f6f1bc2..96011784922 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2019-07-02  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* defs.h (generic_load): Move from here...
+	* symfile.h (generic_load): ... to here.  Rename name parameter
+	to args.
+	* symfile.c (generic_load): Add comment.
+
 2019-07-01  Tom Tromey  <tromey@adacore.com>
 
 	* dwarf2read.c
diff --git a/gdb/defs.h b/gdb/defs.h
index 3d878c84e3f..81ab74c27f5 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -300,9 +300,6 @@ EXTERN_C char *re_comp (const char *);
 
 extern void symbol_file_command (const char *, int);
 
-/* * Remote targets may wish to use this as their load function.  */
-extern void generic_load (const char *name, int from_tty);
-
 /* From top.c */
 
 typedef void initialize_file_ftype (void);
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 6f9c81c8b94..59647bfe9d8 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -2023,6 +2023,8 @@ static void print_transfer_performance (struct ui_file *stream,
 					unsigned long write_count,
 				        std::chrono::steady_clock::duration d);
 
+/* See symfile.h.  */
+
 void
 generic_load (const char *args, int from_tty)
 {
diff --git a/gdb/symfile.h b/gdb/symfile.h
index daddd2e21ab..403dd165264 100644
--- a/gdb/symfile.h
+++ b/gdb/symfile.h
@@ -532,6 +532,12 @@ void expand_symtabs_matching
 void map_symbol_filenames (symbol_filename_ftype *fun, void *data,
 			   int need_fullname);
 
+/* Target-agnostic function to load the sections of an executable into memory.
+
+   ARGS should be in the form "EXECUTABLE [OFFSET]", where OFFSET is an
+   optional offset to apply to each section.  */
+extern void generic_load (const char *args, int from_tty);
+
 /* From dwarf2read.c */
 
 /* Names for a dwarf2 debugging section.  The field NORMAL is the normal