diff --git a/elfcpp/dwarf.h b/elfcpp/dwarf.h
index 2adb8642019..90d12f595ea 100644
--- a/elfcpp/dwarf.h
+++ b/elfcpp/dwarf.h
@@ -247,6 +247,15 @@ enum DW_LANG
   DW_LANG_C_plus_plus_14 = 0x0021,
   DW_LANG_Fortran03 = 0x0022,
   DW_LANG_Fortran08 = 0x0023,
+  DW_LANG_C_plus_plus_20 = 0x002b,
+  DW_LANG_C17 = 0x002c,
+  DW_LANG_Ada2005 = 0x002e,
+  DW_LANG_Ada2012 = 0x002f,
+  DW_LANG_Assembly = 0x0031,
+  DW_LANG_Fortran18 = 0x002d,
+  DW_LANG_C_plus_plus_23 = 0x003a,
+  DW_LANG_C23 = 0x003e,
+  DW_LANG_Fortran23 = 0x003fi,
 
   DW_LANG_lo_user = 0x8000,	// Implementation-defined range start.
   DW_LANG_hi_user = 0xffff,	// Implementation-defined range start.
diff --git a/gold/gdb-index.cc b/gold/gdb-index.cc
index 4d0ae0941b5..2f2164603dd 100644
--- a/gold/gdb-index.cc
+++ b/gold/gdb-index.cc
@@ -371,9 +371,13 @@ Gdb_index_info_reader::visit_top_die(Dwarf_die* die)
 		|| this->cu_language_ == elfcpp::DW_LANG_Fortran90
 		|| this->cu_language_ == elfcpp::DW_LANG_Java
 		|| this->cu_language_ == elfcpp::DW_LANG_Ada95
+		|| this->cu_language_ == elfcpp::DW_LANG_Ada2005
+		|| this->cu_language_ == elfcpp::DW_LANG_Ada2012
 		|| this->cu_language_ == elfcpp::DW_LANG_Fortran95
 		|| this->cu_language_ == elfcpp::DW_LANG_Fortran03
-		|| this->cu_language_ == elfcpp::DW_LANG_Fortran08)
+		|| this->cu_language_ == elfcpp::DW_LANG_Fortran08
+		|| this->cu_language_ == elfcpp::DW_LANG_Fortran18
+		|| this->cu_language_ == elfcpp::DW_LANG_Fortran23)
 	      {
 		gold_warning(_("%s: --gdb-index currently supports "
 			       "only C and C++ languages"),