From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5434 invoked by alias); 9 Nov 2011 18:39:47 -0000 Received: (qmail 5423 invoked by uid 22791); 9 Nov 2011 18:39:47 -0000 X-SWARE-Spam-Status: No, hits=-7.0 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,SPF_HELO_PASS,TW_GJ,TW_SV X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 09 Nov 2011 18:39:34 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id pA9IdP7Q029411 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 9 Nov 2011 13:39:26 -0500 Received: from anchor.twiddle.net (vpn-225-179.phx2.redhat.com [10.3.225.179]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id pA9IdOQJ005921; Wed, 9 Nov 2011 13:39:24 -0500 Message-ID: <4EBAC8DB.7050807@redhat.com> Date: Wed, 09 Nov 2011 18:56:00 -0000 From: Richard Henderson User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:7.0) Gecko/20110927 Thunderbird/7.0 MIME-Version: 1.0 To: Iain Sandoe CC: gcc-patches Patches , DJ Delorie , Alexandre Oliva Subject: Re: Disable libitm if unsupported References: <4EB959F0.60301@redhat.com> <201111081726.24103.pedro@codesourcery.com> <4EB96781.4030409@redhat.com> <201111081756.04563.pedro@codesourcery.com> <4EB97355.70704@redhat.com> <4EB99F2A.9020601@redhat.com> <4EBAB1E6.5070602@redhat.com> In-Reply-To: Content-Type: multipart/mixed; boundary="------------000404080002030803030006" X-IsSubscribed: yes 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: 2011-11/txt/msg01346.txt.bz2 This is a multi-part message in MIME format. --------------000404080002030803030006 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-length: 83 > I'll hang on .. and test stuff ;-) Try now. I've committed the following. r~ --------------000404080002030803030006 Content-Type: text/plain; name="z" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="z" Content-length: 1762 commit f29a2041f32773464e226a83f41762c2e9cf658e Author: rth Date: Wed Nov 9 18:38:21 2011 +0000 libitm: de-ELF-ize x86/sjlj.S. * config/x86/sjlj.S: Protect elf directives with __ELF__. Protect .note.GNU-stack with __linux__. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@181229 138bc75d-0d04-0410-961f-82ee72b054a4 diff --git a/libitm/ChangeLog b/libitm/ChangeLog index e91f91e..e78716d 100644 --- a/libitm/ChangeLog +++ b/libitm/ChangeLog @@ -1,5 +1,8 @@ 2011-11-09 Richard Henderson + * config/x86/sjlj.S: Protect elf directives with __ELF__. + Protect .note.GNU-stack with __linux__. + * configure.ac (GCC_AS_CFI_PSEUDO_OP): Test it. * configure, aclocal.m4, config.h.in: Rebuild. * config/generic/asmcfi.h: New file. diff --git a/libitm/config/x86/sjlj.S b/libitm/config/x86/sjlj.S index 6169499..32572d9 100644 --- a/libitm/config/x86/sjlj.S +++ b/libitm/config/x86/sjlj.S @@ -26,9 +26,9 @@ #include "asmcfi.h" .text - .p2align 4 + + .align 4 .globl _ITM_beginTransaction - .type _ITM_beginTransaction, @function _ITM_beginTransaction: cfi_startproc @@ -66,12 +66,14 @@ _ITM_beginTransaction: ret #endif cfi_endproc + +#ifdef __ELF__ + .type _ITM_beginTransaction, @function .size _ITM_beginTransaction, .-_ITM_beginTransaction +#endif - .p2align 4 + .align 4 .globl GTM_longjmp - .type GTM_longjmp, @function - .hidden GTM_longjmp GTM_longjmp: cfi_startproc @@ -103,6 +105,13 @@ GTM_longjmp: jmp *%edx #endif cfi_endproc + +#ifdef __ELF__ + .type GTM_longjmp, @function + .hidden GTM_longjmp .size GTM_longjmp, .-GTM_longjmp +#endif +#ifdef __linux__ .section .note.GNU-stack, "", @progbits +#endif --------------000404080002030803030006--