diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1bd2f138ada..1bdd652b632 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2021-04-01  Simon Marchi  <simon.marchi@efficios.com>
+
+	* gdbtypes.h (TYPE_FLAG_ENUM): Remove, replace all uses
+	with type::is_flag_enum.
+
 2021-04-01  Simon Marchi  <simon.marchi@efficios.com>
 
 	* gdbtypes.h (struct type) <is_flag_enum,
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index 52c17532692..bb4d26eef1a 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -220,8 +220,6 @@ DEF_ENUM_FLAGS_TYPE (enum type_instance_flag_value, type_instance_flags);
 
 #define TYPE_NOTTEXT(t)	(((t)->instance_flags ()) & TYPE_INSTANCE_FLAG_NOTTEXT)
 
-#define TYPE_FLAG_ENUM(t) ((t)->is_flag_enum ())
-
 /* * Constant type.  If this is set, the corresponding type has a
    const modifier.  */
 
diff --git a/gdb/valprint.c b/gdb/valprint.c
index baf50f76b60..654552aa42e 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -616,7 +616,7 @@ generic_val_print_enum_1 (struct type *type, LONGEST val,
       fputs_styled (TYPE_FIELD_NAME (type, i), variable_name_style.style (),
 		    stream);
     }
-  else if (TYPE_FLAG_ENUM (type))
+  else if (type->is_flag_enum ())
     {
       int first = 1;