From patchwork Thu Nov 29 21:12:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 202826 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 2910F2C0081 for ; Fri, 30 Nov 2012 08:12:40 +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=1354828361; 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=r1ABGv8 8M6W0ZgvVextZSqrDjI0=; b=AatuDCjFVH7rHG1SO7Y/AdAwkQhBmRPkvhh3HZu UXIhEl9yhXUbZFu3juT1KaWLeqsfq2mGk1GcaVB4p3hneGjpzPXtOFiNhslBvaJB +m73PKbDWraqtllQZugm4i3EYlHxFpXmyJ+rPQ+wLKTAHFCF0B6wMChP+WO0nh9S dhO4= 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=gEds4FtD50T9ezsLhmEu+e+/VFsLjCxPJBW1SRCsy+mUkwAnEQyhtTD9L3MutP TvJ2kPoC6qul7U7y1rbPWglqbV/Ih6WYGTjylF2ALSnicd5o5EyZugLw8VCI9LVr jopWWyesHTR/oEdQlSVOwKUHkx2PAqtQbQxdR/UHlDHRE=; Received: (qmail 28442 invoked by alias); 29 Nov 2012 21:12:34 -0000 Received: (qmail 28429 invoked by uid 22791); 29 Nov 2012 21:12:33 -0000 X-SWARE-Spam-Status: No, hits=-6.5 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_DNSWL_HI, RCVD_IN_HOSTKARMA_W, 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, 29 Nov 2012 21:12:29 +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 qATLCTKb010141 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 29 Nov 2012 16:12:29 -0500 Received: from anchor.twiddle.home (vpn-231-153.phx2.redhat.com [10.3.231.153]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qATLCTFm007148 for ; Thu, 29 Nov 2012 16:12:29 -0500 Message-ID: <50B7CFBC.5010109@redhat.com> Date: Thu, 29 Nov 2012 13:12:28 -0800 From: Richard Henderson User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: GCC Patches Subject: [4.6] Fix PR libgcc/48076 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 A different fix is required for 4.6, because the __atomic functions don't exist yet. r~ PR libgcc/48076 * emutls.c (__emutls_get_address): Add memory barrier before referencing emutls_key. diff --git a/gcc/emutls.c b/gcc/emutls.c index b7ee3bd..fcf6eb5 100644 --- a/gcc/emutls.c +++ b/gcc/emutls.c @@ -151,6 +151,9 @@ __emutls_get_address (struct __emutls_object *obj) __gthread_mutex_unlock (&emutls_mutex); } + /* Do not allow emutls_key to be loaded before offset. */ + __sync_synchronize(); + struct __emutls_array *arr = __gthread_getspecific (emutls_key); if (__builtin_expect (arr == NULL, 0)) {