diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 51785c76127..a8c0027001e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2020-03-04  Tom Tromey  <tom@tromey.com>
+
+	* jit.c (bfd_open_from_target_memory): Make "target" const.
+	* corefile.c (gnutarget): Now const.
+	* gdbcore.h (gnutarget): Now const.
+
 2020-03-04  Hannes Domani  <ssbssa@yahoo.de>
 
 	* NEWS: Mention support for WOW64 processes.
diff --git a/gdb/corefile.c b/gdb/corefile.c
index 3b9f8c76052..4ce1bb78f28 100644
--- a/gdb/corefile.c
+++ b/gdb/corefile.c
@@ -415,7 +415,7 @@ write_memory_signed_integer (CORE_ADDR addr, int len,
 
 /* The current default bfd target.  Points to storage allocated for
    gnutarget_string.  */
-char *gnutarget;
+const char *gnutarget;
 
 /* Same thing, except it is "auto" not NULL for the default case.  */
 static char *gnutarget_string;
diff --git a/gdb/gdbcore.h b/gdb/gdbcore.h
index 9d0f62bc980..7fef4d809ea 100644
--- a/gdb/gdbcore.h
+++ b/gdb/gdbcore.h
@@ -164,7 +164,7 @@ extern void validate_exec_file (int from_tty);
 
 /* The current default bfd target.  */
 
-extern char *gnutarget;
+extern const char *gnutarget;
 
 extern void set_gnutarget (const char *);
 
diff --git a/gdb/jit.c b/gdb/jit.c
index eeaab70bfe0..35b7167270d 100644
--- a/gdb/jit.c
+++ b/gdb/jit.c
@@ -136,7 +136,8 @@ mem_bfd_iovec_stat (struct bfd *abfd, void *stream, struct stat *sb)
 /* Open a BFD from the target's memory.  */
 
 static gdb_bfd_ref_ptr
-bfd_open_from_target_memory (CORE_ADDR addr, ULONGEST size, char *target)
+bfd_open_from_target_memory (CORE_ADDR addr, ULONGEST size,
+			     const char *target)
 {
   struct target_buffer *buffer = XNEW (struct target_buffer);