diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f879b8ad34..c83cd02bcd 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2016-04-15  Pedro Alves  <palves@redhat.com>
+
+	* ada-lang.c (ada_lookup_struct_elt_type): Constify 'type_str' and
+	'name_str' locals.
+
 2016-04-15  Pedro Alves  <palves@redhat.com>
 
 	* btrace.c (pt_btrace_insn_flags): Change return type to
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 7cdb693852..d01660a29f 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -7649,7 +7649,7 @@ ada_lookup_struct_elt_type (struct type *type, char *name, int refok,
       || (TYPE_CODE (type) != TYPE_CODE_STRUCT
           && TYPE_CODE (type) != TYPE_CODE_UNION))
     {
-      char *type_str;
+      const char *type_str;
 
       if (noerr)
         return NULL;
@@ -7727,7 +7727,7 @@ ada_lookup_struct_elt_type (struct type *type, char *name, int refok,
 BadName:
   if (!noerr)
     {
-      char *name_str = name != NULL ? name : _("<null>");
+      const char *name_str = name != NULL ? name : _("<null>");
 
       error (_("Type %s has no component named %s"),
 	     type_as_string_and_cleanup (type), name_str);