From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2093) id 6857D3854145; Mon, 31 Oct 2022 13:38:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6857D3854145 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667223497; bh=H2jIJ+jbYEMBe5TLWn3P93GK5LV+ekPY6XSEz8ijQAE=; h=From:To:Subject:Date:From; b=qI9aae62c1yiHtuP2JTbA4SnKDcLieHmamkGd6MicBY42JlXWUwb6JsnJFRpNkq49 SEg8GOjRL8DHgU8C3XsFPpiU0dc89Yim+Me7aqEKZP+oo89tZc6nUjY8uqjLYEiGII sInB/+SrUQ3OEIHwPNqjJ8o/Y1GLZhTaGiHjn7CI= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Kito Cheng To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-3576] RISC-V: Change constexpr back to CONSTEXPR X-Act-Checkin: gcc X-Git-Author: Ju-Zhe Zhong X-Git-Refname: refs/heads/master X-Git-Oldrev: 10aa0356118f44e5f4d720a2a4c731b173baa298 X-Git-Newrev: 1b07d374765dd811cbb8b3e05764aef3b1754ff2 Message-Id: <20221031133817.6857D3854145@sourceware.org> Date: Mon, 31 Oct 2022 13:38:10 +0000 (GMT) List-Id: https://gcc.gnu.org/g:1b07d374765dd811cbb8b3e05764aef3b1754ff2 commit r13-3576-g1b07d374765dd811cbb8b3e05764aef3b1754ff2 Author: Ju-Zhe Zhong Date: Thu Oct 27 22:41:52 2022 +0800 RISC-V: Change constexpr back to CONSTEXPR According to https://github.com/gcc-mirror/gcc/commit/f95d3d5de72a1c43e8d529bad3ef59afc3214705. Since GCC 4.8.6 doesn't support constexpr, we should change it back to CONSTEXPR. gcc/ChangeLog: * config/riscv/riscv-vector-builtins-bases.cc: Change constexpr back to CONSTEXPR. * config/riscv/riscv-vector-builtins-shapes.cc (SHAPE): Ditto. * config/riscv/riscv-vector-builtins.cc (struct registered_function_hasher): Ditto. * config/riscv/riscv-vector-builtins.h (struct rvv_arg_type_info): Ditto. Diff: --- gcc/config/riscv/riscv-vector-builtins-bases.cc | 4 ++-- gcc/config/riscv/riscv-vector-builtins-shapes.cc | 2 +- gcc/config/riscv/riscv-vector-builtins.cc | 14 +++++++------- gcc/config/riscv/riscv-vector-builtins.h | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gcc/config/riscv/riscv-vector-builtins-bases.cc b/gcc/config/riscv/riscv-vector-builtins-bases.cc index 713a7566e29..231b63a610d 100644 --- a/gcc/config/riscv/riscv-vector-builtins-bases.cc +++ b/gcc/config/riscv/riscv-vector-builtins-bases.cc @@ -84,8 +84,8 @@ public: } }; -static constexpr const vsetvl vsetvl_obj; -static constexpr const vsetvl vsetvlmax_obj; +static CONSTEXPR const vsetvl vsetvl_obj; +static CONSTEXPR const vsetvl vsetvlmax_obj; namespace bases { const function_base *const vsetvl = &vsetvl_obj; const function_base *const vsetvlmax = &vsetvlmax_obj; diff --git a/gcc/config/riscv/riscv-vector-builtins-shapes.cc b/gcc/config/riscv/riscv-vector-builtins-shapes.cc index 14c59690c06..24fc1c02341 100644 --- a/gcc/config/riscv/riscv-vector-builtins-shapes.cc +++ b/gcc/config/riscv/riscv-vector-builtins-shapes.cc @@ -71,7 +71,7 @@ build_all (function_builder &b, const function_group_info &group) /* Declare the function shape NAME, pointing it to an instance of class _def. */ #define SHAPE(DEF, VAR) \ - static constexpr const DEF##_def VAR##_obj; \ + static CONSTEXPR const DEF##_def VAR##_obj; \ namespace shapes { const function_shape *const VAR = &VAR##_obj; } /* Base class for for build. */ diff --git a/gcc/config/riscv/riscv-vector-builtins.cc b/gcc/config/riscv/riscv-vector-builtins.cc index 06a4a85087d..43150aa47a4 100644 --- a/gcc/config/riscv/riscv-vector-builtins.cc +++ b/gcc/config/riscv/riscv-vector-builtins.cc @@ -88,7 +88,7 @@ struct registered_function_hasher : nofree_ptr_hash }; /* Static information about each RVV type. */ -static constexpr const vector_type_info vector_types[] = { +static CONSTEXPR const vector_type_info vector_types[] = { #define DEF_RVV_TYPE(NAME, NCHARS, ABI_NAME, ARGS...) \ {#NAME, #ABI_NAME, "u" #NCHARS #ABI_NAME}, #include "riscv-vector-builtins.def" @@ -123,23 +123,23 @@ static const rvv_type_info i_ops[] = { #include "riscv-vector-builtins-types.def" {NUM_VECTOR_TYPES, 0}}; -static constexpr const rvv_arg_type_info rvv_arg_type_info_end +static CONSTEXPR const rvv_arg_type_info rvv_arg_type_info_end = rvv_arg_type_info (NUM_BASE_TYPES); /* A list of args for size_t func (void) function. */ -static constexpr const rvv_arg_type_info void_args[] +static CONSTEXPR const rvv_arg_type_info void_args[] = {rvv_arg_type_info (RVV_BASE_void), rvv_arg_type_info_end}; /* A list of args for size_t func (size_t) function. */ -static constexpr const rvv_arg_type_info size_args[] +static CONSTEXPR const rvv_arg_type_info size_args[] = {rvv_arg_type_info (RVV_BASE_size), rvv_arg_type_info_end}; /* A list of none preds that will be registered for intrinsic functions. */ -static constexpr const predication_type_index none_preds[] +static CONSTEXPR const predication_type_index none_preds[] = {PRED_TYPE_none, NUM_PRED_TYPES}; /* A static operand information for size_t func (void) function registration. */ -static constexpr const rvv_op_info i_none_size_void_ops +static CONSTEXPR const rvv_op_info i_none_size_void_ops = {i_ops, /* Types */ OP_TYPE_none, /* Suffix */ rvv_arg_type_info (RVV_BASE_size), /* Return type */ @@ -147,7 +147,7 @@ static constexpr const rvv_op_info i_none_size_void_ops /* A static operand information for size_t func (size_t) function registration. */ -static constexpr const rvv_op_info i_none_size_size_ops +static CONSTEXPR const rvv_op_info i_none_size_size_ops = {i_ops, /* Types */ OP_TYPE_none, /* Suffix */ rvv_arg_type_info (RVV_BASE_size), /* Return type */ diff --git a/gcc/config/riscv/riscv-vector-builtins.h b/gcc/config/riscv/riscv-vector-builtins.h index e5636e23a7c..425da12326c 100644 --- a/gcc/config/riscv/riscv-vector-builtins.h +++ b/gcc/config/riscv/riscv-vector-builtins.h @@ -171,7 +171,7 @@ struct rvv_builtin_suffixes /* RVV Builtin argument information. */ struct rvv_arg_type_info { - constexpr rvv_arg_type_info (rvv_base_type base_type_in) + CONSTEXPR rvv_arg_type_info (rvv_base_type base_type_in) : base_type (base_type_in) {} enum rvv_base_type base_type;