From patchwork Sun Aug 18 15:51:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Sandoe X-Patchwork-Id: 268042 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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 8D5372C021B for ; Mon, 19 Aug 2013 01:51:49 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :content-type:content-transfer-encoding:subject:date:message-id :cc:to:mime-version; q=dns; s=default; b=UevpYlKdoWPKSKkHtEjwmpL 5LflWpDIO6p6XZCDNDhDr0WfHUYAsN68gTfIndqP2uZzm1z2utRBT07TalVf6cV8 C21BC1KET/0WNVqdLDf7DFKlpkM55GMevjoHOrUowYIDM+/F5hGetF2aCLL03qeT fgrficXF1FNRyfQlwg7U= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :content-type:content-transfer-encoding:subject:date:message-id :cc:to:mime-version; s=default; bh=oYUR7Qp8d2RGTyxKXGegUPtSdlQ=; b= HLAXF7PVG5uVQAzetC5N8x38yopf3A2la+XIc3EZpmqCju+LEUc7CGtgjLf3piQU e4WTwxPcwnOwcI0mbmp5W8WQWULODBuImm5X+8Y5WTjLurIreg+7A4wOSJ9IS+pw IIJWlSp1L9Ly7bPsogVfPEnkbNEoaOxmtl5b1BxFBzY= Received: (qmail 30253 invoked by alias); 18 Aug 2013 15:51:39 -0000 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 Received: (qmail 30242 invoked by uid 89); 18 Aug 2013 15:51:38 -0000 X-Spam-SWARE-Status: No, score=-3.8 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_HOSTKARMA_W, RCVD_IN_HOSTKARMA_WL autolearn=ham version=3.3.2 Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Sun, 18 Aug 2013 15:51:38 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1VB5GQ-0002Cy-AI from Iain_Sandoe@mentor.com ; Sun, 18 Aug 2013 08:51:34 -0700 Received: from SVR-IES-FEM-01.mgc.mentorg.com ([137.202.0.104]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Sun, 18 Aug 2013 08:51:34 -0700 Received: from [127.0.0.1] (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.2.247.3; Sun, 18 Aug 2013 16:51:32 +0100 From: Iain Sandoe Subject: [Patch, libgcov, committed] fix PR 58127 Date: Sun, 18 Aug 2013 16:51:29 +0100 Message-ID: CC: Jan Hubicka , Dominique Dhumieres To: GCC Patches MIME-Version: 1.0 (Apple Message framework v1283) Hi, This was approved by Honza in the PR thread. applied as 201829 cheers Iain libgcc: PR gcov-profile/58127 * libgcov.c (__gcov_indirect_call_callee): Don't make this a __thread var for emulated TLS. (__gcov_indirect_call_counters): Likewise. Index: libgcc/libgcov.c =================================================================== --- libgcc/libgcov.c (revision 201825) +++ libgcc/libgcov.c (working copy) @@ -1162,11 +1162,11 @@ __gcov_indirect_call_profiler (gcov_type* counter, The variables are set directly by GCC instrumented code, so declaration here must match one in tree-profile.c */ -#ifdef HAVE_CC_TLS +#if defined(HAVE_CC_TLS) && !defined (USE_EMUTLS) __thread #endif void * __gcov_indirect_call_callee; -#ifdef HAVE_CC_TLS +#if defined(HAVE_CC_TLS) && !defined (USE_EMUTLS) __thread #endif gcov_type * __gcov_indirect_call_counters;