From patchwork Thu Feb 7 12:18:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uros Bizjak X-Patchwork-Id: 218906 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 E8EEB2C007A for ; Thu, 7 Feb 2013 23:18:52 +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=1360844333; h=Comment: DomainKey-Signature:Received:Received:Received:Received: MIME-Version:Received:Date:Message-ID:Subject:From:To:Cc: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=9s44qzC a4US9vLwOff/B+uNqfxg=; b=wJ8yRErJCESZf2jz5Dz3bvri8Rjc7dfW8PR1cx6 7AX6ggh7h+EhHmyxufToRLOVu9ZaFHrhXdFPv+1q08L5/AqepWaF5ZMRB9pvGXvg mQ1lHNMco0QWhSfOt6HGLHwlxjPP3S65ZTSzcPY7ZwOIV/8DcvzM25FfHi/PCYu4 s/CI= 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:MIME-Version:X-Received:Received:Date:Message-ID:Subject:From:To:Cc:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=fJxvg1OKWW6oORathydfga9L3BLhKFDZFuxu0NTdIBCEoRtn3f5QNlCY/BFSpx aDkot4hGinByHWGwfu9w+i/h+FegsKqfEzMpr2rNt24MorP3QVQw3VpvVcJuo7q2 bQjnm1wtujcn1SmE7nBVEJNN1CtsNjpK9s2ydIdssbqlc=; Received: (qmail 5734 invoked by alias); 7 Feb 2013 12:18:38 -0000 Received: (qmail 5670 invoked by uid 22791); 7 Feb 2013 12:18:33 -0000 X-SWARE-Spam-Status: No, hits=-4.3 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, TW_ZJ X-Spam-Check-By: sourceware.org Received: from mail-ob0-f177.google.com (HELO mail-ob0-f177.google.com) (209.85.214.177) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 07 Feb 2013 12:18:29 +0000 Received: by mail-ob0-f177.google.com with SMTP id wc18so2651475obb.36 for ; Thu, 07 Feb 2013 04:18:28 -0800 (PST) MIME-Version: 1.0 X-Received: by 10.60.171.230 with SMTP id ax6mr757691oec.25.1360239508654; Thu, 07 Feb 2013 04:18:28 -0800 (PST) Received: by 10.182.49.68 with HTTP; Thu, 7 Feb 2013 04:18:28 -0800 (PST) Date: Thu, 7 Feb 2013 13:18:28 +0100 Message-ID: Subject: [PATCH, bootstrap]: Fix PR56227, bootstrap failure on MinGW. From: Uros Bizjak To: gcc-patches@gcc.gnu.org Cc: "Joseph S. Myers" 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 Hello! Attached (trivial) patch substitutes a bunch of "ll" conversion types with HOST_LONG_LONG_FORMAT defines. Additionally, it fixes wrong usage of HOST_WIDE_INT_PRINT_HEX_PURE in the argument of internal_error. The patch reportedly fixes bootstrap failures on i686-pc-mingw32. 2013-02-07 Uros Bizjak * ggc-page.c (ggc_print_statistics): Use HOST_LONG_LONG_FORMAT instead of "ll". * config/i386/i386.c (ix86_print_operand): Ditto. lto/ChangeLog: 2013-02-07 Uros Bizjak * lto.c (lto_resolution_ready): Use %wx instead of HOST_WIDE_INT_PRINT_HEX_PURE in the argument to internal_error. Bootstrapped on x86_64-pc-linux-gnu. OK for mainline and 4.7 branch? Uros. Index: lto/lto.c =================================================================== --- lto/lto.c (revision 195842) +++ lto/lto.c (working copy) @@ -2225,8 +2225,7 @@ lto_resolution_read (splay_tree file_ids, FILE *re { nd = lto_splay_tree_lookup (file_ids, id); if (nd == NULL) - internal_error ("resolution sub id " HOST_WIDE_INT_PRINT_HEX_PURE - " not in object file", id); + internal_error ("resolution sub id %wx not in object file", id); } file_data = (struct lto_file_decl_data *)nd->value; Index: ggc-page.c =================================================================== --- ggc-page.c (revision 195842) +++ ggc-page.c (working copy) @@ -2170,31 +2170,31 @@ ggc_print_statistics (void) { fprintf (stderr, "\nTotal allocations and overheads during the compilation process\n"); - fprintf (stderr, "Total Overhead: %10lld\n", + fprintf (stderr, "Total Overhead: %10" HOST_LONG_LONG_FORMAT "d\n", G.stats.total_overhead); - fprintf (stderr, "Total Allocated: %10lld\n", + fprintf (stderr, "Total Allocated: %10" HOST_LONG_LONG_FORMAT "d\n", G.stats.total_allocated); - fprintf (stderr, "Total Overhead under 32B: %10lld\n", + fprintf (stderr, "Total Overhead under 32B: %10" HOST_LONG_LONG_FORMAT "d\n", G.stats.total_overhead_under32); - fprintf (stderr, "Total Allocated under 32B: %10lld\n", + fprintf (stderr, "Total Allocated under 32B: %10" HOST_LONG_LONG_FORMAT "d\n", G.stats.total_allocated_under32); - fprintf (stderr, "Total Overhead under 64B: %10lld\n", + fprintf (stderr, "Total Overhead under 64B: %10" HOST_LONG_LONG_FORMAT "d\n", G.stats.total_overhead_under64); - fprintf (stderr, "Total Allocated under 64B: %10lld\n", + fprintf (stderr, "Total Allocated under 64B: %10" HOST_LONG_LONG_FORMAT "d\n", G.stats.total_allocated_under64); - fprintf (stderr, "Total Overhead under 128B: %10lld\n", + fprintf (stderr, "Total Overhead under 128B: %10" HOST_LONG_LONG_FORMAT "d\n", G.stats.total_overhead_under128); - fprintf (stderr, "Total Allocated under 128B: %10lld\n", + fprintf (stderr, "Total Allocated under 128B: %10" HOST_LONG_LONG_FORMAT "d\n", G.stats.total_allocated_under128); for (i = 0; i < NUM_ORDERS; i++) if (G.stats.total_allocated_per_order[i]) { - fprintf (stderr, "Total Overhead page size %7lu: %10lld\n", + fprintf (stderr, "Total Overhead page size %7lu: %10" HOST_LONG_LONG_FORMAT "d\n", (unsigned long) OBJECT_SIZE (i), G.stats.total_overhead_per_order[i]); - fprintf (stderr, "Total Allocated page size %7lu: %10lld\n", + fprintf (stderr, "Total Allocated page size %7lu: %10" HOST_LONG_LONG_FORMAT "d\n", (unsigned long) OBJECT_SIZE (i), G.stats.total_allocated_per_order[i]); } Index: config/i386/i386.c =================================================================== --- config/i386/i386.c (revision 195842) +++ config/i386/i386.c (working copy) @@ -14628,7 +14628,8 @@ ix86_print_operand (FILE *file, rtx x, int code) putc ('$', file); /* Sign extend 32bit SFmode immediate to 8 bytes. */ if (code == 'q') - fprintf (file, "0x%08llx", (unsigned long long) (int) l); + fprintf (file, "0x%08" HOST_LONG_LONG_FORMAT "x", + (unsigned long long) (int) l); else fprintf (file, "0x%08x", (unsigned int) l); }