From patchwork Sun Nov 25 15:41:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai Tietz X-Patchwork-Id: 201551 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id B15062C0082 for ; Mon, 26 Nov 2012 02:42:06 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1354462927; h=Comment: DomainKey-Signature:Received:Received:Received:Received: MIME-Version:Received:Received:Date:Message-ID:Subject:From:To: Cc:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=Qcev7PY WuKeoWsAUEQskeP9uFC0=; b=QHd3mAEJ3HoeNrntR0PehvFG7S6AxICdlsb6Ed5 wKCJ1Sd7rk/tdBEPGVg5voIMk5H7Ebr1MabNHI6OjFYtR1T1lXqr9NnL7zT5acR8 EnmBzD2Xrp1zUIW2DOdaFTc6vC68hXfyFBA0s0Y6cYiNEIEhTDBwWjbzFWDTFvQx UoxY= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:MIME-Version:Received:Received:Date:Message-ID:Subject:From:To:Cc:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=CBSgx0+dv4LqdJPYksd0odI/aOV0vBV3x2GG38iA70G4U9DlG99psGFY1p2TI4 N7MPUSc8ABQF2kSkf2CB2t8U4NvZSBHx7UzpAdn2/7tVvqKEpSyiqPrToY0BKeKa je9P2bedBS9Hf2fW5h34evuCTFjWGmgsk4iyoVFxmJlTQ=; Received: (qmail 9804 invoked by alias); 25 Nov 2012 15:42:01 -0000 Received: (qmail 9790 invoked by uid 22791); 25 Nov 2012 15:42:00 -0000 X-SWARE-Spam-Status: No, hits=-2.9 required=5.0 tests=AWL, BAYES_05, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, KHOP_RCVD_TRUST, NML_ADSP_CUSTOM_MED, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE X-Spam-Check-By: sourceware.org Received: from mail-wg0-f51.google.com (HELO mail-wg0-f51.google.com) (74.125.82.51) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 25 Nov 2012 15:41:56 +0000 Received: by mail-wg0-f51.google.com with SMTP id ei8so3268242wgb.8 for ; Sun, 25 Nov 2012 07:41:55 -0800 (PST) MIME-Version: 1.0 Received: by 10.216.51.21 with SMTP id a21mr3106373wec.176.1353858114980; Sun, 25 Nov 2012 07:41:54 -0800 (PST) Received: by 10.216.153.132 with HTTP; Sun, 25 Nov 2012 07:41:54 -0800 (PST) Date: Sun, 25 Nov 2012 16:41:54 +0100 Message-ID: Subject: [patch libstdc++]: Fix PR target/55445 Always defined __SEH__ when build from trunk From: Kai Tietz To: GCC Patches Cc: "libstdc++" X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Hi, this patch fixes used exception-mechanism for SEH-enabled targets, which are requesting for SjLj-exception-mechanism. See also patch for libgcc. ChangeLog 2012-11-25 Kai Tietz PR target/55445 * libsupc++/eh_personaltity.cc (__SEH__): Additional check for not being SjLj. Tested for multilib i686-w64-mingw32, and x86_64-w64-mingw32 targets. Ok for apply? Regards, Kai Index: eh_personality.cc =================================================================== --- eh_personality.cc (Revision 193669) +++ eh_personality.cc (Arbeitskopie) @@ -332,13 +332,13 @@ #ifdef _GLIBCXX_SJLJ_EXCEPTIONS #define PERSONALITY_FUNCTION __gxx_personality_sj0 #define __builtin_eh_return_data_regno(x) x -#elif defined(__SEH__) +#elif defined(__SEH__) && !defined (_GLIBCXX_SJLJ_EXCEPTIONS) #define PERSONALITY_FUNCTION __gxx_personality_imp #else #define PERSONALITY_FUNCTION __gxx_personality_v0 #endif -#ifdef __SEH__ +#if defined (__SEH__) && !defined (_GLIBCXX_SJLJ_EXCEPTIONS) static #else extern "C" @@ -785,7 +785,7 @@ } #endif -#ifdef __SEH__ +#if defined (__SEH__) && !defined (_GLIBCXX_SJLJ_EXCEPTIONS) extern "C" EXCEPTION_DISPOSITION __gxx_personality_seh0 (PEXCEPTION_RECORD ms_exc, void *this_frame,