From b77bcdf445685f28dae9e42b69e006801d653001 Mon Sep 17 00:00:00 2001
From: Vineet Gupta <vineetg@rivosinc.com>
Date: Fri, 2 Sep 2022 14:05:33 -0700
Subject: [PATCH] RISC-V: remove deprecate pic code model macro

Came across this deprecated symbol when looking around for
-mexplicit-relocs handling in code

Signed-off-by: Vineet Gupta <vineetg@rivosinc.com>

gcc/ChangeLog:

	* config/riscv/riscv-c.cc (riscv_cpu_cpp_builtins):
	Remove __riscv_cmodel_pic, that deprecated in last version.

gcc/testsuite/ChangeLog:

	* gcc.target/riscv/predef-1.c: Remove __riscv_cmodel_pic check.
	* gcc.target/riscv/predef-2.c: Ditto.
	* gcc.target/riscv/predef-3.c: Ditto.
	* gcc.target/riscv/predef-4.c: Ditto.
	* gcc.target/riscv/predef-5.c: Ditto.
	* gcc.target/riscv/predef-6.c: Ditto.
	* gcc.target/riscv/predef-7.c: Ditto.
	* gcc.target/riscv/predef-8.c: Ditto.
---
 gcc/config/riscv/riscv-c.cc               | 5 -----
 gcc/testsuite/gcc.target/riscv/predef-1.c | 3 ---
 gcc/testsuite/gcc.target/riscv/predef-2.c | 3 ---
 gcc/testsuite/gcc.target/riscv/predef-3.c | 3 ---
 gcc/testsuite/gcc.target/riscv/predef-4.c | 3 ---
 gcc/testsuite/gcc.target/riscv/predef-5.c | 3 ---
 gcc/testsuite/gcc.target/riscv/predef-6.c | 3 ---
 gcc/testsuite/gcc.target/riscv/predef-7.c | 3 ---
 gcc/testsuite/gcc.target/riscv/predef-8.c | 3 ---
 9 files changed, 29 deletions(-)

diff --git a/gcc/config/riscv/riscv-c.cc b/gcc/config/riscv/riscv-c.cc
index eb7ef09..8d55ad5 100644
--- a/gcc/config/riscv/riscv-c.cc
+++ b/gcc/config/riscv/riscv-c.cc
@@ -93,11 +93,6 @@ riscv_cpu_cpp_builtins (cpp_reader *pfile)
       break;
 
     case CM_PIC:
-      /* __riscv_cmodel_pic is deprecated, and will removed in next GCC release.
-	 see https://github.com/riscv/riscv-c-api-doc/pull/11  */
-      builtin_define ("__riscv_cmodel_pic");
-      /* FALLTHROUGH. */
-
     case CM_MEDANY:
       builtin_define ("__riscv_cmodel_medany");
       break;
diff --git a/gcc/testsuite/gcc.target/riscv/predef-1.c b/gcc/testsuite/gcc.target/riscv/predef-1.c
index 2e57ce6..9dddc18 100644
--- a/gcc/testsuite/gcc.target/riscv/predef-1.c
+++ b/gcc/testsuite/gcc.target/riscv/predef-1.c
@@ -58,9 +58,6 @@ int main () {
 #if defined(__riscv_cmodel_medany)
 #error "__riscv_cmodel_medlow"
 #endif
-#if defined(__riscv_cmodel_pic)
-#error "__riscv_cmodel_medlow"
-#endif
 
   return 0;
 }
diff --git a/gcc/testsuite/gcc.target/riscv/predef-2.c b/gcc/testsuite/gcc.target/riscv/predef-2.c
index c85b3c9..755fe4e 100644
--- a/gcc/testsuite/gcc.target/riscv/predef-2.c
+++ b/gcc/testsuite/gcc.target/riscv/predef-2.c
@@ -58,9 +58,6 @@ int main () {
 #if !defined(__riscv_cmodel_medany)
 #error "__riscv_cmodel_medlow"
 #endif
-#if defined(__riscv_cmodel_pic)
-#error "__riscv_cmodel_medlow"
-#endif
 
   return 0;
 }
diff --git a/gcc/testsuite/gcc.target/riscv/predef-3.c b/gcc/testsuite/gcc.target/riscv/predef-3.c
index 82a89d4..5136453 100644
--- a/gcc/testsuite/gcc.target/riscv/predef-3.c
+++ b/gcc/testsuite/gcc.target/riscv/predef-3.c
@@ -58,9 +58,6 @@ int main () {
 #if !defined(__riscv_cmodel_medany)
 #error "__riscv_cmodel_medany"
 #endif
-#if !defined(__riscv_cmodel_pic)
-#error "__riscv_cmodel_pic"
-#endif
 
   return 0;
 }
diff --git a/gcc/testsuite/gcc.target/riscv/predef-4.c b/gcc/testsuite/gcc.target/riscv/predef-4.c
index 5868d39..76b6fee 100644
--- a/gcc/testsuite/gcc.target/riscv/predef-4.c
+++ b/gcc/testsuite/gcc.target/riscv/predef-4.c
@@ -58,9 +58,6 @@ int main () {
 #if defined(__riscv_cmodel_medany)
 #error "__riscv_cmodel_medlow"
 #endif
-#if defined(__riscv_cmodel_pic)
-#error "__riscv_cmodel_medlow"
-#endif
 
   return 0;
 }
diff --git a/gcc/testsuite/gcc.target/riscv/predef-5.c b/gcc/testsuite/gcc.target/riscv/predef-5.c
index 4b2bd38..54a5150 100644
--- a/gcc/testsuite/gcc.target/riscv/predef-5.c
+++ b/gcc/testsuite/gcc.target/riscv/predef-5.c
@@ -58,9 +58,6 @@ int main () {
 #if !defined(__riscv_cmodel_medany)
 #error "__riscv_cmodel_medlow"
 #endif
-#if defined(__riscv_cmodel_pic)
-#error "__riscv_cmodel_medlow"
-#endif
 
   return 0;
 }
diff --git a/gcc/testsuite/gcc.target/riscv/predef-6.c b/gcc/testsuite/gcc.target/riscv/predef-6.c
index 8e5ea36..f61709f 100644
--- a/gcc/testsuite/gcc.target/riscv/predef-6.c
+++ b/gcc/testsuite/gcc.target/riscv/predef-6.c
@@ -58,9 +58,6 @@ int main () {
 #if !defined(__riscv_cmodel_medany)
 #error "__riscv_cmodel_medany"
 #endif
-#if !defined(__riscv_cmodel_pic)
-#error "__riscv_cmodel_medpic"
-#endif
 
   return 0;
 }
diff --git a/gcc/testsuite/gcc.target/riscv/predef-7.c b/gcc/testsuite/gcc.target/riscv/predef-7.c
index 0bde299..4121755 100644
--- a/gcc/testsuite/gcc.target/riscv/predef-7.c
+++ b/gcc/testsuite/gcc.target/riscv/predef-7.c
@@ -58,9 +58,6 @@ int main () {
 #if defined(__riscv_cmodel_medany)
 #error "__riscv_cmodel_medlow"
 #endif
-#if defined(__riscv_cmodel_pic)
-#error "__riscv_cmodel_medlow"
-#endif
 
   return 0;
 }
diff --git a/gcc/testsuite/gcc.target/riscv/predef-8.c b/gcc/testsuite/gcc.target/riscv/predef-8.c
index 18aa591..982056a 100644
--- a/gcc/testsuite/gcc.target/riscv/predef-8.c
+++ b/gcc/testsuite/gcc.target/riscv/predef-8.c
@@ -58,9 +58,6 @@ int main () {
 #if !defined(__riscv_cmodel_medany)
 #error "__riscv_cmodel_medlow"
 #endif
-#if defined(__riscv_cmodel_pic)
-#error "__riscv_cmodel_medlow"
-#endif
 
   return 0;
 }
-- 
2.7.4