diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 90dacd2832..6709f44573 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-19  Yao Qi  <yao.qi@linaro.org>
+
+	* osabi.c (gdb_osabi_names): Extend the regexp for
+	arm-linux-gnueabihf.
+
 2018-01-18  Yao Qi  <yao.qi@linaro.org>
 
 	* dwarf2read.c (abbrev_table) <abbrevs>: Rename it to
diff --git a/gdb/osabi.c b/gdb/osabi.c
index 129164f51e..fd44deb9fa 100644
--- a/gdb/osabi.c
+++ b/gdb/osabi.c
@@ -63,7 +63,7 @@ static const struct osabi_names gdb_osabi_names[] =
   { "SVR4", NULL },
   { "GNU/Hurd", NULL },
   { "Solaris", NULL },
-  { "GNU/Linux", "linux(-gnu)?" },
+  { "GNU/Linux", "linux(-gnu[^-]*)?" },
   { "FreeBSD", NULL },
   { "NetBSD", NULL },
   { "OpenBSD", NULL },