diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bb80e1e3f3..2a68a1ba2b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-30  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* dwarf2read.c (read_index_from_section): Use bool.
+
 2018-04-29  Fabian Groffen  <grobian@gentoo.org>
 
 	PR gdb/22950
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 9eb98b2eab..fb109649ff 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -3411,7 +3411,7 @@ find_slot_in_mapped_hash (struct mapped_index *index, const char *name,
 
 /* A helper function that reads the .gdb_index from SECTION and fills
    in MAP.  FILENAME is the name of the file containing the section;
-   it is used for error reporting.  DEPRECATED_OK is nonzero if it is
+   it is used for error reporting.  DEPRECATED_OK is true if it is
    ok to use deprecated sections.
 
    CU_LIST, CU_LIST_ELEMENTS, TYPES_LIST, and TYPES_LIST_ELEMENTS are
@@ -3420,10 +3420,10 @@ find_slot_in_mapped_hash (struct mapped_index *index, const char *name,
 
    Returns 1 if all went well, 0 otherwise.  */
 
-static int
+static bool
 read_index_from_section (struct objfile *objfile,
 			 const char *filename,
-			 int deprecated_ok,
+			 bool deprecated_ok,
 			 struct dwarf2_section_info *section,
 			 struct mapped_index *map,
 			 const gdb_byte **cu_list,