From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-patches-return-333103-listarch-gcc-patches=gcc.gnu.org@gcc.gnu.org>
Received: (qmail 2434 invoked by alias); 29 Nov 2012 13:15:21 -0000
Received: (qmail 2315 invoked by uid 22791); 29 Nov 2012 13:15:19 -0000
X-SWARE-Spam-Status: No, hits=-3.2 required=5.0	tests=AWL,BAYES_05,DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,KHOP_RCVD_TRUST,KHOP_THREADED,NML_ADSP_CUSTOM_MED,RCVD_IN_DNSWL_LOW,RCVD_IN_HOSTKARMA_YE
X-Spam-Check-By: sourceware.org
Received: from mail-wi0-f179.google.com (HELO mail-wi0-f179.google.com) (209.85.212.179)    by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 29 Nov 2012 13:15:14 +0000
Received: by mail-wi0-f179.google.com with SMTP id hj6so4973856wib.8        for <gcc-patches@gcc.gnu.org>; Thu, 29 Nov 2012 05:15:13 -0800 (PST)
MIME-Version: 1.0
Received: by 10.216.45.144 with SMTP id p16mr9025094web.170.1354194913506; Thu, 29 Nov 2012 05:15:13 -0800 (PST)
Received: by 10.216.153.132 with HTTP; Thu, 29 Nov 2012 05:15:13 -0800 (PST)
In-Reply-To: <50B759CE.1090107@redhat.com>
References: <CAEwic4YFOVyfQ8r-gsKTGMxOBEjKUSkTRx4phY6UPPgHOFCK4w@mail.gmail.com>	<50B753FE.10809@redhat.com>	<CAEwic4bHWyJSDyaJPH_9AVAj8GSBQi-H8hFYK7AiFbTSPJEZrQ@mail.gmail.com>	<50B759CE.1090107@redhat.com>
Date: Thu, 29 Nov 2012 13:15:00 -0000
Message-ID: <CAEwic4bMMqd2JDgwHO82VssxGAJGCfcGFFzC+97iqHmJrtuAaA@mail.gmail.com>
Subject: Re: [patch c++]: 1 of 7 Fix for PR target/53912 bootstrap fails using default c++ mode in stage 2 and 3 for native x86_64-w64-mingw32
From: Kai Tietz <ktietz70@googlemail.com>
To: Pedro Alves <palves@redhat.com>
Cc: GCC Patches <gcc-patches@gcc.gnu.org>, Jason Merrill <jason@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1
X-IsSubscribed: yes
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
X-SW-Source: 2012-11/txt/msg02425.txt.bz2

Ok, here is the tested adjusted version using (u)intptr_t and hwi.  Ok
for apply?

Kai

Index: cp/class.c
===================================================================
--- cp/class.c  (Revision 193925)
+++ cp/class.c  (Arbeitskopie)
@@ -7815,9 +7815,9 @@ dump_class_hierarchy_r (FILE *stream,
   int i;

   indented = maybe_indent_hierarchy (stream, indent, 0);
-  fprintf (stream, "%s (0x%lx) ",
+  fprintf (stream, "%s (0x" HOST_WIDE_INT_PRINT_HEX ") ",
           type_as_string (BINFO_TYPE (binfo), TFF_PLAIN_IDENTIFIER),
-          (unsigned long) binfo);
+          (HOST_WIDE_INT) (uintptr_t) binfo);
   if (binfo != igo)
     {
       fprintf (stream, "alternative-path\n");
@@ -7839,10 +7839,10 @@ dump_class_hierarchy_r (FILE *stream,
   if (BINFO_PRIMARY_P (binfo))
     {
       indented = maybe_indent_hierarchy (stream, indent + 3, indented);
-      fprintf (stream, " primary-for %s (0x%lx)",
+      fprintf (stream, " primary-for %s (0x" HOST_WIDE_INT_PRINT_HEX ")",
               type_as_string (BINFO_TYPE (BINFO_INHERITANCE_CHAIN (binfo)),
                               TFF_PLAIN_IDENTIFIER),
-              (unsigned long)BINFO_INHERITANCE_CHAIN (binfo));
+              (HOST_WIDE_INT) (uintptr_t) BINFO_INHERITANCE_CHAIN (binfo));
     }
   if (BINFO_LOST_PRIMARY_P (binfo))
     {
       if (ctor_vtbl_p)
        {
          if (!BINFO_VIRTUAL_P (binfo))
-           fprintf (stream, " (0x%lx instance)", (unsigned long)binfo);
+           fprintf (stream, " (0x" HOST_WIDE_INT_PRINT_HEX " instance)",
+                    (HOST_WIDE_INT) (uintptr_t) binfo);
          fprintf (stream, " in %s", type_as_string (t, TFF_PLAIN_IDENTIFIER));
        }
       fprintf (stream, "\n");