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/tree.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/tree.c')
-rw-r--r-- | gcc/tree.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/tree.c b/gcc/tree.c index 52df2bef72e..2f8d96ef4a2 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -9343,7 +9343,8 @@ build_common_builtin_nodes (void) ftype = build_function_type_list (void_type_node, ptr_type_node, NULL_TREE); local_define_builtin ("__builtin_unwind_resume", ftype, BUILT_IN_UNWIND_RESUME, - (targetm.except_unwind_info () == UI_SJLJ + ((targetm.except_unwind_info (&global_options) + == UI_SJLJ) ? "_Unwind_SjLj_Resume" : "_Unwind_Resume"), ECF_NORETURN); |