From patchwork Wed Jan 28 19:56:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Hubicka X-Patchwork-Id: 433922 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 0871414021A for ; Thu, 29 Jan 2015 06:57:03 +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=IA+qmZRRrVIdvHUOa9/d/1mIyS24JSlLspBh76gqm0Zl69Ppb7Re+ J45PjQzDateubt5Yl3NaJCoIJXBNmz5BsE0xX/C0sQzUV8wDu6+uRxUAe7WVUQhk vcTjPotlvh49RjQ12GLtjBKTLo4p2d8qaCdjXbfK8WiWMvgGt/577o= 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=RzfNEeUlC04ZEiTjlQrRDrsVaIg=; b=pIeqRz7INmq1TWsXsp9x wQNtMCDrZxhHiSMbsZLJ0ZoWsyF5YyGw051c4rja/i572VYadqgBiXk4yQaeSfdw BpAQAfphOUWF1RwXZFQpa/L/rorBz6LWEE4RAHTQFxumCYjNhjK34RJX+2qWxCB7 2YJs5IAGQAvaeNaxvmlGd9E= Received: (qmail 20684 invoked by alias); 28 Jan 2015 19:56:31 -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 20669 invoked by uid 89); 28 Jan 2015 19:56:29 -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:56:26 +0000 Received: by nikam.ms.mff.cuni.cz (Postfix, from userid 16202) id 498395432AC; Wed, 28 Jan 2015 20:56:22 +0100 (CET) Date: Wed, 28 Jan 2015 20:56:22 +0100 From: Jan Hubicka To: gcc-patches@gcc.gnu.org Subject: Fix tls model dumping Message-ID: <20150128195622.GB12782@kam.mff.cuni.cz> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Hi, this patch fixes dumping of tls models. tls-real is not really a model, just equivalent of tls-global-dynamic. Comitted as obvious. Honza Index: ChangeLog =================================================================== --- ChangeLog (revision 220212) +++ ChangeLog (working copy) @@ -1,3 +1,8 @@ +2015-01-28 Jan Hubicka + + * varpool.c (tls_model_names): Fix names. + (varpool_node::dump): Dump tls- prefix for tls models. + 2015-01-28 Thomas Schwinge Bernd Schmidt Nathan Sidwell Index: varpool.c =================================================================== --- varpool.c (revision 220212) +++ varpool.c (working copy) @@ -58,9 +58,9 @@ along with GCC; see the file COPYING3. #include "context.h" #include "omp-low.h" -const char * const tls_model_names[]={"none", "tls-emulated", "tls-real", - "tls-global-dynamic", "tls-local-dynamic", - "tls-initial-exec", "tls-local-exec"}; +const char * const tls_model_names[]={"none", "emulated", + "global-dynamic", "local-dynamic", + "initial-exec", "local-exec"}; /* List of hooks triggered on varpool_node events. */ struct varpool_node_hook_list { @@ -251,7 +251,7 @@ varpool_node::dump (FILE *f) if (writeonly) fprintf (f, " write-only"); if (tls_model) - fprintf (f, " %s", tls_model_names [tls_model]); + fprintf (f, " tls-%s", tls_model_names [tls_model]); fprintf (f, "\n"); }