diff options
| author | Sandra Loosemore <sandra@codesourcery.com> | 2016-05-19 17:59:45 -0400 |
|---|---|---|
| committer | Sandra Loosemore <sandra@gcc.gnu.org> | 2016-05-19 17:59:45 -0400 |
| commit | 6befaff6662e3a750c8de2239ded13032994baf4 (patch) | |
| tree | db220666626dc71c951ce3d429fa850cbb5e2931 /gcc | |
| parent | 8a40fef3106214c7755971f3e27c715b3968ddf4 (diff) | |
| download | gcc-6befaff6662e3a750c8de2239ded13032994baf4.zip gcc-6befaff6662e3a750c8de2239ded13032994baf4.tar.gz gcc-6befaff6662e3a750c8de2239ded13032994baf4.tar.bz2 | |
cygming.h (DWARF2_UNWIND_INFO): Allow --disable-sjlj-exceptions for TARGET_BI_ARCH to select DWARF-2 EH for...
2016-05-19 Sandra Loosemore <sandra@codesourcery.com>
gcc/
* config/i386/cygming.h (DWARF2_UNWIND_INFO): Allow
--disable-sjlj-exceptions for TARGET_BI_ARCH to select DWARF-2 EH
for 32-bit mode and SEH for 64-bit.
* config/i386/mingw32.h (SHARED_LIBGCC_UNDEFS_SPEC): Handle
TARGET_64BIT_DEFAULT.
libgcc/
* config.host [x86_64-*-cygwin*]: Handle tmake_eh_file for mixed
dw2/seh configuration.
[x86_64-*-mingw*]: Likewise.
From-SVN: r236490
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/config/i386/cygming.h | 11 | ||||
| -rw-r--r-- | gcc/config/i386/mingw32.h | 6 |
3 files changed, 16 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b8fb96c..c5e637b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2016-05-19 Sandra Loosemore <sandra@codesourcery.com> + + * config/i386/cygming.h (DWARF2_UNWIND_INFO): Allow + --disable-sjlj-exceptions for TARGET_BI_ARCH to select DWARF-2 EH + for 32-bit mode and SEH for 64-bit. + * config/i386/mingw32.h (SHARED_LIBGCC_UNDEFS_SPEC): Handle + TARGET_64BIT_DEFAULT. + 2016-05-16 Ryan Burn <contact@rnburn.com> * Makefile.in (GTFILES): Add cilk.h and cilk-common.c. diff --git a/gcc/config/i386/cygming.h b/gcc/config/i386/cygming.h index 9da4733..d6c2254 100644 --- a/gcc/config/i386/cygming.h +++ b/gcc/config/i386/cygming.h @@ -339,16 +339,13 @@ do { \ #define ASM_COMMENT_START " #" #ifndef DWARF2_UNWIND_INFO -/* If configured with --disable-sjlj-exceptions, use DWARF2, else - default to SJLJ. */ +/* If configured with --disable-sjlj-exceptions, use DWARF2 for 32-bit + mode else default to SJLJ. 64-bit code uses SEH unless you request + SJLJ. */ #if (defined (CONFIG_SJLJ_EXCEPTIONS) && !CONFIG_SJLJ_EXCEPTIONS) /* The logic of this #if must be kept synchronised with the logic - for selecting the tmake_eh_file fragment in config.gcc. */ + for selecting the tmake_eh_file fragment in libgcc/config.host. */ #define DWARF2_UNWIND_INFO 1 -/* If multilib is selected break build as sjlj is required. */ -#if defined (TARGET_BI_ARCH) -#error For 64-bit windows and 32-bit based multilib version of gcc just SJLJ exceptions are supported. -#endif #else #define DWARF2_UNWIND_INFO 0 #endif diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h index e048189..0407efe 100644 --- a/gcc/config/i386/mingw32.h +++ b/gcc/config/i386/mingw32.h @@ -100,10 +100,12 @@ along with GCC; see the file COPYING3. If not see #if DWARF2_UNWIND_INFO /* DW2-unwind is just available for 32-bit mode. */ #if TARGET_64BIT_DEFAULT -#error DW2 unwind is not available for 64-bit. -#endif +#define SHARED_LIBGCC_UNDEFS_SPEC \ + "%{m32: %{shared-libgcc: -u ___register_frame_info -u ___deregister_frame_info}}" +#else #define SHARED_LIBGCC_UNDEFS_SPEC \ "%{shared-libgcc: -u ___register_frame_info -u ___deregister_frame_info}" +#endif #else #define SHARED_LIBGCC_UNDEFS_SPEC "" #endif |