From patchwork Tue Apr 23 09:13:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai Tietz X-Patchwork-Id: 238825 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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id A78B32C04D1 for ; Tue, 23 Apr 2013 19:13:25 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:date:message-id:subject:from:to:cc:content-type; q=dns; s=default; b=HwyqRP3dPHDwPZmbMJ5cVM0x1c5EKUUcz9HZQroz3bp YG0O6r8vy2ui1F7iLRlN/vQWi8PwxxflCMScozOETdHhVn9c6YGAdNfBQPszEtaM wgi2u3RF5CKV0iLOv9stkAYUsQK4z8YZHtuH1TwJV1WUU0mXOmKi6Ay2ZEQGB/mY = DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:date:message-id:subject:from:to:cc:content-type; s=default; bh=giX1Gqc7gNzaB6Qk8RdVrh0Gv6I=; b=cVYFIrHvTnlAw9nqU rHiX35XgmQicPFsQC4g6/rgvWKhLZuuBUpc1Zs2BCAelfL8UHMS8+NhxWYj4U+yb khoUpKtHhIV+jyHCrkoDSd+wEi3y/8SL1DYrS+TefaJSHvXvJ9b/rUpj5EUgbPR2 QcaSejU+bA9rTHNnKEk3LolDaU= Received: (qmail 22337 invoked by alias); 23 Apr 2013 09:13:19 -0000 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 Received: (qmail 22327 invoked by uid 89); 23 Apr 2013 09:13:19 -0000 X-Spam-SWARE-Status: No, score=-3.6 required=5.0 tests=AWL, BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, SPF_PASS autolearn=ham version=3.3.1 Received: from mail-ie0-f176.google.com (HELO mail-ie0-f176.google.com) (209.85.223.176) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Tue, 23 Apr 2013 09:13:15 +0000 Received: by mail-ie0-f176.google.com with SMTP id x14so412859ief.7 for ; Tue, 23 Apr 2013 02:13:14 -0700 (PDT) MIME-Version: 1.0 X-Received: by 10.42.65.75 with SMTP id k11mr14049821ici.26.1366708394164; Tue, 23 Apr 2013 02:13:14 -0700 (PDT) Received: by 10.64.227.205 with HTTP; Tue, 23 Apr 2013 02:13:14 -0700 (PDT) Date: Tue, 23 Apr 2013 11:13:14 +0200 Message-ID: Subject: [patch Ada]: Fix PR/55445 also for Ada's SEH-exception-mechanism From: Kai Tietz To: GCC Patches Cc: Arnaud Charlet Hi, this patch adds the missing part of PR/55445 for Ada. Issue is that __SEH__ gets defined if SEH-annotations are generated. That doesn't mean necessarily that SEH-exception-mechanism is used. The SEH-annotations are also used for SjLj-exception-mechanism. So patch adds to clauses the additional check that SjLj is deactive. ChangeLog 2013-04-23 Kai Tietz PR target/55445 * raise-gcc.c (__SEH__): Additional check that SjLj isn't active. Tested for x86_64-pc-cygwin, and x86_64-w64-mingw32. Ok for apply? Regards, Kai Index: raise-gcc.c =================================================================== --- raise-gcc.c (Revision 198124) +++ raise-gcc.c (Arbeitskopie) @@ -1019,7 +1019,7 @@ extern void __gnat_notify_unhandled_exception (str #ifdef __USING_SJLJ_EXCEPTIONS__ #define PERSONALITY_FUNCTION __gnat_personality_sj0 -#elif defined(__SEH__) +#elif defined (__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__) #define PERSONALITY_FUNCTION __gnat_personality_imp #else #define PERSONALITY_FUNCTION __gnat_personality_v0 @@ -1056,7 +1056,7 @@ typedef int version_arg_t; typedef _Unwind_Action phases_arg_t; #endif -#ifdef __SEH__ +#if defined (__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__) static #endif _Unwind_Reason_Code @@ -1222,7 +1222,7 @@ __gnat_Unwind_ForcedUnwind (_Unwind_Exception *e, #endif } -#ifdef __SEH__ +#if defined (__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__) #define STATUS_USER_DEFINED (1U << 29)