Skip to content

Commit 1a70ae9

Browse files
committed
zephyr: xtensa: enable multilib to build for call0 ABI
This enables multilib builds for Zephyr Xtensa toolchains supporting both CALL0 and Windowed ABIs. Signed-off-by: Daniel Leung <[email protected]>
1 parent db5fcf3 commit 1a70ae9

File tree

3 files changed

+33
-0
lines changed

3 files changed

+33
-0
lines changed

gcc/config.gcc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3600,6 +3600,11 @@ xstormy16-*-elf)
36003600
extra_options=stormy16/stormy16.opt
36013601
tmake_file="stormy16/t-stormy16"
36023602
;;
3603+
xtensa*-*_zephyr-elf*)
3604+
tm_file="${tm_file} elfos.h newlib-stdint.h xtensa/elf.h"
3605+
extra_options="${extra_options} xtensa/elf.opt"
3606+
tmake_file="${tmake_file} xtensa/t-zephyr"
3607+
;;
36033608
xtensa*-*-elf*)
36043609
tm_file="${tm_file} elfos.h newlib-stdint.h xtensa/elf.h"
36053610
extra_options="${extra_options} xtensa/elf.opt"

gcc/config/xtensa/t-zephyr

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Copyright (C) 2016, 2023 Intel Corporation.
2+
#
3+
# This file is part of GCC.
4+
#
5+
# GCC is free software; you can redistribute it and/or modify
6+
# it under the terms of the GNU General Public License as published by
7+
# the Free Software Foundation; either version 3, or (at your option)
8+
# any later version.
9+
#
10+
# GCC is distributed in the hope that it will be useful,
11+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
# GNU General Public License for more details.
14+
#
15+
# You should have received a copy of the GNU General Public License
16+
# along with GCC; see the file COPYING3. If not see
17+
# <http://www.gnu.org/licenses/>.
18+
#
19+
20+
MULTILIB_OPTIONS += mabi=call0
21+
MULTILIB_DIRNAMES += call0
22+
#MULTILIB_MATCHES = mabi=call0
23+
#MULTILIB_EXCEPTIONS =

libgcc/config.host

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1531,6 +1531,11 @@ visium-*-elf*)
15311531
xstormy16-*-elf)
15321532
tmake_file="stormy16/t-stormy16 t-fdpbit"
15331533
;;
1534+
xtensa*-*_zephyr-elf*)
1535+
tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-elf"
1536+
extra_parts="$extra_parts crti.o crtn.o"
1537+
tmake_file="${tmake_file} xtensa/t-zephyr"
1538+
;;
15341539
xtensa*-*-elf*)
15351540
tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-elf"
15361541
extra_parts="$extra_parts crti.o crtn.o"

0 commit comments

Comments
 (0)