From 3e6011cfebedfb66b92c87e6d2add9237188819e Mon Sep 17 00:00:00 2001 From: Paul Brook Date: Tue, 7 Aug 2012 16:08:49 +0000 Subject: [PATCH] except.c (switch_to_exception_section): Place tables for DECL_ONE_ONLY functions in comdat groups. 2012-08-07 Paul Brook Sandra Loosemore gcc/ * except.c (switch_to_exception_section): Place tables for DECL_ONE_ONLY functions in comdat groups. Co-Authored-By: Sandra Loosemore From-SVN: r190206 --- gcc/ChangeLog | 6 ++++++ gcc/except.c | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 43b0b920413..5896e0b7f11 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2012-08-07 Paul Brook + Sandra Loosemore + + * except.c (switch_to_exception_section): Place tables for + DECL_ONE_ONLY functions in comdat groups. + 2012-08-07 Richard Guenther * tree-flow.h (copy_ssa_name_fn): New function. diff --git a/gcc/except.c b/gcc/except.c index 10fc26e1d7c..605d8d7b829 100644 --- a/gcc/except.c +++ b/gcc/except.c @@ -2777,11 +2777,16 @@ switch_to_exception_section (const char * ARG_UNUSED (fnname)) flags = SECTION_WRITE; #ifdef HAVE_LD_EH_GC_SECTIONS - if (flag_function_sections) + if (flag_function_sections + || (DECL_ONE_ONLY (current_function_decl) && HAVE_COMDAT_GROUP)) { char *section_name = XNEWVEC (char, strlen (fnname) + 32); + /* The EH table must match the code section, so only mark + it linkonce if we have COMDAT groups to tie them together. */ + if (DECL_ONE_ONLY (current_function_decl) && HAVE_COMDAT_GROUP) + flags |= SECTION_LINKONCE; sprintf (section_name, ".gcc_except_table.%s", fnname); - s = get_section (section_name, flags, NULL); + s = get_section (section_name, flags, current_function_decl); free (section_name); } else