From 0b458d2bc8aaff5effc3ff64d9c2a38b2cb9d92e Mon Sep 17 00:00:00 2001 From: Jerome Lambourg Date: Tue, 1 Aug 2017 14:14:21 +0000 Subject: config.gcc (arm-wrs-vxworks*): Rework to handle arm-wrs-vxworks7 as well as arm-wrs-vxworks. 2017-08-01 Jerome Lambourg Doug Rupp Olivier Hainque gcc/ * config.gcc (arm-wrs-vxworks*): Rework to handle arm-wrs-vxworks7 as well as arm-wrs-vxworks. Update target_cpu_name from arm6 (arch v3) to arm8 (arch v4). * config/arm/vxworks.h (MAYBE_TARGET_BPABI_CPP_BUILTINS): New, helper for TARGET_OS_CPP_BUILTIN. (TARGET_OS_CPP_BUILTIN): Invoke MAYBE_TARGET_BPABI_CPP_BUILTINS(), refine CPU definitions for arm_arch5 and add those for arm_arch6 and arm_arch7. (MAYBE_ASM_ABI_SPEC): New, helper for SUBTARGET_EXTRA_ASM_SPEC, passing required abi options to the assembler for EABI configurations. (EXTRA_CC1_SPEC): New macro, to help prevent the implicit production of .text.hot and .text.unlikely sections for kernel modules when using ARM style exceptions. (CC1_SPEC): Remove obsolete attempt at mimicking Diab toolchain options. Add EXTRA_CC1_SPEC. (VXWORKS_ENDIAN_SPEC): Adjust comment and remove handling of Diab toolchain options. (DWARF2_UNWIND_INFO): Redefine to handle the pre/post VxWorks 7 transition. (ARM_TARGET2_DWARF_FORMAT): Define. * config/arm/t-vxworks: Adjust multilib control to removal of the Diab command line options. libgcc/ * config.host (arm-wrs-vxworks*): Rework to handle arm-wrs-vxworks7 as well as arm-wrs-vxworks. * config/arm/t-vxworks7: New file. Add unwind-arm-vxworks.c to LIB2ADDEH. * config/arm/unwind-arm-vxworks.c: New file. Provide dummy __exidx_start and __exidx_end for downloadable modules. Co-Authored-By: Doug Rupp Co-Authored-By: Olivier Hainque From-SVN: r250781 --- libgcc/ChangeLog | 11 +++++++++++ libgcc/config.host | 11 ++++++++++- libgcc/config/arm/t-vxworks7 | 1 + libgcc/config/arm/unwind-arm-vxworks.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 libgcc/config/arm/t-vxworks7 create mode 100644 libgcc/config/arm/unwind-arm-vxworks.c (limited to 'libgcc') diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 626a50f..14aed0b 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,14 @@ +2017-08-01 Jerome Lambourg + Doug Rupp + Olivier Hainque + + * config.host (arm-wrs-vxworks*): Rework to handle arm-wrs-vxworks7 + as well as arm-wrs-vxworks. + * config/arm/t-vxworks7: New file. Add unwind-arm-vxworks.c to + LIB2ADDEH. + * config/arm/unwind-arm-vxworks.c: New file. Provide dummy + __exidx_start and __exidx_end for downloadable modules. + 2017-08-01 Olivier Hainque * config/t-vxworks (LIBGCC2_INCLUDES): Start with -I. after -nostdinc. diff --git a/libgcc/config.host b/libgcc/config.host index ae8836e..9556c77 100644 --- a/libgcc/config.host +++ b/libgcc/config.host @@ -388,9 +388,18 @@ arc*-*-linux*) extra_parts="$extra_parts crti.o crtn.o" extra_parts="$extra_parts crttls.o" ;; -arm-wrs-vxworks) +arm-wrs-vxworks|arm-wrs-vxworks7) tmake_file="$tmake_file arm/t-arm arm/t-elf t-softfp-sfdf t-softfp-excl arm/t-softfp t-softfp" extra_parts="$extra_parts crti.o crtn.o" + case ${host} in + *-*-vxworks7) + # Note that arm/t-bpabi will reset the LIB2ADDEH macro. + # This is intentional. + tmake_file="$tmake_file arm/t-bpabi arm/t-vxworks7" + tm_file="$tm_file arm/bpabi-lib.h" + unwind_header=config/arm/unwind-arm.h + ;; + esac ;; arm*-*-freebsd*) # ARM FreeBSD EABI tmake_file="${tmake_file} arm/t-arm t-fixedpoint-gnu-prefix arm/t-elf" diff --git a/libgcc/config/arm/t-vxworks7 b/libgcc/config/arm/t-vxworks7 new file mode 100644 index 0000000..bead336 --- /dev/null +++ b/libgcc/config/arm/t-vxworks7 @@ -0,0 +1 @@ +LIB2ADDEH += $(srcdir)/config/arm/unwind-arm-vxworks.c diff --git a/libgcc/config/arm/unwind-arm-vxworks.c b/libgcc/config/arm/unwind-arm-vxworks.c new file mode 100644 index 0000000..ed23ab9 --- /dev/null +++ b/libgcc/config/arm/unwind-arm-vxworks.c @@ -0,0 +1,33 @@ +/* Support for ARM EABI unwinding in VxWorks Downloadable Kernel Modules. + Copyright (C) 2017 Free Software Foundation, Inc. + + This file 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. + + This file 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. + + Under Section 7 of GPL version 3, you are granted additional + permissions described in the GCC Runtime Library Exception, version + 3.1, as published by the Free Software Foundation. + + You should have received a copy of the GNU General Public License and + a copy of the GCC Runtime Library Exception along with this program; + see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + . */ + +#if defined(__vxworks) && !defined (__RTP__) +/* Vxworks for ARM uses __gnu_Unwind_Find_exidx to retrieve the exception + table for downloadable kernel modules. As those modules are only partially + linked, the linker won't generate __exidx_start|end, but the two symbols + are still used in alternate paths from unwind-arm-common.inc. + + As we don't rely on them, but still need the symbols, we define dummy + values here. */ +void *__exidx_start __attribute__((__visibility__ ("hidden"))); +void *__exidx_end __attribute__((__visibility__ ("hidden"))); +#endif -- cgit v1.1