diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-11-29 13:16:55 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-11-29 13:16:55 +0000 |
| commit | 1852c1a4d9758d3dc7e90e692c891ee62013a47a (patch) | |
| tree | 11a5be817c6fe01676442d5c61b6b0e65deb627f /gcc/except.c | |
| parent | 554660f9394aeb787c52966e0c33dea966999783 (diff) | |
| download | gcc-1852c1a4d9758d3dc7e90e692c891ee62013a47a.tar.gz | |
2010-11-29 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 167237
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@167239 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/except.c')
| -rw-r--r-- | gcc/except.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gcc/except.c b/gcc/except.c index 5ee9ba3ca48..2912caeaa0d 100644 --- a/gcc/except.c +++ b/gcc/except.c @@ -209,7 +209,7 @@ init_eh (void) /* Create the SjLj_Function_Context structure. This should match the definition in unwind-sjlj.c. */ - if (targetm.except_unwind_info () == UI_SJLJ) + if (targetm.except_unwind_info (&global_options) == UI_SJLJ) { tree f_jbuf, f_per, f_lsda, f_prev, f_cs, f_data, tmp; @@ -1375,13 +1375,13 @@ finish_eh_generation (void) basic_block bb; /* Construct the landing pads. */ - if (targetm.except_unwind_info () == UI_SJLJ) + if (targetm.except_unwind_info (&global_options) == UI_SJLJ) sjlj_build_landing_pads (); else dw2_build_landing_pads (); break_superblocks (); - if (targetm.except_unwind_info () == UI_SJLJ + if (targetm.except_unwind_info (&global_options) == UI_SJLJ /* Kludge for Alpha/Tru64 (see alpha_gp_save_rtx). */ || single_succ_edge (ENTRY_BLOCK_PTR)->insns.r) commit_edge_insertions (); @@ -2622,7 +2622,7 @@ gate_convert_to_eh_region_ranges (void) /* Nothing to do for SJLJ exceptions or if no regions created. */ if (cfun->eh->region_tree == NULL) return false; - if (targetm.except_unwind_info () == UI_SJLJ) + if (targetm.except_unwind_info (&global_options) == UI_SJLJ) return false; return true; } @@ -2961,7 +2961,7 @@ output_one_function_exception_table (int section) eh_data_format_name (tt_format)); #ifndef HAVE_AS_LEB128 - if (targetm.except_unwind_info () == UI_SJLJ) + if (targetm.except_unwind_info (&global_options) == UI_SJLJ) call_site_len = sjlj_size_of_call_site_table (); else call_site_len = dw2_size_of_call_site_table (section); @@ -3028,14 +3028,14 @@ output_one_function_exception_table (int section) dw2_asm_output_delta_uleb128 (cs_end_label, cs_after_size_label, "Call-site table length"); ASM_OUTPUT_LABEL (asm_out_file, cs_after_size_label); - if (targetm.except_unwind_info () == UI_SJLJ) + if (targetm.except_unwind_info (&global_options) == UI_SJLJ) sjlj_output_call_site_table (); else dw2_output_call_site_table (cs_format, section); ASM_OUTPUT_LABEL (asm_out_file, cs_end_label); #else dw2_asm_output_data_uleb128 (call_site_len, "Call-site table length"); - if (targetm.except_unwind_info () == UI_SJLJ) + if (targetm.except_unwind_info (&global_options) == UI_SJLJ) sjlj_output_call_site_table (); else dw2_output_call_site_table (cs_format, section); |