Skip to content

Commit 913d506

Browse files
tbr-ttgalak
authored andcommitted
gcc: update multilibs for RISC-V
We now have the following multilibs for RISC-V: rv32ima (default) rv32im rv32imac rv32imafc rv32imafd rv64imac rv64imafdc rv64imafd rv64imac, mcmodel=medany rv64imafdc, mcmodel=medany rv64imafd, mcmodel=medany Multilib description generated by multilib-generator. Added mcmodel=medany manually. Signed-off-by: Martin Åberg <[email protected]>
1 parent 574e494 commit 913d506

File tree

1 file changed

+90
-0
lines changed

1 file changed

+90
-0
lines changed
Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
From cadc173e08dae25cf37c90eb8bf8b2bdcc118119 Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Martin=20=C3=85berg?= <[email protected]>
3+
Date: Tue, 15 Dec 2020 08:40:21 +0100
4+
Subject: [PATCH] RISC-V: update multilibs
5+
MIME-Version: 1.0
6+
Content-Type: text/plain; charset=UTF-8
7+
Content-Transfer-Encoding: 8bit
8+
9+
We now have the following multilibs for RISC-V:
10+
11+
rv32ima (default)
12+
rv32im
13+
rv32imac
14+
rv32imafc
15+
rv32imafd
16+
rv64imac
17+
rv64imafdc
18+
rv64imafd
19+
rv64imac, mcmodel=medany
20+
rv64imafdc, mcmodel=medany
21+
rv64imafd, mcmodel=medany
22+
23+
Signed-off-by: Martin Åberg <[email protected]>
24+
---
25+
gcc/config.gcc | 3 +++
26+
gcc/config/riscv/t-zephyr | 38 ++++++++++++++++++++++++++++++++++++++
27+
2 files changed, 41 insertions(+)
28+
create mode 100644 gcc/config/riscv/t-zephyr
29+
30+
diff --git a/gcc/config.gcc b/gcc/config.gcc
31+
index 96a17f7eacb..431015c682a 100644
32+
--- a/gcc/config.gcc
33+
+++ b/gcc/config.gcc
34+
@@ -2445,6 +2445,9 @@ riscv*-*-linux*)
35+
riscv*-*-elf* | riscv*-*-rtems*)
36+
tm_file="elfos.h newlib-stdint.h ${tm_file} riscv/elf.h"
37+
case ${target} in
38+
+ *-zephyr*)
39+
+ tmake_file="${tmake_file} riscv/t-zephyr"
40+
+ ;;
41+
*-*-rtems*)
42+
tm_file="${tm_file} rtems.h riscv/rtems.h"
43+
tmake_file="${tmake_file} riscv/t-rtems"
44+
diff --git a/gcc/config/riscv/t-zephyr b/gcc/config/riscv/t-zephyr
45+
new file mode 100644
46+
index 00000000000..2dead4d3b2a
47+
--- /dev/null
48+
+++ b/gcc/config/riscv/t-zephyr
49+
@@ -0,0 +1,38 @@
50+
+# This file was generated by multilib-generator with the command:
51+
+# ./multilib-generator rv32im-ilp32--c rv32imac-ilp32-- rv32imafc-ilp32f-- rv32imafd-ilp32d--c rv64imac-lp64-- rv64imafdc-lp64d-- rv64imafd-lp64d--
52+
+MULTILIB_OPTIONS = march=rv32im/march=rv32imc/march=rv32imac/march=rv32imafc/march=rv32imafd/march=rv32imafdc/march=rv32g/march=rv32gc/march=rv64imac/march=rv64imafdc/march=rv64gc/march=rv64imafd/march=rv64g mabi=ilp32/mabi=ilp32f/mabi=ilp32d/mabi=lp64/mabi=lp64d
53+
+MULTILIB_DIRNAMES = rv32im \
54+
+rv32imc \
55+
+rv32imac \
56+
+rv32imafc \
57+
+rv32imafd \
58+
+rv32imafdc \
59+
+rv32g \
60+
+rv32gc \
61+
+rv64imac \
62+
+rv64imafdc \
63+
+rv64gc \
64+
+rv64imafd \
65+
+rv64g ilp32 \
66+
+ilp32f \
67+
+ilp32d \
68+
+lp64 \
69+
+lp64d
70+
+MULTILIB_OPTIONS += mcmodel=medany
71+
+MULTILIB_DIRNAMES += medany
72+
+MULTILIB_REQUIRED = march=rv32im/mabi=ilp32 \
73+
+march=rv32imac/mabi=ilp32 \
74+
+march=rv32imafc/mabi=ilp32f \
75+
+march=rv32imafd/mabi=ilp32d \
76+
+march=rv64imac/mabi=lp64 \
77+
+march=rv64imafdc/mabi=lp64d \
78+
+march=rv64imafd/mabi=lp64d \
79+
+march=rv64imac/mabi=lp64/mcmodel=medany \
80+
+march=rv64imafdc/mabi=lp64d/mcmodel=medany \
81+
+march=rv64imafd/mabi=lp64d/mcmodel=medany
82+
+MULTILIB_REUSE = march.rv32im/mabi.ilp32=march.rv32imc/mabi.ilp32 \
83+
+march.rv32imafd/mabi.ilp32d=march.rv32imafdc/mabi.ilp32d \
84+
+march.rv32imafd/mabi.ilp32d=march.rv32g/mabi.ilp32d \
85+
+march.rv32imafd/mabi.ilp32d=march.rv32gc/mabi.ilp32d \
86+
+march.rv64imafdc/mabi.lp64d=march.rv64gc/mabi.lp64d \
87+
+march.rv64imafd/mabi.lp64d=march.rv64g/mabi.lp64d
88+
--
89+
2.11.0
90+

0 commit comments

Comments
 (0)