From patchwork Thu Oct 20 21:02:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aldy Hernandez X-Patchwork-Id: 120878 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 5A33B1007D1 for ; Fri, 21 Oct 2011 08:02:33 +1100 (EST) Received: (qmail 7914 invoked by alias); 20 Oct 2011 21:02:31 -0000 Received: (qmail 7902 invoked by uid 22791); 20 Oct 2011 21:02:30 -0000 X-SWARE-Spam-Status: No, hits=-6.6 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, 20 Oct 2011 21:02:16 +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 p9KL2GTE029932 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 20 Oct 2011 17:02:16 -0400 Received: from houston.quesejoda.com (vpn-238-107.phx2.redhat.com [10.3.238.107]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p9KL2F9E013942; Thu, 20 Oct 2011 17:02:16 -0400 Message-ID: <4EA08C57.7030204@redhat.com> Date: Thu, 20 Oct 2011 16:02:15 -0500 From: Aldy Hernandez User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:7.0) Gecko/20110927 Thunderbird/7.0 MIME-Version: 1.0 To: Andrew MacLeod , gcc-patches Subject: [cxx-mem-model] Handle x86-64 with -m32 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 These operations don't exist on x86-32 bits, and when running multilibed tests, the target is still x86_64-unknown-linux-gnu but the target is 32-bits when using -m32. The following change checks that we are actually running in 64-bits before assuming sync_int_128 or sync_long_long exist on the target. OK for branch? * lib/target-supports.exp (check_effective_target_sync_int_128): Only set when running in 64-bit mode. (check_effective_target_sync_long_long): Same. Index: lib/target-supports.exp =================================================================== --- lib/target-supports.exp (revision 180156) +++ lib/target-supports.exp (working copy) @@ -3456,7 +3456,7 @@ proc check_effective_target_sync_int_128 verbose "check_effective_target_sync_int_128: using cached result" 2 } else { set et_sync_int_128_saved 0 - if { [istarget x86_64-*-*] } { + if { [istarget x86_64-*-*] && [is-effective-target lp64] } { set et_sync_int_128_saved 1 } } @@ -3474,7 +3474,7 @@ proc check_effective_target_sync_long_lo verbose "check_effective_target_sync_long_long: using cached result" 2 } else { set et_sync_long_long_saved 0 - if { [istarget x86_64-*-*] } { + if { [istarget x86_64-*-*] && [is-effective-target lp64] } { set et_sync_long_long_saved 1 } }