From patchwork Thu Jan 5 01:38:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 134403 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 17D4F1007D7 for ; Thu, 5 Jan 2012 12:38:42 +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=1326332323; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:Subject: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=qzZnVF1 4NSPmYdUzj0LTaKdb/BU=; b=gtyulbh15YGPGfwwKzrfWRyenKKDHPpCSYOHPeh jsGqRrI0J4NmnzhSE128zabo1e41Ud583PwwMFDtp1BbOyI54olXlYPdsTWTGdxH 2O2qd2LVVYifH0yYz+GF/iZ7FBlW8nD1Llq62N/r6UJWscoPRXIrAkj2cIS8mW2/ Kp6M= 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:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:Subject:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=FnB8u3wQEXUDksPQUgLMdxaJUS5vJa/JWWZAvWw4qh2xXhvgdWneKhsiCcyTN8 P9O6cpCzw8Tr92bN0m4u1LAAP8cmoAKA7bMI6da40esLZ5++R5L2Bd6CRuNnKumc SJYMzxAbFhpt2sczA0q4PZl2Mp4vyUclTW3CJnZL2OoFA=; Received: (qmail 8565 invoked by alias); 5 Jan 2012 01:38:39 -0000 Received: (qmail 8556 invoked by uid 22791); 5 Jan 2012 01:38:38 -0000 X-SWARE-Spam-Status: No, hits=-7.5 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, SPF_HELO_PASS 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, 05 Jan 2012 01:38:20 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q051cJNq023317 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 4 Jan 2012 20:38:19 -0500 Received: from pebble.twiddle.net (vpn1-50-61.bne.redhat.com [10.64.50.61]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q051cICW006396 for ; Wed, 4 Jan 2012 20:38:19 -0500 Message-ID: <4F04FF09.3090108@redhat.com> Date: Thu, 05 Jan 2012 12:38:17 +1100 From: Richard Henderson User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:9.0) Gecko/20111222 Thunderbird/9.0 MIME-Version: 1.0 To: GCC Patches Subject: Fix bootstrap/51072 -- libitm not disabled without c++ 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 Second try. Unlike adjusting the gcc/cp fragment, I can't imagine this has any other side effects. Tested on x86_64-linux. Committed. r~ diff --git a/ChangeLog b/ChangeLog index b9d08f3..a8019b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-01-05 Richard Henderson + + PR bootstrap/51072 + * configure.ac: Disable libitm if c++ is not enabled. + * configure: Rebuild. + 2012-01-02 Balaji V. Iyer * MAINTAINERS (Write After Approval): Add myself. diff --git a/configure b/configure index fd6defa..d970c1d 100755 --- a/configure +++ b/configure @@ -6473,6 +6473,14 @@ case ,${enable_languages},:${enable_objc_gc} in ;; esac +# Disable libitm if we're not building C++ +case ,${enable_languages}, in + *,c++) ;; + *) + noconfigdirs="$noconfigdirs target-libitm" + ;; +esac + # Remove the entries in $skipdirs and $noconfigdirs from $configdirs, # $build_configdirs and $target_configdirs. # If we have the source for $noconfigdirs entries, add them to $notsupp. diff --git a/configure.ac b/configure.ac index 9fee563..b97c505 100644 --- a/configure.ac +++ b/configure.ac @@ -1982,6 +1982,14 @@ case ,${enable_languages},:${enable_objc_gc} in ;; esac +# Disable libitm if we're not building C++ +case ,${enable_languages}, in + *,c++) ;; + *) + noconfigdirs="$noconfigdirs target-libitm" + ;; +esac + # Remove the entries in $skipdirs and $noconfigdirs from $configdirs, # $build_configdirs and $target_configdirs. # If we have the source for $noconfigdirs entries, add them to $notsupp.