From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 748 invoked by alias); 14 Sep 2009 09:37:48 -0000 Received: (qmail 737 invoked by uid 22791); 14 Sep 2009 09:37:47 -0000 X-SWARE-Spam-Status: No, hits=-3.6 required=5.0 tests=AWL,BAYES_00,WEIRD_PORT X-Spam-Check-By: sourceware.org Received: from cantor2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 14 Sep 2009 09:37:41 +0000 Received: from relay1.suse.de (relay-ext.suse.de [195.135.221.8]) by mx2.suse.de (Postfix) with ESMTP id E830C87567; Mon, 14 Sep 2009 11:37:38 +0200 (CEST) Date: Mon, 14 Sep 2009 09:37:00 -0000 From: Richard Guenther To: David Edelsohn Cc: Richard Guenther , Richard Henderson , gcc-patches@gcc.gnu.org, Diego Novillo Subject: Re: [PATCH] Merge from LTO: eh_personality changes In-Reply-To: <303e1d290909131942w621302b2m8433c4316b567809@mail.gmail.com> Message-ID: References: <303e1d290909131942w621302b2m8433c4316b567809@mail.gmail.com> User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2009-09/txt/msg00932.txt.bz2 On Sun, 13 Sep 2009, David Edelsohn wrote: > This patch broke bootstrap on AIX: > > /farm/dje/src/src/libstdc++-v3/libsupc++/eh_ptr.cc: In destructor > 'std::__exception_ptr::exception_ptr::~exception_ptr()': > /farm/dje/src/src/libstdc++-v3/libsupc++/eh_ptr.cc:67:1: sorry, > unimplemented: Multiple EH personalities are supported only with > assemblers supporting .cfi.personality directive. > make[2]: *** [eh_ptr.lo] Error 1 Doh, I forgot about that path. Fixed like the following, committed as obvious. Can you verify this restores bootstrap? Thanks, Richard. 2009-09-14 Richard Guenther PR middle-end/41350 * dwarf2out.c (dwarf2out_begin_prologue): Adjust non-CFI asm EH personality path. * g++.dg/debug/dwarf-eh-personality-1.C: New testcase. Index: gcc/dwarf2out.c =================================================================== *** gcc/dwarf2out.c (revision 151680) --- gcc/dwarf2out.c (working copy) *************** dwarf2out_begin_prologue (unsigned int l *** 3881,3887 **** char label[MAX_ARTIFICIAL_LABEL_BYTES]; char * dup_label; dw_fde_ref fde; - rtx personality; section *fnsec; current_function_func_begin_label = NULL; --- 3881,3886 ---- *************** dwarf2out_begin_prologue (unsigned int l *** 3976,3989 **** dwarf2out_source_line (line, file, 0, true); #endif - personality = get_personality_function (current_function_decl); if (dwarf2out_do_cfi_asm ()) dwarf2out_do_cfi_startproc (false); else { ! if (!current_unit_personality || current_unit_personality == personality) current_unit_personality = personality; ! else sorry ("Multiple EH personalities are supported only with assemblers " "supporting .cfi.personality directive."); } --- 3975,3993 ---- dwarf2out_source_line (line, file, 0, true); #endif if (dwarf2out_do_cfi_asm ()) dwarf2out_do_cfi_startproc (false); else { ! rtx personality = get_personality_function (current_function_decl); ! if (!current_unit_personality) current_unit_personality = personality; ! ! /* We cannot keep a current personality per function as without CFI ! asm at the point where we emit the CFI data there is no current ! function anymore. */ ! if (personality ! && current_unit_personality != personality) sorry ("Multiple EH personalities are supported only with assemblers " "supporting .cfi.personality directive."); } Index: gcc/testsuite/g++.dg/debug/dwarf-eh-personality-1.C =================================================================== *** gcc/testsuite/g++.dg/debug/dwarf-eh-personality-1.C (revision 0) --- gcc/testsuite/g++.dg/debug/dwarf-eh-personality-1.C (revision 0) *************** *** 0 **** --- 1,17 ---- + // { dg-options "-fno-dwarf2-cfi-asm" } + + extern void bar (void); + int foo (void) + { + try { + bar(); + } catch (...) { + return 1; + } + return 0; + } + + int foobar (void) + { + } +