From patchwork Tue Jun 24 12:50:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Teresa Johnson X-Patchwork-Id: 363431 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 3E97414001A for ; Tue, 24 Jun 2014 22:51:11 +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 :mime-version:date:message-id:subject:from:to:content-type; q= dns; s=default; b=LXrAcf+lU1sblbRg9lda6F7zn1guTLGZxldnrFPvi6t7Sw X/QTo4o2BueXfkV2iaSHzyyHECq8LrQUxEwcB4eWP6boZlxR9aSr8b3ny1FUn5eL KBQBEGT+K741BNlX6UZu/NpQTqAXqLHdHf+xxu4dBEmJcYjXJ77gYw9sWcmUQ= 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 :mime-version:date:message-id:subject:from:to:content-type; s= default; bh=7PeUpP435Nb7Z0TMX1vBk2zxUz8=; b=bpXl+HfzJ6wpS6UxPG0T X0hvpjtvX09skh5ju6mhMm7O+5+Fm0H3a7o9FXIgFPCzGn8EaNBK6jb4cLMc31PM /P25whsFL7ipDT687sIB01dajftsWBIpQ5st23XeiwuGPfQvqRV4APAy1JhgIgTD loygii/bpQyTqnhu/kdrssc= Received: (qmail 32088 invoked by alias); 24 Jun 2014 12:51:05 -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 32077 invoked by uid 89); 24 Jun 2014 12:51:04 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.9 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mail-qc0-f175.google.com Received: from mail-qc0-f175.google.com (HELO mail-qc0-f175.google.com) (209.85.216.175) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Tue, 24 Jun 2014 12:50:58 +0000 Received: by mail-qc0-f175.google.com with SMTP id i8so205548qcq.34 for ; Tue, 24 Jun 2014 05:50:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:date:message-id:subject:from:to :content-type; bh=3lPmcMQZLPdsmoDFsHXa3WyH+CW529mml7I5zc7p5Z4=; b=jsXFiYdoSH48f7YXEMCVAImdimsS8R0I84f6whz+jHsD+wAQT5qhGgUsThoHw0zUVn 8aiPJFGls5QGkMqUQNYmWx4hcf8S6vVGGNVfPmNMOcobu/Gzmkm2NgABF7blX1Ci0cWP z7e9WEdF2Gj27eOgVxWJL9Bf/PnvACc5N0LVbLeyIrha3WTHVasM1u/suDeuZwPzfSD/ tuWujeOx58Hsu3Qzg9ZYNDqYutwhcPDkg543FBSwT9jJYpqNTQtkXYyl3yKv16Kijs8C Y43wT3x4Np0lpLA63u+NG0sxgOkLJYKyPIgd/gVdZuJ5DTFPdsyiTxOfCorEL0qC59SA MyjA== X-Gm-Message-State: ALoCoQkz7YEV+2tt9ndeJkU0sLQwKsTPCJ1lA6+kFWzQAU71ztj3t5UuRR8RF6nTb2RipNfunaPG MIME-Version: 1.0 X-Received: by 10.140.37.75 with SMTP id q69mr1310321qgq.60.1403614256070; Tue, 24 Jun 2014 05:50:56 -0700 (PDT) Received: by 10.229.208.67 with HTTP; Tue, 24 Jun 2014 05:50:56 -0700 (PDT) Date: Tue, 24 Jun 2014 05:50:56 -0700 Message-ID: Subject: [GOOGLE] Fix -femit-function-names in LIPO profile-use mode From: Teresa Johnson To: "gcc-patches@gcc.gnu.org" , David Li X-IsSubscribed: yes Emit the proper module name in LIPO profile-use mode. Passes regression tests, ok for google branches? Thanks, Teresa 2014-06-24 Teresa Johnson * coverage.c (emit_function_name): Emit module name in LIPO mode. Index: coverage.c =================================================================== --- coverage.c (revision 211893) +++ coverage.c (working copy) @@ -1882,7 +1882,9 @@ void emit_function_name (void) { fprintf (stderr, "Module %s FuncId %u Name %s\n", - main_input_file_name, + (L_IPO_COMP_MODE + ? get_module_name (FUNC_DECL_MODULE_ID (cfun)) + : main_input_file_name), FUNC_DECL_FUNC_ID (cfun), IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (current_function_decl))); }