Skip to content

Commit 6377653

Browse files
committed
RISC-V: Define __riscv_cmodel_medany for PIC mode.
- 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] riscv-non-isa/riscv-c-api-doc#11 gcc/ChangeLog: * config/riscv/riscv-c.c (riscv_cpu_cpp_builtins): Define __riscv_cmodel_medany when PIC mode. gcc/testsuite/ChangeLog: * gcc.target/riscv/predef-3.c: Update testcase. * gcc.target/riscv/predef-6.c: Ditto.
1 parent ccddbbc commit 6377653

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

gcc/config/riscv/riscv-c.c

+6-3
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,15 @@ riscv_cpu_cpp_builtins (cpp_reader *pfile)
9090
builtin_define ("__riscv_cmodel_medlow");
9191
break;
9292

93+
case CM_PIC:
94+
/* __riscv_cmodel_pic is deprecated, and will removed in next GCC release.
95+
see https://github.com/riscv/riscv-c-api-doc/pull/11 */
96+
builtin_define ("__riscv_cmodel_pic");
97+
/* FALLTHROUGH. */
98+
9399
case CM_MEDANY:
94100
builtin_define ("__riscv_cmodel_medany");
95101
break;
96102

97-
case CM_PIC:
98-
builtin_define ("__riscv_cmodel_pic");
99-
break;
100103
}
101104
}

gcc/testsuite/gcc.target/riscv/predef-3.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ int main () {
5555
#if defined(__riscv_cmodel_medlow)
5656
#error "__riscv_cmodel_medlow"
5757
#endif
58-
#if defined(__riscv_cmodel_medany)
59-
#error "__riscv_cmodel_medlow"
58+
#if !defined(__riscv_cmodel_medany)
59+
#error "__riscv_cmodel_medany"
6060
#endif
6161
#if !defined(__riscv_cmodel_pic)
62-
#error "__riscv_cmodel_medlow"
62+
#error "__riscv_cmodel_pic"
6363
#endif
6464

6565
return 0;

gcc/testsuite/gcc.target/riscv/predef-6.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ int main () {
5555
#if defined(__riscv_cmodel_medlow)
5656
#error "__riscv_cmodel_medlow"
5757
#endif
58-
#if defined(__riscv_cmodel_medany)
59-
#error "__riscv_cmodel_medlow"
58+
#if !defined(__riscv_cmodel_medany)
59+
#error "__riscv_cmodel_medany"
6060
#endif
6161
#if !defined(__riscv_cmodel_pic)
62-
#error "__riscv_cmodel_medlow"
62+
#error "__riscv_cmodel_medpic"
6363
#endif
6464

6565
return 0;

0 commit comments

Comments
 (0)