From patchwork Wed Jan 28 19:59:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Hubicka X-Patchwork-Id: 433923 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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B4D591402A4 for ; Thu, 29 Jan 2015 07:00:12 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; q=dns; s= default; b=vPSlEWgKCeydhjzmF/fNy4ahOQENxX2msGRojKEGtWtQw7tWQ36ph 4OtuV4PlqStwl08Zm2h0PHUsYdP2A1VU/uSpNFwo+cOejqkidBMBKRlezs6hZuaE lPygcRbI0teMTCwd++aTvejoRMHrulEvp3GylmHKI17K0r0Zuz4qqI= 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:date :from:to:subject:message-id:mime-version:content-type; s= default; bh=WAOxN/BZcOknSMm2mRtKOGVDmxs=; b=J+Z1ksOvimfabOIDq2hP ZJLvbY6ZhpROjp4O/Kf9tbja/IeQTDqZ5kIYhsCAjAk2/NPuPjXcqgB3ZIKfFbBY KRM+RAnmlRXzHsukmhMk5rBcPn94JL2g8bWr+7TVXIUWdTckpdwila86f4wFNu9x PY0tsiykP9kyy1KG/So08q8= Received: (qmail 9425 invoked by alias); 28 Jan 2015 19:59:13 -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 9388 invoked by uid 89); 28 Jan 2015 19:59:11 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: nikam.ms.mff.cuni.cz Received: from nikam.ms.mff.cuni.cz (HELO nikam.ms.mff.cuni.cz) (195.113.20.16) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Wed, 28 Jan 2015 19:59:10 +0000 Received: by nikam.ms.mff.cuni.cz (Postfix, from userid 16202) id 74E97543A7E; Wed, 28 Jan 2015 20:59:07 +0100 (CET) Date: Wed, 28 Jan 2015 20:59:07 +0100 From: Jan Hubicka To: gcc-patches@gcc.gnu.org Subject: Relat TLS model merging in lto-symtab Message-ID: <20150128195907.GA20192@kam.mff.cuni.cz> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Hi, newer Firefox trees fails to build because jsmalloc contain variable that is declared as tls-initial-exec in one unit but used as tls-global-dynamic in others. As discussed with Jakub on IRC, the linker supports some model transitions, so we should do the same in symtab.c too. Bootstrapped/regtested x86_64-linux, tested on firefox, comitted. Honza * lto-symtab.c (lto_varpool_replace_node): Merge TLS models. Index: lto-symtab.c =================================================================== --- lto-symtab.c (revision 220212) +++ lto-symtab.c (working copy) @@ -158,11 +158,44 @@ lto_varpool_replace_node (varpool_node * if (vnode->tls_model != prevailing_node->tls_model) { - error_at (DECL_SOURCE_LOCATION (vnode->decl), - "%qD is defined as %s", vnode->decl, tls_model_names [vnode->tls_model]); - inform (DECL_SOURCE_LOCATION (prevailing_node->decl), - "previously defined here as %s", - tls_model_names [prevailing_node->tls_model]); + bool error = false; + + /* Non-TLS and TLS never mix together. Also emulated model is not + compatible with anything else. */ + if (prevailing_node->tls_model == TLS_MODEL_NONE + || prevailing_node->tls_model == TLS_MODEL_EMULATED + || vnode->tls_model == TLS_MODEL_NONE + || vnode->tls_model == TLS_MODEL_EMULATED) + error = true; + /* Linked is silently supporting transitions + GD -> IE, GD -> LE, LD -> LE, IE -> LE, LD -> IE. + Do the same transitions and error out on others. */ + else if ((prevailing_node->tls_model == TLS_MODEL_REAL + || prevailing_node->tls_model == TLS_MODEL_LOCAL_DYNAMIC) + && (vnode->tls_model == TLS_MODEL_INITIAL_EXEC + || vnode->tls_model == TLS_MODEL_LOCAL_EXEC)) + prevailing_node->tls_model = vnode->tls_model; + else if ((vnode->tls_model == TLS_MODEL_REAL + || vnode->tls_model == TLS_MODEL_LOCAL_DYNAMIC) + && (prevailing_node->tls_model == TLS_MODEL_INITIAL_EXEC + || prevailing_node->tls_model == TLS_MODEL_LOCAL_EXEC)) + ; + else if (prevailing_node->tls_model == TLS_MODEL_INITIAL_EXEC + && vnode->tls_model == TLS_MODEL_LOCAL_EXEC) + prevailing_node->tls_model = vnode->tls_model; + else if (vnode->tls_model == TLS_MODEL_INITIAL_EXEC + && prevailing_node->tls_model == TLS_MODEL_LOCAL_EXEC) + ; + else + error = true; + if (error) + { + error_at (DECL_SOURCE_LOCATION (vnode->decl), + "%qD is defined with tls model %s", vnode->decl, tls_model_names [vnode->tls_model]); + inform (DECL_SOURCE_LOCATION (prevailing_node->decl), + "previously defined here as %s", + tls_model_names [prevailing_node->tls_model]); + } } /* Finally remove the replaced node. */ vnode->remove ();