From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-patches-return-268277-listarch-gcc-patches=gcc.gnu.org@gcc.gnu.org>
Received: (qmail 29444 invoked by alias); 15 Jul 2010 17:38:29 -0000
Received: (qmail 29430 invoked by uid 22791); 15 Jul 2010 17:38:28 -0000
X-SWARE-Spam-Status: No, hits=-5.2 required=5.0	tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,T_RP_MATCHES_RCVD
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; Thu, 15 Jul 2010 17:38:23 +0000
Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17])	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o6FHcMkU020698	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);	Thu, 15 Jul 2010 13:38:22 -0400
Received: from anchor.twiddle.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1])	by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o6FHcLtw006561;	Thu, 15 Jul 2010 13:38:21 -0400
Message-ID: <4C3F478D.4060405@redhat.com>
Date: Thu, 15 Jul 2010 17:38:00 -0000
From: Richard Henderson <rth@redhat.com>
User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.10) Gecko/20100621 Fedora/3.0.5-1.fc13 Thunderbird/3.0.5
MIME-Version: 1.0
To: IainS <developer@sandoe-acoustics.co.uk>
CC: gcc-patches List <gcc-patches@gcc.gnu.org>, mrs@gcc.gnu.org,        Uros Bizjak <ubizjak@gmail.com>, David Edelsohn <dje.gcc@gmail.com>
Subject: Re: [Patch, darwin] do not generate branch islands when the linker can do it.
References: <01CDBBB5-4E03-4483-ADCC-454819159375@sandoe-acoustics.co.uk>
In-Reply-To: <01CDBBB5-4E03-4483-ADCC-454819159375@sandoe-acoustics.co.uk>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
X-IsSubscribed: yes
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
X-SW-Source: 2010-07/txt/msg01273.txt.bz2

On 07/15/2010 10:10 AM, IainS wrote:
> -      if (! TARGET_MACHO || TARGET_64BIT)
> +      if (! TARGET_MACHO || 
> +#if TARGET_MACHO
> +          ! darwin_emit_branch_islands ||
> +#endif
> +      TARGET_64BIT)

I'd really like to avoid the #if mid if.  Perhaps

  if (TARGET_64BIT || !TARGET_MACHO_BRANCH_ISLANDS)

with

#if TARGET_MACHO
#define TARGET_MACHO_BRANCH_ISLANDS  darwin_emit_branch_islands
#else
#define TARGET_MACHO_BRANCH_ISLANDS  0
#endif

or similar via #undef.



r~