From 3004f893b43d48ca72ef1fe676d0930bb49a4f36 Mon Sep 17 00:00:00 2001 From: Doug Rupp Date: Thu, 14 Nov 2019 16:05:08 +0000 Subject: [PATCH] Base support for vxworks 7 on aarch64 2019-11-14 Doug Rupp Olivier Hainque Jerome Lambourg gcc/ * config.gcc: Handle aarch64*-wrs-vxworks7*. * config/aarch64/aarch64-vxworks.h: New file. * config/aarch64/t-aarch64-vxworks: New file. libgcc/ * config.host: Handle aarch64*-wrs-vxworks7*. Co-Authored-By: Jerome Lambourg Co-Authored-By: Olivier Hainque From-SVN: r278251 --- gcc/ChangeLog | 8 ++++ gcc/config.gcc | 5 ++ gcc/config/aarch64/aarch64-vxworks.h | 71 ++++++++++++++++++++++++++++ gcc/config/aarch64/t-aarch64-vxworks | 22 +++++++++ libgcc/ChangeLog | 5 ++ libgcc/config.host | 6 +++ 6 files changed, 117 insertions(+) create mode 100644 gcc/config/aarch64/aarch64-vxworks.h create mode 100644 gcc/config/aarch64/t-aarch64-vxworks diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e24af4944ec..6e7b7cc5d6d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2019-11-14 Doug Rupp + Olivier Hainque + Jerome Lambourg + + * config.gcc: Handle aarch64*-wrs-vxworks7*. + * config/aarch64/aarch64-vxworks.h: New file. + * config/aarch64/t-aarch64-vxworks: New file. + 2019-11-06 Jerome Lambourg Olivier Hainque diff --git a/gcc/config.gcc b/gcc/config.gcc index aa9a79c08de..ea45b44a212 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -1076,6 +1076,11 @@ aarch64*-*-linux*) done TM_MULTILIB_CONFIG=`echo $TM_MULTILIB_CONFIG | sed 's/^,//'` ;; +aarch64*-wrs-vxworks*) + tm_file="${tm_file} elfos.h aarch64/aarch64-elf.h" + tm_file="${tm_file} vx-common.h vxworks.h aarch64/aarch64-vxworks.h" + tmake_file="${tmake_file} aarch64/t-aarch64 aarch64/t-aarch64-vxworks" + ;; alpha*-*-linux*) tm_file="elfos.h ${tm_file} alpha/elf.h alpha/linux.h alpha/linux-elf.h glibc-stdint.h" tmake_file="${tmake_file} alpha/t-linux alpha/t-alpha" diff --git a/gcc/config/aarch64/aarch64-vxworks.h b/gcc/config/aarch64/aarch64-vxworks.h new file mode 100644 index 00000000000..de3b3c865a2 --- /dev/null +++ b/gcc/config/aarch64/aarch64-vxworks.h @@ -0,0 +1,71 @@ +/* Definitions of target machine for GNU compiler. Vxworks Aarch 64bit + version. + Copyright (C) 2018-2019 Free Software Foundation, Inc. + Contributed by Douglas B Rupp + +This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 3, or (at your option) any later +version. + +GCC is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with GCC; see the file COPYING3. If not see +. */ + +#undef SUBTARGET_OVERRIDE_OPTIONS +#define SUBTARGET_OVERRIDE_OPTIONS VXWORKS_OVERRIDE_OPTIONS + +#undef LINK_SPEC +#define LINK_SPEC VXWORKS_LINK_SPEC + +#undef LIB_SPEC +#define LIB_SPEC VXWORKS_LIB_SPEC + +#undef STARTFILE_SPEC +#define STARTFILE_SPEC VXWORKS_STARTFILE_SPEC + +#undef ENDFILE_SPEC +#define ENDFILE_SPEC VXWORKS_ENDFILE_SPEC + +#undef CPP_SPEC +#define CPP_SPEC VXWORKS_ADDITIONAL_CPP_SPEC + +#undef CC1_SPEC +#define CC1_SPEC VXWORKS_CC1_SPEC + +#undef FUNCTION_PROFILER +#define FUNCTION_PROFILER VXWORKS_FUNCTION_PROFILER + +#undef TARGET_OS_CPP_BUILTINS +#define TARGET_OS_CPP_BUILTINS() \ + do { \ + if (TARGET_BIG_END) \ + builtin_define ("ARMEB"); \ + else \ + builtin_define ("ARMEL"); \ + builtin_define ("_VX_CPU=ARMARCH8A"); \ + VXWORKS_OS_CPP_BUILTINS (); \ + } while (0) + +/* Static stack checking is supported. */ +#define STACK_CHECK_STATIC_BUILTIN 1 + +#undef STACK_CHECK_PROTECT +#define STACK_CHECK_PROTECT 16384 + +/* The VxWorks environment on aarch64 is llvm-based only, uses R18 as + a TCB pointer. */ + +#undef VXWORKS_PERSONALITY +#define VXWORKS_PERSONALITY "llvm" + +#undef TARGET_OS_USES_R18 +#define TARGET_OS_USES_R18 1 + diff --git a/gcc/config/aarch64/t-aarch64-vxworks b/gcc/config/aarch64/t-aarch64-vxworks new file mode 100644 index 00000000000..33c25101434 --- /dev/null +++ b/gcc/config/aarch64/t-aarch64-vxworks @@ -0,0 +1,22 @@ +# Multilibs for VxWorks. +# +# Copyright (C) 2018 Free Software Foundation, Inc. +# +# This file is part of GCC. +# +# GCC is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GCC is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GCC; see the file COPYING3. If not see +# . + +MULTILIB_OPTIONS += mrtp +MULTILIB_DIRNAMES += mrtp diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index ccd72ea417d..dfb30a6571f 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,8 @@ +2019-11-14 Doug Rupp + Olivier Hainque + + * config.host: Handle aarch64*-wrs-vxworks7*. + 2019-11-12 Olivier Hainque * config/t-gthr-vxworksae: New file, add all the gthr-vxworks diff --git a/libgcc/config.host b/libgcc/config.host index 49503030446..1c8d63be837 100644 --- a/libgcc/config.host +++ b/libgcc/config.host @@ -392,6 +392,12 @@ aarch64*-*-linux*) tmake_file="${tmake_file} ${cpu_type}/t-lse t-slibgcc-libgcc" tmake_file="${tmake_file} ${cpu_type}/t-softfp t-softfp t-crtfm" ;; +aarch64*-*-vxworks7*) + extra_parts="$extra_parts crtfastmath.o" + md_unwind_header=aarch64/aarch64-unwind.h + tmake_file="${tmake_file} ${cpu_type}/t-aarch64" + tmake_file="${tmake_file} ${cpu_type}/t-softfp t-softfp t-crtfm" + ;; alpha*-*-linux*) tmake_file="${tmake_file} alpha/t-alpha alpha/t-ieee t-crtfm alpha/t-linux" extra_parts="$extra_parts crtfastmath.o" -- 2.30.2