summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gcc/config/xtensa/elf.h8
-rw-r--r--gcc/config/xtensa/linux.h8
-rw-r--r--gcc/config/xtensa/uclinux.h9
-rw-r--r--gcc/config/xtensa/xtensa.c3
-rw-r--r--gcc/config/xtensa/xtensa.h3
-rw-r--r--gcc/config/xtensa/xtensa.opt11
-rw-r--r--gcc/doc/invoke.texi26
-rw-r--r--gcc/testsuite/gcc.target/xtensa/mabi-call0.c13
-rw-r--r--gcc/testsuite/gcc.target/xtensa/mabi-windowed.c13
-rwxr-xr-xlibgcc/configure24
-rw-r--r--libgcc/configure.ac14
11 files changed, 103 insertions, 29 deletions
diff --git a/gcc/config/xtensa/elf.h b/gcc/config/xtensa/elf.h
index 6fd589fed32..48e2590e9b6 100644
--- a/gcc/config/xtensa/elf.h
+++ b/gcc/config/xtensa/elf.h
@@ -47,7 +47,9 @@ along with GCC; see the file COPYING3. If not see
%{mlongcalls:--longcalls} \
%{mno-longcalls:--no-longcalls} \
%{mauto-litpools:--auto-litpools} \
- %{mno-auto-litpools:--no-auto-litpools}"
+ %{mno-auto-litpools:--no-auto-litpools} \
+ %{mabi=windowed:--abi-windowed} \
+ %{mabi=call0:--abi-call0}"
#undef LIB_SPEC
#define LIB_SPEC "-lc -lsim -lc -lhandlers-sim -lhal"
@@ -65,7 +67,9 @@ along with GCC; see the file COPYING3. If not see
%{!shared: \
%{!static: \
%{rdynamic:-export-dynamic} \
- %{static:-static}}}"
+ %{static:-static}}} \
+ %{mabi=windowed:--abi-windowed} \
+ %{mabi=call0:--abi-call0}"
#undef LOCAL_LABEL_PREFIX
#define LOCAL_LABEL_PREFIX "."
diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h
index 62a33a9bc10..bd20595c324 100644
--- a/gcc/config/xtensa/linux.h
+++ b/gcc/config/xtensa/linux.h
@@ -44,7 +44,9 @@ along with GCC; see the file COPYING3. If not see
%{mlongcalls:--longcalls} \
%{mno-longcalls:--no-longcalls} \
%{mauto-litpools:--auto-litpools} \
- %{mno-auto-litpools:--no-auto-litpools}"
+ %{mno-auto-litpools:--no-auto-litpools} \
+ %{mabi=windowed:--abi-windowed} \
+ %{mabi=call0:--abi-call0}"
#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
@@ -55,7 +57,9 @@ along with GCC; see the file COPYING3. If not see
%{!static: \
%{rdynamic:-export-dynamic} \
-dynamic-linker " GNU_USER_DYNAMIC_LINKER "} \
- %{static:-static}}"
+ %{static:-static}} \
+ %{mabi=windowed:--abi-windowed} \
+ %{mabi=call0:--abi-call0}"
#undef LOCAL_LABEL_PREFIX
#define LOCAL_LABEL_PREFIX "."
diff --git a/gcc/config/xtensa/uclinux.h b/gcc/config/xtensa/uclinux.h
index 64ba26f3935..374d2947a0d 100644
--- a/gcc/config/xtensa/uclinux.h
+++ b/gcc/config/xtensa/uclinux.h
@@ -51,10 +51,15 @@ along with GCC; see the file COPYING3. If not see
%{mlongcalls:--longcalls} \
%{mno-longcalls:--no-longcalls} \
%{mauto-litpools:--auto-litpools} \
- %{mno-auto-litpools:--no-auto-litpools}"
+ %{mno-auto-litpools:--no-auto-litpools} \
+ %{mabi=windowed:--abi-windowed} \
+ %{mabi=call0:--abi-call0}"
#undef LINK_SPEC
-#define LINK_SPEC "%{!no-elf2flt:%{!elf2flt*:-elf2flt}}"
+#define LINK_SPEC \
+ "%{!no-elf2flt:%{!elf2flt*:-elf2flt}} \
+ %{mabi=windowed:--abi-windowed} \
+ %{mabi=call0:--abi-call0}"
#undef LOCAL_LABEL_PREFIX
#define LOCAL_LABEL_PREFIX "."
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
index e3afb70cdf0..e370aa4623c 100644
--- a/gcc/config/xtensa/xtensa.c
+++ b/gcc/config/xtensa/xtensa.c
@@ -2219,6 +2219,9 @@ xtensa_option_override (void)
int regno;
machine_mode mode;
+ if (xtensa_windowed_abi == -1)
+ xtensa_windowed_abi = TARGET_WINDOWED_ABI_DEFAULT;
+
/* Use CONST16 in the absence of L32R.
Set it in the TARGET_OPTION_OVERRIDE to avoid dependency on xtensa
configuration in the xtensa-common.c */
diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h
index fb5aee870dd..33bfe45a6e1 100644
--- a/gcc/config/xtensa/xtensa.h
+++ b/gcc/config/xtensa/xtensa.h
@@ -64,7 +64,8 @@ along with GCC; see the file COPYING3. If not see
#define TARGET_ABSOLUTE_LITERALS XSHAL_USE_ABSOLUTE_LITERALS
#define TARGET_THREADPTR XCHAL_HAVE_THREADPTR
#define TARGET_LOOPS XCHAL_HAVE_LOOPS
-#define TARGET_WINDOWED_ABI (XSHAL_ABI == XTHAL_ABI_WINDOWED)
+#define TARGET_WINDOWED_ABI_DEFAULT (XSHAL_ABI == XTHAL_ABI_WINDOWED)
+#define TARGET_WINDOWED_ABI xtensa_windowed_abi
#define TARGET_DEBUG XCHAL_HAVE_DEBUG
#define TARGET_L32R XCHAL_HAVE_L32R
diff --git a/gcc/config/xtensa/xtensa.opt b/gcc/config/xtensa/xtensa.opt
index dd7aba403d8..0c4aa921eff 100644
--- a/gcc/config/xtensa/xtensa.opt
+++ b/gcc/config/xtensa/xtensa.opt
@@ -45,3 +45,14 @@ Relax literals in assembler and place them automatically in the text section.
mserialize-volatile
Target Report Mask(SERIALIZE_VOLATILE)
-mno-serialize-volatile Do not serialize volatile memory references with MEMW instructions.
+
+TargetVariable
+int xtensa_windowed_abi = -1
+
+mabi=call0
+Target Report RejectNegative Var(xtensa_windowed_abi, 0)
+Use call0 ABI.
+
+mabi=windowed
+Target Report RejectNegative Var(xtensa_windowed_abi, 1)
+Use windowed registers ABI.
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 06a04e3d7dd..74ab149a035 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -1386,7 +1386,8 @@ See RS/6000 and PowerPC Options.
-mtext-section-literals -mno-text-section-literals @gol
-mauto-litpools -mno-auto-litpools @gol
-mtarget-align -mno-target-align @gol
--mlongcalls -mno-longcalls}
+-mlongcalls -mno-longcalls @gol
+-mabi=@var{abi-type}}
@emph{zSeries Options}
See S/390 and zSeries Options.
@@ -30780,6 +30781,29 @@ assembly code generated by GCC still shows direct call
instructions---look at the disassembled object code to see the actual
instructions. Note that the assembler uses an indirect call for
every cross-file call, not just those that really are out of range.
+
+@item -mabi=@var{name}
+@opindex mabi
+Generate code for the specified ABI@. Permissible values are: @samp{call0},
+@samp{windowed}. Default ABI is chosen by the Xtensa core configuration.
+
+@item -mabi=call0
+@opindex mabi=call0
+When this option is enabled function parameters are passed in registers
+@code{a2} through @code{a7}, registers @code{a12} through @code{a15} are
+caller-saved, and register @code{a15} may be used as a frame pointer.
+When this version of the ABI is enabled the C preprocessor symbol
+@code{__XTENSA_CALL0_ABI__} is defined.
+
+@item -mabi=windowed
+@opindex mabi=windowed
+When this option is enabled function parameters are passed in registers
+@code{a10} through @code{a15}, and called function rotates register window
+by 8 registers on entry so that its arguments are found in registers
+@code{a2} through @code{a7}. Register @code{a7} may be used as a frame
+pointer. Register window is rotated 8 registers back upon return.
+When this version of the ABI is enabled the C preprocessor symbol
+@code{__XTENSA_WINDOWED_ABI__} is defined.
@end table
@node zSeries Options
diff --git a/gcc/testsuite/gcc.target/xtensa/mabi-call0.c b/gcc/testsuite/gcc.target/xtensa/mabi-call0.c
new file mode 100644
index 00000000000..65d72952810
--- /dev/null
+++ b/gcc/testsuite/gcc.target/xtensa/mabi-call0.c
@@ -0,0 +1,13 @@
+/* { dg-do compile } */
+/* { dg-options "-mabi=call0" } */
+
+#ifndef __XTENSA_CALL0_ABI__
+#error
+#endif
+
+void foo(void)
+{
+}
+
+/* { dg-final { scan-assembler-not "entry" } } */
+/* { dg-final { scan-assembler-not "retw" } } */
diff --git a/gcc/testsuite/gcc.target/xtensa/mabi-windowed.c b/gcc/testsuite/gcc.target/xtensa/mabi-windowed.c
new file mode 100644
index 00000000000..aaddf41d78d
--- /dev/null
+++ b/gcc/testsuite/gcc.target/xtensa/mabi-windowed.c
@@ -0,0 +1,13 @@
+/* { dg-do compile } */
+/* { dg-options "-mabi=windowed" } */
+
+#ifndef __XTENSA_WINDOWED_ABI__
+#error
+#endif
+
+void foo(void)
+{
+}
+
+/* { dg-final { scan-assembler "entry" } } */
+/* { dg-final { scan-assembler "retw" } } */
diff --git a/libgcc/configure b/libgcc/configure
index 13548cacb85..284e4db0cdd 100755
--- a/libgcc/configure
+++ b/libgcc/configure
@@ -5330,19 +5330,17 @@ esac
# This is after config.host so we can augment tmake_file.
case ${host} in
xtensa*-*)
- cat > conftest.c <<EOF
- #ifdef __XTENSA_CALL0_ABI__
- #error
- #endif
-EOF
- if { ac_try='${CC-cc} -E -o conftest.i conftest.c 1>&5'
- { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then
- tmake_file="${tmake_file} xtensa/t-windowed"
- fi
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifdef __XTENSA_CALL0_ABI__
+ #error
+ #endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ tmake_file="${tmake_file} xtensa/t-windowed"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
;;
esac
diff --git a/libgcc/configure.ac b/libgcc/configure.ac
index bff6e54f22e..ef0d79975e1 100644
--- a/libgcc/configure.ac
+++ b/libgcc/configure.ac
@@ -515,14 +515,12 @@ AC_SUBST(solaris_ld_v2_maps)
# This is after config.host so we can augment tmake_file.
case ${host} in
xtensa*-*)
- cat > conftest.c <<EOF
- #ifdef __XTENSA_CALL0_ABI__
- #error
- #endif
-EOF
- if AC_TRY_COMMAND(${CC-cc} -E -o conftest.i conftest.c 1>&AS_MESSAGE_LOG_FD); then
- tmake_file="${tmake_file} xtensa/t-windowed"
- fi
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE(
+ [#ifdef __XTENSA_CALL0_ABI__
+ #error
+ #endif
+ ])],
+ [tmake_file="${tmake_file} xtensa/t-windowed"])
;;
esac
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 21:53:45 +0000