diff --git a/gcc/config/aarch64/aarch64-sve-builtins-base.cc b/gcc/config/aarch64/aarch64-sve-builtins-base.cc
index 82f9eba5c39..d52454bcf27 100644
--- a/gcc/config/aarch64/aarch64-sve-builtins-base.cc
+++ b/gcc/config/aarch64/aarch64-sve-builtins-base.cc
@@ -177,7 +177,7 @@ public:
 class svac_impl : public function_base
 {
 public:
-  CONSTEXPR svac_impl (int unspec) : m_unspec (unspec) {}
+  constexpr svac_impl (int unspec) : m_unspec (unspec) {}
 
   rtx
   expand (function_expander &e) const override
@@ -209,7 +209,7 @@ public:
 class svadr_bhwd_impl : public function_base
 {
 public:
-  CONSTEXPR svadr_bhwd_impl (unsigned int shift) : m_shift (shift) {}
+  constexpr svadr_bhwd_impl (unsigned int shift) : m_shift (shift) {}
 
   rtx
   expand (function_expander &e) const override
@@ -259,7 +259,7 @@ public:
 class svbrk_binary_impl : public function_base
 {
 public:
-  CONSTEXPR svbrk_binary_impl (int unspec) : m_unspec (unspec) {}
+  constexpr svbrk_binary_impl (int unspec) : m_unspec (unspec) {}
 
   rtx
   expand (function_expander &e) const override
@@ -275,7 +275,7 @@ public:
 class svbrk_unary_impl : public function_base
 {
 public:
-  CONSTEXPR svbrk_unary_impl (int unspec) : m_unspec (unspec) {}
+  constexpr svbrk_unary_impl (int unspec) : m_unspec (unspec) {}
 
   rtx
   expand (function_expander &e) const override
@@ -309,7 +309,7 @@ public:
 class svclast_impl : public quiet<function_base>
 {
 public:
-  CONSTEXPR svclast_impl (int unspec) : m_unspec (unspec) {}
+  constexpr svclast_impl (int unspec) : m_unspec (unspec) {}
 
   rtx
   expand (function_expander &e) const override
@@ -381,7 +381,7 @@ public:
 class svcmp_impl : public function_base
 {
 public:
-  CONSTEXPR svcmp_impl (tree_code code, int unspec_for_fp)
+  constexpr svcmp_impl (tree_code code, int unspec_for_fp)
     : m_code (code), m_unspec_for_fp (unspec_for_fp) {}
 
   gimple *
@@ -437,7 +437,7 @@ public:
 class svcmp_wide_impl : public function_base
 {
 public:
-  CONSTEXPR svcmp_wide_impl (tree_code code, int unspec_for_sint,
+  constexpr svcmp_wide_impl (tree_code code, int unspec_for_sint,
 			     int unspec_for_uint)
     : m_code (code), m_unspec_for_sint (unspec_for_sint),
       m_unspec_for_uint (unspec_for_uint) {}
@@ -512,7 +512,7 @@ public:
 class svcnt_bhwd_impl : public function_base
 {
 public:
-  CONSTEXPR svcnt_bhwd_impl (machine_mode ref_mode) : m_ref_mode (ref_mode) {}
+  constexpr svcnt_bhwd_impl (machine_mode ref_mode) : m_ref_mode (ref_mode) {}
 
   gimple *
   fold (gimple_folder &f) const override
@@ -536,7 +536,7 @@ public:
 class svcnt_bhwd_pat_impl : public svcnt_bhwd_impl
 {
 public:
-  CONSTEXPR svcnt_bhwd_pat_impl (machine_mode ref_mode)
+  constexpr svcnt_bhwd_pat_impl (machine_mode ref_mode)
     : svcnt_bhwd_impl (ref_mode) {}
 
   gimple *
@@ -588,7 +588,7 @@ public:
 class svcreate_impl : public quiet<multi_vector_function>
 {
 public:
-  CONSTEXPR svcreate_impl (unsigned int vectors_per_tuple)
+  constexpr svcreate_impl (unsigned int vectors_per_tuple)
     : quiet<multi_vector_function> (vectors_per_tuple) {}
 
   gimple *
@@ -722,7 +722,7 @@ public:
 class svdotprod_lane_impl : public unspec_based_function_base
 {
 public:
-  CONSTEXPR svdotprod_lane_impl (int unspec_for_sint,
+  constexpr svdotprod_lane_impl (int unspec_for_sint,
 				 int unspec_for_uint,
 				 int unspec_for_float)
     : unspec_based_function_base (unspec_for_sint,
@@ -961,7 +961,7 @@ public:
 class svext_bhw_impl : public function_base
 {
 public:
-  CONSTEXPR svext_bhw_impl (scalar_int_mode from_mode)
+  constexpr svext_bhw_impl (scalar_int_mode from_mode)
     : m_from_mode (from_mode) {}
 
   rtx
@@ -1003,7 +1003,7 @@ public:
 class svget_impl : public quiet<multi_vector_function>
 {
 public:
-  CONSTEXPR svget_impl (unsigned int vectors_per_tuple)
+  constexpr svget_impl (unsigned int vectors_per_tuple)
     : quiet<multi_vector_function> (vectors_per_tuple) {}
 
   gimple *
@@ -1066,7 +1066,7 @@ public:
 class svlast_impl : public quiet<function_base>
 {
 public:
-  CONSTEXPR svlast_impl (int unspec) : m_unspec (unspec) {}
+  constexpr svlast_impl (int unspec) : m_unspec (unspec) {}
 
   rtx
   expand (function_expander &e) const override
@@ -1118,7 +1118,7 @@ public:
 class svld1_extend_impl : public extending_load
 {
 public:
-  CONSTEXPR svld1_extend_impl (type_suffix_index memory_type)
+  constexpr svld1_extend_impl (type_suffix_index memory_type)
     : extending_load (memory_type) {}
 
   rtx
@@ -1158,7 +1158,7 @@ public:
 class svld1_gather_extend_impl : public extending_load
 {
 public:
-  CONSTEXPR svld1_gather_extend_impl (type_suffix_index memory_type)
+  constexpr svld1_gather_extend_impl (type_suffix_index memory_type)
     : extending_load (memory_type) {}
 
   rtx
@@ -1289,7 +1289,7 @@ public:
 class svld234_impl : public full_width_access
 {
 public:
-  CONSTEXPR svld234_impl (unsigned int vectors_per_tuple)
+  constexpr svld234_impl (unsigned int vectors_per_tuple)
     : full_width_access (vectors_per_tuple) {}
 
   unsigned int
@@ -1372,7 +1372,7 @@ public:
 class svldff1_gather_extend : public extending_load
 {
 public:
-  CONSTEXPR svldff1_gather_extend (type_suffix_index memory_type)
+  constexpr svldff1_gather_extend (type_suffix_index memory_type)
     : extending_load (memory_type) {}
 
   rtx
@@ -1416,7 +1416,7 @@ public:
 class svldxf1_impl : public full_width_access
 {
 public:
-  CONSTEXPR svldxf1_impl (int unspec) : m_unspec (unspec) {}
+  constexpr svldxf1_impl (int unspec) : m_unspec (unspec) {}
 
   unsigned int
   call_properties (const function_instance &) const override
@@ -1443,7 +1443,7 @@ public:
 class svldxf1_extend_impl : public extending_load
 {
 public:
-  CONSTEXPR svldxf1_extend_impl (type_suffix_index memory_type, int unspec)
+  constexpr svldxf1_extend_impl (type_suffix_index memory_type, int unspec)
     : extending_load (memory_type), m_unspec (unspec) {}
 
   unsigned int
@@ -1633,7 +1633,7 @@ public:
 class svnot_impl : public rtx_code_function
 {
 public:
-  CONSTEXPR svnot_impl () : rtx_code_function (NOT, NOT, -1) {}
+  constexpr svnot_impl () : rtx_code_function (NOT, NOT, -1) {}
 
   rtx
   expand (function_expander &e) const override
@@ -1681,7 +1681,7 @@ public:
 class svpfirst_svpnext_impl : public function_base
 {
 public:
-  CONSTEXPR svpfirst_svpnext_impl (int unspec) : m_unspec (unspec) {}
+  constexpr svpfirst_svpnext_impl (int unspec) : m_unspec (unspec) {}
 
   rtx
   expand (function_expander &e) const override
@@ -1699,7 +1699,7 @@ public:
 class svprf_bhwd_impl : public function_base
 {
 public:
-  CONSTEXPR svprf_bhwd_impl (machine_mode mode) : m_mode (mode) {}
+  constexpr svprf_bhwd_impl (machine_mode mode) : m_mode (mode) {}
 
   unsigned int
   call_properties (const function_instance &) const override
@@ -1723,7 +1723,7 @@ public:
 class svprf_bhwd_gather_impl : public function_base
 {
 public:
-  CONSTEXPR svprf_bhwd_gather_impl (machine_mode mode) : m_mode (mode) {}
+  constexpr svprf_bhwd_gather_impl (machine_mode mode) : m_mode (mode) {}
 
   unsigned int
   call_properties (const function_instance &) const override
@@ -1761,7 +1761,7 @@ public:
 class svptest_impl : public function_base
 {
 public:
-  CONSTEXPR svptest_impl (rtx_code compare) : m_compare (compare) {}
+  constexpr svptest_impl (rtx_code compare) : m_compare (compare) {}
 
   rtx
   expand (function_expander &e) const override
@@ -1866,7 +1866,7 @@ public:
 class svqdec_svqinc_bhwd_impl : public function_base
 {
 public:
-  CONSTEXPR svqdec_svqinc_bhwd_impl (rtx_code code_for_sint,
+  constexpr svqdec_svqinc_bhwd_impl (rtx_code code_for_sint,
 				     rtx_code code_for_uint,
 				     scalar_int_mode elem_mode)
     : m_code_for_sint (code_for_sint),
@@ -1913,7 +1913,7 @@ public:
 class svqdec_bhwd_impl : public svqdec_svqinc_bhwd_impl
 {
 public:
-  CONSTEXPR svqdec_bhwd_impl (scalar_int_mode elem_mode)
+  constexpr svqdec_bhwd_impl (scalar_int_mode elem_mode)
     : svqdec_svqinc_bhwd_impl (SS_MINUS, US_MINUS, elem_mode) {}
 };
 
@@ -1921,7 +1921,7 @@ public:
 class svqinc_bhwd_impl : public svqdec_svqinc_bhwd_impl
 {
 public:
-  CONSTEXPR svqinc_bhwd_impl (scalar_int_mode elem_mode)
+  constexpr svqinc_bhwd_impl (scalar_int_mode elem_mode)
     : svqdec_svqinc_bhwd_impl (SS_PLUS, US_PLUS, elem_mode) {}
 };
 
@@ -1929,7 +1929,7 @@ public:
 class svqdecp_svqincp_impl : public function_base
 {
 public:
-  CONSTEXPR svqdecp_svqincp_impl (rtx_code code_for_sint,
+  constexpr svqdecp_svqincp_impl (rtx_code code_for_sint,
 				  rtx_code code_for_uint)
     : m_code_for_sint (code_for_sint),
       m_code_for_uint (code_for_uint)
@@ -2070,7 +2070,7 @@ public:
 class svset_impl : public quiet<multi_vector_function>
 {
 public:
-  CONSTEXPR svset_impl (unsigned int vectors_per_tuple)
+  constexpr svset_impl (unsigned int vectors_per_tuple)
     : quiet<multi_vector_function> (vectors_per_tuple) {}
 
   gimple *
@@ -2199,7 +2199,7 @@ public:
 class svst1_scatter_truncate_impl : public truncating_store
 {
 public:
-  CONSTEXPR svst1_scatter_truncate_impl (scalar_int_mode to_mode)
+  constexpr svst1_scatter_truncate_impl (scalar_int_mode to_mode)
     : truncating_store (to_mode) {}
 
   rtx
@@ -2219,7 +2219,7 @@ public:
 class svst1_truncate_impl : public truncating_store
 {
 public:
-  CONSTEXPR svst1_truncate_impl (scalar_int_mode to_mode)
+  constexpr svst1_truncate_impl (scalar_int_mode to_mode)
     : truncating_store (to_mode) {}
 
   rtx
@@ -2235,7 +2235,7 @@ public:
 class svst234_impl : public full_width_access
 {
 public:
-  CONSTEXPR svst234_impl (unsigned int vectors_per_tuple)
+  constexpr svst234_impl (unsigned int vectors_per_tuple)
     : full_width_access (vectors_per_tuple) {}
 
   unsigned int
@@ -2296,7 +2296,7 @@ public:
 class svsub_impl : public rtx_code_function
 {
 public:
-  CONSTEXPR svsub_impl ()
+  constexpr svsub_impl ()
     : rtx_code_function (MINUS, MINUS, UNSPEC_COND_FSUB) {}
 
   rtx
@@ -2325,7 +2325,7 @@ public:
 class svtrn_impl : public binary_permute
 {
 public:
-  CONSTEXPR svtrn_impl (int base)
+  constexpr svtrn_impl (int base)
     : binary_permute (base ? UNSPEC_TRN2 : UNSPEC_TRN1), m_base (base) {}
 
   gimple *
@@ -2351,7 +2351,7 @@ public:
 class svundef_impl : public quiet<multi_vector_function>
 {
 public:
-  CONSTEXPR svundef_impl (unsigned int vectors_per_tuple)
+  constexpr svundef_impl (unsigned int vectors_per_tuple)
     : quiet<multi_vector_function> (vectors_per_tuple) {}
 
   rtx
@@ -2367,7 +2367,7 @@ public:
 class svunpk_impl : public quiet<function_base>
 {
 public:
-  CONSTEXPR svunpk_impl (bool high_p) : m_high_p (high_p) {}
+  constexpr svunpk_impl (bool high_p) : m_high_p (high_p) {}
 
   gimple *
   fold (gimple_folder &f) const override
@@ -2409,7 +2409,7 @@ public:
 class svusdot_impl : public function_base
 {
 public:
-  CONSTEXPR svusdot_impl (bool su) : m_su (su) {}
+  constexpr svusdot_impl (bool su) : m_su (su) {}
 
   rtx
   expand (function_expander &e) const override
@@ -2437,7 +2437,7 @@ private:
 class svuzp_impl : public binary_permute
 {
 public:
-  CONSTEXPR svuzp_impl (unsigned int base)
+  constexpr svuzp_impl (unsigned int base)
     : binary_permute (base ? UNSPEC_UZP2 : UNSPEC_UZP1), m_base (base) {}
 
   gimple *
@@ -2460,7 +2460,7 @@ public:
 class svwhilelx_impl : public while_comparison
 {
 public:
-  CONSTEXPR svwhilelx_impl (int unspec_for_sint, int unspec_for_uint, bool eq_p)
+  constexpr svwhilelx_impl (int unspec_for_sint, int unspec_for_uint, bool eq_p)
     : while_comparison (unspec_for_sint, unspec_for_uint), m_eq_p (eq_p)
   {}
 
@@ -2547,7 +2547,7 @@ public:
 class svzip_impl : public binary_permute
 {
 public:
-  CONSTEXPR svzip_impl (unsigned int base)
+  constexpr svzip_impl (unsigned int base)
     : binary_permute (base ? UNSPEC_ZIP2 : UNSPEC_ZIP1), m_base (base) {}
 
   gimple *
diff --git a/gcc/config/aarch64/aarch64-sve-builtins-functions.h b/gcc/config/aarch64/aarch64-sve-builtins-functions.h
index b8a86e33d5c..120b7266943 100644
--- a/gcc/config/aarch64/aarch64-sve-builtins-functions.h
+++ b/gcc/config/aarch64/aarch64-sve-builtins-functions.h
@@ -30,17 +30,17 @@ template<typename T>
 class quiet : public T
 {
 public:
-  CONSTEXPR quiet () : T () {}
+  constexpr quiet () : T () {}
 
   /* Unfortunately we can't use parameter packs yet.  */
   template<typename T1>
-  CONSTEXPR quiet (const T1 &t1) : T (t1) {}
+  constexpr quiet (const T1 &t1) : T (t1) {}
 
   template<typename T1, typename T2>
-  CONSTEXPR quiet (const T1 &t1, const T2 &t2) : T (t1, t2) {}
+  constexpr quiet (const T1 &t1, const T2 &t2) : T (t1, t2) {}
 
   template<typename T1, typename T2, typename T3>
-  CONSTEXPR quiet (const T1 &t1, const T2 &t2, const T3 &t3)
+  constexpr quiet (const T1 &t1, const T2 &t2, const T3 &t3)
     : T (t1, t2, t3) {}
 
   unsigned int
@@ -55,7 +55,7 @@ public:
 class multi_vector_function : public function_base
 {
 public:
-  CONSTEXPR multi_vector_function (unsigned int vectors_per_tuple)
+  constexpr multi_vector_function (unsigned int vectors_per_tuple)
     : m_vectors_per_tuple (vectors_per_tuple) {}
 
   unsigned int
@@ -74,7 +74,7 @@ public:
 class full_width_access : public multi_vector_function
 {
 public:
-  CONSTEXPR full_width_access (unsigned int vectors_per_tuple = 1)
+  constexpr full_width_access (unsigned int vectors_per_tuple = 1)
     : multi_vector_function (vectors_per_tuple) {}
 
   tree
@@ -99,7 +99,7 @@ public:
 class extending_load : public function_base
 {
 public:
-  CONSTEXPR extending_load (type_suffix_index memory_type)
+  constexpr extending_load (type_suffix_index memory_type)
     : m_memory_type (memory_type) {}
 
   unsigned int
@@ -142,7 +142,7 @@ public:
 class truncating_store : public function_base
 {
 public:
-  CONSTEXPR truncating_store (scalar_int_mode to_mode) : m_to_mode (to_mode) {}
+  constexpr truncating_store (scalar_int_mode to_mode) : m_to_mode (to_mode) {}
 
   unsigned int
   call_properties (const function_instance &) const override
@@ -179,7 +179,7 @@ public:
 class rtx_code_function_base : public function_base
 {
 public:
-  CONSTEXPR rtx_code_function_base (rtx_code code_for_sint,
+  constexpr rtx_code_function_base (rtx_code code_for_sint,
 				    rtx_code code_for_uint,
 				    int unspec_for_fp = -1)
     : m_code_for_sint (code_for_sint), m_code_for_uint (code_for_uint),
@@ -200,7 +200,7 @@ public:
 class rtx_code_function : public rtx_code_function_base
 {
 public:
-  CONSTEXPR rtx_code_function (rtx_code code_for_sint, rtx_code code_for_uint,
+  constexpr rtx_code_function (rtx_code code_for_sint, rtx_code code_for_uint,
 			       int unspec_for_fp = -1)
     : rtx_code_function_base (code_for_sint, code_for_uint, unspec_for_fp) {}
 
@@ -219,7 +219,7 @@ public:
 class rtx_code_function_rotated : public rtx_code_function_base
 {
 public:
-  CONSTEXPR rtx_code_function_rotated (rtx_code code_for_sint,
+  constexpr rtx_code_function_rotated (rtx_code code_for_sint,
 				       rtx_code code_for_uint,
 				       int unspec_for_fp = -1)
     : rtx_code_function_base (code_for_sint, code_for_uint, unspec_for_fp) {}
@@ -243,7 +243,7 @@ public:
 class unspec_based_function_base : public function_base
 {
 public:
-  CONSTEXPR unspec_based_function_base (int unspec_for_sint,
+  constexpr unspec_based_function_base (int unspec_for_sint,
 					int unspec_for_uint,
 					int unspec_for_fp)
     : m_unspec_for_sint (unspec_for_sint),
@@ -272,7 +272,7 @@ public:
 class unspec_based_function : public unspec_based_function_base
 {
 public:
-  CONSTEXPR unspec_based_function (int unspec_for_sint, int unspec_for_uint,
+  constexpr unspec_based_function (int unspec_for_sint, int unspec_for_uint,
 				   int unspec_for_fp)
     : unspec_based_function_base (unspec_for_sint, unspec_for_uint,
 				  unspec_for_fp)
@@ -293,7 +293,7 @@ public:
 class unspec_based_function_rotated : public unspec_based_function_base
 {
 public:
-  CONSTEXPR unspec_based_function_rotated (int unspec_for_sint,
+  constexpr unspec_based_function_rotated (int unspec_for_sint,
 					   int unspec_for_uint,
 					   int unspec_for_fp)
     : unspec_based_function_base (unspec_for_sint, unspec_for_uint,
@@ -321,7 +321,7 @@ template<insn_code (*CODE) (int, machine_mode)>
 class unspec_based_function_exact_insn : public unspec_based_function_base
 {
 public:
-  CONSTEXPR unspec_based_function_exact_insn (int unspec_for_sint,
+  constexpr unspec_based_function_exact_insn (int unspec_for_sint,
 					      int unspec_for_uint,
 					      int unspec_for_fp)
     : unspec_based_function_base (unspec_for_sint, unspec_for_uint,
@@ -378,7 +378,7 @@ template<insn_code (*INT_CODE) (int, machine_mode)>
 class unspec_based_fused_function : public unspec_based_function_base
 {
 public:
-  CONSTEXPR unspec_based_fused_function (int unspec_for_sint,
+  constexpr unspec_based_fused_function (int unspec_for_sint,
 					 int unspec_for_uint,
 					 int unspec_for_fp)
     : unspec_based_function_base (unspec_for_sint, unspec_for_uint,
@@ -413,7 +413,7 @@ template<insn_code (*INT_CODE) (int, machine_mode)>
 class unspec_based_fused_lane_function : public unspec_based_function_base
 {
 public:
-  CONSTEXPR unspec_based_fused_lane_function (int unspec_for_sint,
+  constexpr unspec_based_fused_lane_function (int unspec_for_sint,
 					      int unspec_for_uint,
 					      int unspec_for_fp)
     : unspec_based_function_base (unspec_for_sint, unspec_for_uint,
@@ -474,7 +474,7 @@ public:
 class fixed_insn_function : public function_base
 {
 public:
-  CONSTEXPR fixed_insn_function (insn_code code) : m_code (code) {}
+  constexpr fixed_insn_function (insn_code code) : m_code (code) {}
 
   rtx
   expand (function_expander &e) const override
@@ -516,7 +516,7 @@ public:
 class binary_permute : public permute
 {
 public:
-  CONSTEXPR binary_permute (int unspec) : m_unspec (unspec) {}
+  constexpr binary_permute (int unspec) : m_unspec (unspec) {}
 
   rtx
   expand (function_expander &e) const override
@@ -533,13 +533,13 @@ public:
 class reduction : public function_base
 {
 public:
-  CONSTEXPR reduction (int unspec)
+  constexpr reduction (int unspec)
     : m_unspec_for_sint (unspec),
       m_unspec_for_uint (unspec),
       m_unspec_for_fp (unspec)
   {}
 
-  CONSTEXPR reduction (int unspec_for_sint, int unspec_for_uint,
+  constexpr reduction (int unspec_for_sint, int unspec_for_uint,
 		       int unspec_for_fp)
     : m_unspec_for_sint (unspec_for_sint),
       m_unspec_for_uint (unspec_for_uint),
@@ -572,7 +572,7 @@ public:
 class shift_wide : public function_base
 {
 public:
-  CONSTEXPR shift_wide (rtx_code code, int wide_unspec)
+  constexpr shift_wide (rtx_code code, int wide_unspec)
     : m_code (code), m_wide_unspec (wide_unspec) {}
 
   rtx
@@ -607,7 +607,7 @@ public:
 class unary_count : public quiet<function_base>
 {
 public:
-  CONSTEXPR unary_count (rtx_code code) : m_code (code) {}
+  constexpr unary_count (rtx_code code) : m_code (code) {}
 
   rtx
   expand (function_expander &e) const override
@@ -630,7 +630,7 @@ public:
 class while_comparison : public function_base
 {
 public:
-  CONSTEXPR while_comparison (int unspec_for_sint, int unspec_for_uint)
+  constexpr while_comparison (int unspec_for_sint, int unspec_for_uint)
     : m_unspec_for_sint (unspec_for_sint),
       m_unspec_for_uint (unspec_for_uint)
   {}
@@ -659,7 +659,7 @@ public:
 /* Declare the global function base NAME, creating it from an instance
    of class CLASS with constructor arguments ARGS.  */
 #define FUNCTION(NAME, CLASS, ARGS) \
-  namespace { static CONSTEXPR const CLASS NAME##_obj ARGS; } \
+  namespace { static constexpr const CLASS NAME##_obj ARGS; } \
   namespace functions { const function_base *const NAME = &NAME##_obj; }
 
 #endif
diff --git a/gcc/config/aarch64/aarch64-sve-builtins-shapes.cc b/gcc/config/aarch64/aarch64-sve-builtins-shapes.cc
index 8e26bd8a60f..bf1d05e5b8c 100644
--- a/gcc/config/aarch64/aarch64-sve-builtins-shapes.cc
+++ b/gcc/config/aarch64/aarch64-sve-builtins-shapes.cc
@@ -447,7 +447,7 @@ long_type_suffix (function_resolver &r, type_suffix_index type)
 /* Declare the function shape NAME, pointing it to an instance
    of class <NAME>_def.  */
 #define SHAPE(NAME) \
-  static CONSTEXPR const NAME##_def NAME##_obj; \
+  static constexpr const NAME##_def NAME##_obj; \
   namespace shapes { const function_shape *const NAME = &NAME##_obj; }
 
 /* Base class for functions that are not overloaded.  */
@@ -587,7 +587,7 @@ struct binary_imm_long_base : public overloaded_base<0>
 /* Base class for inc_dec and inc_dec_pat.  */
 struct inc_dec_base : public overloaded_base<0>
 {
-  CONSTEXPR inc_dec_base (bool pat_p) : m_pat_p (pat_p) {}
+  constexpr inc_dec_base (bool pat_p) : m_pat_p (pat_p) {}
 
   /* Resolve based on the first argument only, which must be either a
      scalar or a vector.  If it's a scalar, it must be a 32-bit or
@@ -1924,7 +1924,7 @@ SHAPE (get)
    whose size is tied to the [bhwd] suffix of "svfoo".  */
 struct inc_dec_def : public inc_dec_base
 {
-  CONSTEXPR inc_dec_def () : inc_dec_base (false) {}
+  constexpr inc_dec_def () : inc_dec_base (false) {}
 
   void
   build (function_builder &b, const function_group_info &group) const override
@@ -1949,7 +1949,7 @@ SHAPE (inc_dec)
    whose size is tied to the [bhwd] suffix of "svfoo".  */
 struct inc_dec_pat_def : public inc_dec_base
 {
-  CONSTEXPR inc_dec_pat_def () : inc_dec_base (true) {}
+  constexpr inc_dec_pat_def () : inc_dec_base (true) {}
 
   void
   build (function_builder &b, const function_group_info &group) const override
diff --git a/gcc/config/aarch64/aarch64-sve-builtins-sve2.cc b/gcc/config/aarch64/aarch64-sve-builtins-sve2.cc
index c0104371a22..9eb0bdda12e 100644
--- a/gcc/config/aarch64/aarch64-sve-builtins-sve2.cc
+++ b/gcc/config/aarch64/aarch64-sve-builtins-sve2.cc
@@ -138,7 +138,7 @@ public:
 class svldnt1_gather_extend_impl : public extending_load
 {
 public:
-  CONSTEXPR svldnt1_gather_extend_impl (type_suffix_index memory_type)
+  constexpr svldnt1_gather_extend_impl (type_suffix_index memory_type)
     : extending_load (memory_type) {}
 
   rtx
@@ -159,7 +159,7 @@ public:
 class svmatch_svnmatch_impl : public function_base
 {
 public:
-  CONSTEXPR svmatch_svnmatch_impl (int unspec) : m_unspec (unspec) {}
+  constexpr svmatch_svnmatch_impl (int unspec) : m_unspec (unspec) {}
 
   rtx
   expand (function_expander &e) const override
@@ -178,7 +178,7 @@ public:
 class svmovl_lb_impl : public unspec_based_function_base
 {
 public:
-  CONSTEXPR svmovl_lb_impl (int unspec_for_sint, int unspec_for_uint,
+  constexpr svmovl_lb_impl (int unspec_for_sint, int unspec_for_uint,
 			    int unspec_for_fp)
     : unspec_based_function_base (unspec_for_sint, unspec_for_uint,
 				  unspec_for_fp)
@@ -238,7 +238,7 @@ public:
 class svqrshl_impl : public unspec_based_function
 {
 public:
-  CONSTEXPR svqrshl_impl ()
+  constexpr svqrshl_impl ()
     : unspec_based_function (UNSPEC_SQRSHL, UNSPEC_UQRSHL, -1) {}
 
   gimple *
@@ -272,7 +272,7 @@ public:
 class svqshl_impl : public unspec_based_function
 {
 public:
-  CONSTEXPR svqshl_impl ()
+  constexpr svqshl_impl ()
     : unspec_based_function (UNSPEC_SQSHL, UNSPEC_UQSHL, -1) {}
 
   gimple *
@@ -308,7 +308,7 @@ public:
 class svrshl_impl : public unspec_based_function
 {
 public:
-  CONSTEXPR svrshl_impl ()
+  constexpr svrshl_impl ()
     : unspec_based_function (UNSPEC_SRSHL, UNSPEC_URSHL, -1) {}
 
   gimple *
@@ -393,7 +393,7 @@ public:
 class svstnt1_scatter_truncate_impl : public truncating_store
 {
 public:
-  CONSTEXPR svstnt1_scatter_truncate_impl (scalar_int_mode to_mode)
+  constexpr svstnt1_scatter_truncate_impl (scalar_int_mode to_mode)
     : truncating_store (to_mode) {}
 
   rtx
@@ -409,7 +409,7 @@ public:
 class svtbl2_impl : public quiet<multi_vector_function>
 {
 public:
-  CONSTEXPR svtbl2_impl () : quiet<multi_vector_function> (2) {}
+  constexpr svtbl2_impl () : quiet<multi_vector_function> (2) {}
 
   rtx
   expand (function_expander &e) const override
@@ -437,7 +437,7 @@ public:
 class svwhilerw_svwhilewr_impl : public full_width_access
 {
 public:
-  CONSTEXPR svwhilerw_svwhilewr_impl (int unspec) : m_unspec (unspec) {}
+  constexpr svwhilerw_svwhilewr_impl (int unspec) : m_unspec (unspec) {}
 
   rtx
   expand (function_expander &e) const override
diff --git a/gcc/config/aarch64/aarch64-sve-builtins.cc b/gcc/config/aarch64/aarch64-sve-builtins.cc
index a70e3a6b471..63b1358c138 100644
--- a/gcc/config/aarch64/aarch64-sve-builtins.cc
+++ b/gcc/config/aarch64/aarch64-sve-builtins.cc
@@ -99,7 +99,7 @@ struct registered_function_hasher : nofree_ptr_hash <registered_function>
 };
 
 /* Information about each single-predicate or single-vector type.  */
-static CONSTEXPR const vector_type_info vector_types[] = {
+static constexpr const vector_type_info vector_types[] = {
 #define DEF_SVE_TYPE(ACLE_NAME, NCHARS, ABI_NAME, SCALAR_TYPE) \
   { #ACLE_NAME, #ABI_NAME, "u" #NCHARS #ABI_NAME },
 #include "aarch64-sve-builtins.def"
@@ -116,7 +116,7 @@ static const char *const pred_suffixes[NUM_PREDS + 1] = {
 };
 
 /* Static information about each mode_suffix_index.  */
-CONSTEXPR const mode_suffix_info mode_suffixes[] = {
+constexpr const mode_suffix_info mode_suffixes[] = {
 #define VECTOR_TYPE_none NUM_VECTOR_TYPES
 #define DEF_SVE_MODE(NAME, BASE, DISPLACEMENT, UNITS) \
   { "_" #NAME, VECTOR_TYPE_##BASE, VECTOR_TYPE_##DISPLACEMENT, UNITS_##UNITS },
@@ -126,7 +126,7 @@ CONSTEXPR const mode_suffix_info mode_suffixes[] = {
 };
 
 /* Static information about each type_suffix_index.  */
-CONSTEXPR const type_suffix_info type_suffixes[NUM_TYPE_SUFFIXES + 1] = {
+constexpr const type_suffix_info type_suffixes[NUM_TYPE_SUFFIXES + 1] = {
 #define DEF_SVE_TYPE_SUFFIX(NAME, ACLE_TYPE, CLASS, BITS, MODE) \
   { "_" #NAME, \
     VECTOR_TYPE_##ACLE_TYPE, \
@@ -522,7 +522,7 @@ static const predication_index preds_z_or_none[] = {
 static const predication_index preds_z[] = { PRED_z, NUM_PREDS };
 
 /* A list of all SVE ACLE functions.  */
-static CONSTEXPR const function_group_info function_groups[] = {
+static constexpr const function_group_info function_groups[] = {
 #define DEF_SVE_FUNCTION(NAME, SHAPE, TYPES, PREDS) \
   { #NAME, &functions::NAME, &shapes::SHAPE, types_##TYPES, preds_##PREDS, \
     REQUIRED_EXTENSIONS | AARCH64_FL_SVE },
