diff --git a/gcc/config/riscv/riscv-vsetvl.cc b/gcc/config/riscv/riscv-vsetvl.cc
index 7d748edc0eff0185285ea3dbec1e7a705156e64e..df7ed149388a065d5721aec3405cf0aa87e3b148 100644
--- a/gcc/config/riscv/riscv-vsetvl.cc
+++ b/gcc/config/riscv/riscv-vsetvl.cc
@@ -1668,7 +1668,7 @@ private:
   }
   inline void use_max_sew (vsetvl_info &prev, const vsetvl_info &next)
   {
-    auto max_sew = std::max (prev.get_sew (), next.get_sew ());
+    int max_sew = MAX (prev.get_sew (), next.get_sew ());
     prev.set_sew (max_sew);
     use_min_of_max_sew (prev, next);
   }
@@ -1702,7 +1702,7 @@ private:
   inline void use_max_sew_and_lmul_with_prev_ratio (vsetvl_info &prev,
 						    const vsetvl_info &next)
   {
-    auto max_sew = std::max (prev.get_sew (), next.get_sew ());
+    int max_sew = MAX (prev.get_sew (), next.get_sew ());
     prev.set_vlmul (calculate_vlmul (max_sew, prev.get_ratio ()));
     prev.set_sew (max_sew);
   }