From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by sourceware.org (Postfix) with ESMTPS id 95A6F3857C7B for ; Fri, 25 Sep 2020 05:46:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 95A6F3857C7B Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=kito.cheng@sifive.com Received: by mail-pg1-x542.google.com with SMTP id g29so1615618pgl.2 for ; Thu, 24 Sep 2020 22:46:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=S8BRtKjfHNXwCgnzMhcwhAbCPmlkdxKKfMQGxSgRFkc=; b=D2eVfIbAW5rzI9EsjQyKSWCXKHpXNZbCuMM3ipPJHM5NhT3K1ael4gPvwek4y20Dss jCrPXkz5l/WjE5zJ0xxwX03fj8Dmhuv3x8bGC6VozesQzHShVFGvPkK0ue8Dyxfq9GGc KWQuswyRABIJpWpJxsxSw9DpCWuPtDvGTjJhIBlZnV8QdwiyG9p/NeUqMaD1OOXf1jww kaNczcAW1uT1yLakld47IbUdYYfUCvJyryERr6zEU16sis/6aPXFDEcTew7PY+cyblGk 1SMqsOPvsmEWEghEwuzmUSe+1me89JYZF5YU/mXZfoD+7PTV4Da/G40N+YvSq/Lyt/PM z+gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=S8BRtKjfHNXwCgnzMhcwhAbCPmlkdxKKfMQGxSgRFkc=; b=Hohp7O62AU2hBa75XM+6MtNwKwURXuUgvV/YbxOhklA5lJMO4RvSRqBvCnxedEkiNF pFgup/2OmilxB9LG9p8+rRxI+FZZmZDUeIV6lCmdY1Hn5MtUQZJFDYxw106o5S4dkAua TCy+6DBbe6ekqVhNoRJFRMSD8ZTF+WAoxfqn5xxCgja4KjBIlj9nc+2EqtM9Yek4//BO Z9fUD8z8OnPXLcS4vBP3JXQhMmBreOUI/o207nWxpXQNr/6jgW32y1lm9y2xJGRleYZO MvhWq2gkhaGi7NIbG5EDrHsGpC3C0PoNCD/9uH8tGVouqMPp0MTuNqWP2nrjgTfeSHeW 2mxw== X-Gm-Message-State: AOAM533y12I8RKwCAuiytjIi+uWMPkPcw9YZbwbdMdSU+/2PZ49TCpiF ac0q6fGaUA8m7D6IDBAZ9zWPT22dqoIgI/yxsNQ= X-Google-Smtp-Source: ABdhPJxDEwcy3kcS2/jY2fhfxi00pCtsZG740lGV7fjxRQtIBvDSgg+re5XrI+dZUDNS8TDc5RL7PQ== X-Received: by 2002:a63:2319:: with SMTP id j25mr2132813pgj.75.1601012774297; Thu, 24 Sep 2020 22:46:14 -0700 (PDT) Received: from hsinchu02.internal.sifive.com (114-34-229-221.HINET-IP.hinet.net. [114.34.229.221]) by smtp.gmail.com with ESMTPSA id gn24sm884394pjb.8.2020.09.24.22.46.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Sep 2020 22:46:13 -0700 (PDT) From: Kito Cheng To: gcc-patches@gcc.gnu.org, kito.cheng@gmail.com, jimw@sifive.com Cc: Kito Cheng Subject: [PATCH] RISC-V: Define __riscv_cmodel_medany for PIC mode. Date: Fri, 25 Sep 2020 13:46:04 +0800 Message-Id: <20200925054604.97066-1-kito.cheng@sifive.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Sep 2020 05:46:17 -0000 - According the conclusion in RISC-V C API document, we decide to deprecat the __riscv_cmodel_pic marco - __riscv_cmodel_pic is deprecated and will removed in next GCC release. [1] https://github.com/riscv/riscv-c-api-doc/pull/11 --- gcc/config/riscv/riscv-c.c | 7 ++++--- gcc/testsuite/gcc.target/riscv/predef-3.c | 6 +++--- gcc/testsuite/gcc.target/riscv/predef-6.c | 6 +++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/gcc/config/riscv/riscv-c.c b/gcc/config/riscv/riscv-c.c index 735f2f2f513f..9221fcbaca5d 100644 --- a/gcc/config/riscv/riscv-c.c +++ b/gcc/config/riscv/riscv-c.c @@ -90,12 +90,13 @@ riscv_cpu_cpp_builtins (cpp_reader *pfile) builtin_define ("__riscv_cmodel_medlow"); break; + case CM_PIC: + builtin_define ("__riscv_cmodel_pic"); + /* FALLTHROUGH. */ + case CM_MEDANY: builtin_define ("__riscv_cmodel_medany"); break; - case CM_PIC: - builtin_define ("__riscv_cmodel_pic"); - break; } } diff --git a/gcc/testsuite/gcc.target/riscv/predef-3.c b/gcc/testsuite/gcc.target/riscv/predef-3.c index 6f4f2e219941..d7c9793b3d7c 100644 --- a/gcc/testsuite/gcc.target/riscv/predef-3.c +++ b/gcc/testsuite/gcc.target/riscv/predef-3.c @@ -55,11 +55,11 @@ int main () { #if defined(__riscv_cmodel_medlow) #error "__riscv_cmodel_medlow" #endif -#if defined(__riscv_cmodel_medany) -#error "__riscv_cmodel_medlow" +#if !defined(__riscv_cmodel_medany) +#error "__riscv_cmodel_medany" #endif #if !defined(__riscv_cmodel_pic) -#error "__riscv_cmodel_medlow" +#error "__riscv_cmodel_pic" #endif return 0; diff --git a/gcc/testsuite/gcc.target/riscv/predef-6.c b/gcc/testsuite/gcc.target/riscv/predef-6.c index ee4e02bcb63e..7530f9598aeb 100644 --- a/gcc/testsuite/gcc.target/riscv/predef-6.c +++ b/gcc/testsuite/gcc.target/riscv/predef-6.c @@ -55,11 +55,11 @@ int main () { #if defined(__riscv_cmodel_medlow) #error "__riscv_cmodel_medlow" #endif -#if defined(__riscv_cmodel_medany) -#error "__riscv_cmodel_medlow" +#if !defined(__riscv_cmodel_medany) +#error "__riscv_cmodel_medany" #endif #if !defined(__riscv_cmodel_pic) -#error "__riscv_cmodel_medlow" +#error "__riscv_cmodel_medpic" #endif return 0; -- 2.28.0