diff options
Diffstat (limited to 'libgcc')
| -rw-r--r-- | libgcc/ChangeLog | 26 | ||||
| -rw-r--r-- | libgcc/config.host | 14 | ||||
| -rw-r--r-- | libgcc/config/arm/t-vxworks7 | 1 | ||||
| -rw-r--r-- | libgcc/config/arm/unwind-arm-vxworks.c | 33 | ||||
| -rw-r--r-- | libgcc/config/t-vxworks | 11 | ||||
| -rw-r--r-- | libgcc/config/t-vxworks7 | 9 |
6 files changed, 84 insertions, 10 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index fc7b878d95c..14d20fbfac8 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,29 @@ +2017-08-07 Jonathan Yong <10walls@gmail.com> + + * config.host (*-cygwin): Include file from mingw + config/i386/enable-execute-stack-mingw32.c + +2017-08-01 Jerome Lambourg <lambourg@adacore.com> + Doug Rupp <rupp@adacore.com> + Olivier Hainque <hainque@adacore.com> + + * 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 <hainque@adacore.com> + + * config/t-vxworks (LIBGCC2_INCLUDES): Start with -I. after -nostdinc. + * config/t-vxworks7: Likewise. + +2017-08-01 Olivier Hainque <hainque@adacore.com> + + * config/t-vxworks: Instead of redefining LIB2ADD, + augment LIB2ADDEH with vxlib.c and vxlib-tls.c. + 2017-07-28 Sebastian Huber <sebastian.huber@embedded-brains.de> * config/rs6000/ibm-ldouble.c: Disable if defined __rtems__. diff --git a/libgcc/config.host b/libgcc/config.host index ae8836e8891..546b12b5971 100644 --- a/libgcc/config.host +++ b/libgcc/config.host @@ -324,6 +324,9 @@ case ${host} in i[34567]86-*-mingw* | x86_64-*-mingw*) enable_execute_stack=config/i386/enable-execute-stack-mingw32.c ;; +i[34567]86-*-cygwin* | x86_64-*-cygwin*) + enable_execute_stack=config/i386/enable-execute-stack-mingw32.c + ;; *) enable_execute_stack=enable-execute-stack-empty.c; ;; @@ -388,9 +391,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 00000000000..bead3369a59 --- /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 00000000000..ed23ab9fc3c --- /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 + <http://www.gnu.org/licenses/>. */ + +#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 diff --git a/libgcc/config/t-vxworks b/libgcc/config/t-vxworks index d67e446b46d..bbbb16deede 100644 --- a/libgcc/config/t-vxworks +++ b/libgcc/config/t-vxworks @@ -2,12 +2,13 @@ LIBGCC2_DEBUG_CFLAGS = # Extra libgcc2 modules used by gthr-vxworks.h functions -LIB2ADD = $(srcdir)/config/vxlib.c $(srcdir)/config/vxlib-tls.c +LIB2ADDEH += $(srcdir)/config/vxlib.c $(srcdir)/config/vxlib-tls.c -# This ensures that the correct target headers are used; some -# VxWorks system headers have names that collide with GCC's -# internal (host) headers, e.g. regs.h. -LIBGCC2_INCLUDES = -nostdinc \ +# This ensures that the correct target headers are used; some VxWorks +# system headers have names that collide with GCC's internal (host) +# headers, e.g. regs.h. Make sure the local libgcc headers still +# prevail (e.g. unwind.h). +LIBGCC2_INCLUDES = -nostdinc -I. \ `case "/$(MULTIDIR)" in \ */mrtp*) echo -I$(WIND_USR)/h -I$(WIND_USR)/h/wrn/coreip ;; \ *) echo -I$(WIND_BASE)/target/h -I$(WIND_BASE)/target/h/wrn/coreip ;; \ diff --git a/libgcc/config/t-vxworks7 b/libgcc/config/t-vxworks7 index 77591cd642c..ae1dff9ccbd 100644 --- a/libgcc/config/t-vxworks7 +++ b/libgcc/config/t-vxworks7 @@ -4,11 +4,12 @@ LIBGCC2_DEBUG_CFLAGS = # Extra libgcc2 modules used by gthr-vxworks.h functions LIB2ADDEH += $(srcdir)/config/vxlib.c $(srcdir)/config/vxlib-tls.c -# This ensures that the correct target headers are used; some -# VxWorks system headers have names that collide with GCC's -# internal (host) headers, e.g. regs.h. +# This ensures that the correct target headers are used; some VxWorks +# system headers have names that collide with GCC's internal (host) +# headers, e.g. regs.h. Make sure the local libgcc headers still +# prevail (e.g. unwind.h). LIBGCC2_INCLUDES = -nostdinc \ - -I$(VSB_DIR)/h -I$(VSB_DIR)/share/h \ + -I. -I$(VSB_DIR)/h -I$(VSB_DIR)/share/h \ `case "/$(MULTIDIR)" in \ */mrtp*) echo -I$(VSB_DIR)/usr/h/public -I$(VSB_DIR)/usr/h ;; \ *) echo -I$(VSB_DIR)/krnl/h/system -I$(VSB_DIR)/krnl/h/public ;; \ |