From 817a788f9eb01eff367191401d48f2aaa8d4f428 Mon Sep 17 00:00:00 2001 From: Caroline Tice Date: Wed, 10 Feb 2016 14:40:41 -0800 Subject: Unify ChromeOS and Android versions of GCC. This CL updates Android's GCC to match ChromeOS's GCC (with appropriate patches applied in both places to make sure no cherry-picked changes are lost). Change-Id: I390140c449b0e5df9ee78a06268319c8c510302f --- gcc-4.9/gcc/opts.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gcc-4.9/gcc/opts.c') diff --git a/gcc-4.9/gcc/opts.c b/gcc-4.9/gcc/opts.c index ac589412c..e999ed02c 100644 --- a/gcc-4.9/gcc/opts.c +++ b/gcc-4.9/gcc/opts.c @@ -734,13 +734,15 @@ finish_options (struct gcc_options *opts, struct gcc_options *opts_set, sections of the .o and executable files does not work (currently) with exception handling. This is because there is no support for generating unwind info. If opts->x_flag_exceptions is turned on - we need to turn off the partitioning optimization. */ + we need to turn off the partitioning optimization. + Enforcing this for DWARF2 based unwinding too because it could lead + to segfault. */ ui_except = targetm_common.except_unwind_info (opts); if (opts->x_flag_exceptions && opts->x_flag_reorder_blocks_and_partition - && (ui_except == UI_SJLJ || ui_except >= UI_TARGET)) + && (ui_except >= UI_SJLJ)) { if (opts_set->x_flag_reorder_blocks_and_partition) inform (loc, -- cgit v1.2.3