diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bc635d6114..06b94b265f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2018-02-06  Yao Qi  <yao.qi@linaro.org>
+
+	* expprint.c (print_subexp_standard): Handle
+	OP_F77_UNDETERMINED_ARGLIST.
+	(dump_subexp_body_standard): Likewise.
+
 2018-02-05  Alan Hayward  <alan.hayward@arm.com>
 
 	* target-descriptions.c (tdesc_element_visitor) Add empty
diff --git a/gdb/expprint.c b/gdb/expprint.c
index ac5ae0fea1..9d1884f290 100644
--- a/gdb/expprint.c
+++ b/gdb/expprint.c
@@ -186,6 +186,7 @@ print_subexp_standard (struct expression *exp, int *pos,
       return;
 
     case OP_FUNCALL:
+    case OP_F77_UNDETERMINED_ARGLIST:
       (*pos) += 2;
       nargs = longest_to_int (exp->elts[pc + 1].longconst);
       print_subexp (exp, pos, stream, PREC_SUFFIX);
@@ -923,6 +924,7 @@ dump_subexp_body_standard (struct expression *exp,
       elt += 2;
       break;
     case OP_FUNCALL:
+    case OP_F77_UNDETERMINED_ARGLIST:
       {
 	int i, nargs;
 
@@ -1123,7 +1125,6 @@ dump_subexp_body_standard (struct expression *exp,
     default:
     case OP_NULL:
     case MULTI_SUBSCRIPT:
-    case OP_F77_UNDETERMINED_ARGLIST:
     case OP_COMPLEX:
     case OP_BOOL:
     case OP_M2_STRING: