From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id O5yBMGVidmEYagAAWB0awg (envelope-from ) for ; Mon, 25 Oct 2021 03:53:09 -0400 Received: by simark.ca (Postfix, from userid 112) id B69E21F0BD; Mon, 25 Oct 2021 03:53:09 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id A68CE1ECEB for ; Mon, 25 Oct 2021 03:53:08 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CF7913858C27 for ; Mon, 25 Oct 2021 07:53:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CF7913858C27 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1635148387; bh=W+uFPxrIV9QPVmIBb7IWEFHCLPxS2rSE9JxtpxtM9o8=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=oa5NTb01kJCs64DlRoCWKNE7ffpPmieqqIc0RNUX33EwASH3GO4dKYITSe4jeR5qy GqBdYHh0wfHzBS/72iWTTrugQfXHDw3aD4ZmHP78nr7K3KhhlHF8oo0uJAi20k3g1f 2wcqF/b89c3iPRzb8JqTZNL6AFLu2NWNv3n2siq0= Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by sourceware.org (Postfix) with ESMTPS id 545723858C27 for ; Mon, 25 Oct 2021 07:52:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 545723858C27 Received: by mail-pf1-x433.google.com with SMTP id x66so9922258pfx.13 for ; Mon, 25 Oct 2021 00:52:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=W+uFPxrIV9QPVmIBb7IWEFHCLPxS2rSE9JxtpxtM9o8=; b=cLbFb1bibkSO/5WePw+jVcOTSpJmWmkxNxYYeYxvZSJfjLpjPshDAO3iZOJDjRRRlW UG/+g6tHy+z/ZEuPNVQYwnvwrAx4iBqmJTizMgOzy39Ocbw9aDTBIFVyG2jkD9NGmMoj ToD5yOkiUIw7g+Cix2FsKP+UVdXhu1znzJUu8YPS1goDo3EHIBHMIzakYki9NXZ7DTqK 5r5aBgIib/N9bMuN3wfhKp3MDx8aGGltkC0fQmFK5cPy6Fz7d/1+LvHGaq8YE4IJ5VK9 5cl/EWAPf96xY91wVFYHxYHFtJoKYJ0E40S1wVTKt1YQ+8ppvya2cUPct4jq8OOO31g0 hxDQ== X-Gm-Message-State: AOAM5338KMQSTvBVJwovO4/ZPsIV4oKayhw6l1ZCVOWd6PvRmeTHVTgl IW0uEx6aKEe7kYE8THg8fcDdlOEpe41kBgbOuEwq6w== X-Google-Smtp-Source: ABdhPJxNpZQt+ilYi7yE+DkV0BdUgI/z+XTU1E4wdtaLrO4ATjXqS6ycjY4ErpamRvgjp0al0D1+dg== X-Received: by 2002:a63:8c52:: with SMTP id q18mr12316701pgn.137.1635148367173; Mon, 25 Oct 2021 00:52:47 -0700 (PDT) Received: from TestRunner.tealfjua5x4elltdavttcl1iug.xx.internal.cloudapp.net ([52.156.76.224]) by smtp.gmail.com with ESMTPSA id j6sm15185416pgq.0.2021.10.25.00.52.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Oct 2021 00:52:46 -0700 (PDT) To: gdb-patches@sourceware.org Subject: [PATCH] Fix using gnu print on mingw Date: Mon, 25 Oct 2021 07:52:44 +0000 Message-Id: <20211025075244.1527116-1-orgads@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Orgad Shaneh via Gdb-patches Reply-To: Orgad Shaneh Cc: Orgad Shaneh Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" --- bfd/bfd-in.h | 2 +- bfd/bfd-in2.h | 2 +- gdbsupport/format.h | 6 +++++- gnulib/import/inttypes.in.h | 8 ++++---- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h index 286afc607a3..6bb9622a514 100644 --- a/bfd/bfd-in.h +++ b/bfd/bfd-in.h @@ -131,7 +131,7 @@ typedef BFD_HOST_U_64_BIT symvalue; #if BFD_HOST_64BIT_LONG #define BFD_VMA_FMT "l" -#elif defined (__MSVCRT__) +#elif defined(__MSVCRT__) && !defined( __USE_MINGW_ANSI_STDIO) #define BFD_VMA_FMT "I64" #else #define BFD_VMA_FMT "ll" diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 669f250d0e5..dd74c4c8eb3 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -138,7 +138,7 @@ typedef BFD_HOST_U_64_BIT symvalue; #if BFD_HOST_64BIT_LONG #define BFD_VMA_FMT "l" -#elif defined (__MSVCRT__) +#elif defined (__MSVCRT__) && !defined(__USE_MINGW_ANSI_STDIO) #define BFD_VMA_FMT "I64" #else #define BFD_VMA_FMT "ll" diff --git a/gdbsupport/format.h b/gdbsupport/format.h index 921fca5e04d..75d12ae531a 100644 --- a/gdbsupport/format.h +++ b/gdbsupport/format.h @@ -23,7 +23,11 @@ #include "gdbsupport/gdb_string_view.h" #if defined(__MINGW32__) && !defined(PRINTF_HAS_LONG_LONG) -# define USE_PRINTF_I64 1 +# if !defined(__USE_MINGW_ANSI_STDIO) +# define USE_PRINTF_I64 1 +# else +# define USE_PRINTF_I64 0 +# endif # define PRINTF_HAS_LONG_LONG #else # define USE_PRINTF_I64 0 diff --git a/gnulib/import/inttypes.in.h b/gnulib/import/inttypes.in.h index e9ee500e3e6..b1f1f7edd00 100644 --- a/gnulib/import/inttypes.in.h +++ b/gnulib/import/inttypes.in.h @@ -171,7 +171,7 @@ #ifdef INT64_MAX # if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @INT64_MAX_EQ_LONG_MAX@) # define _PRI64_PREFIX "l" -# elif defined _MSC_VER || defined __MINGW32__ +# elif (defined _MSC_VER || defined __MINGW32__) && !defined(__USE_MINGW_ANSI_STDIO) # define _PRI64_PREFIX "I64" # elif LONG_MAX >> 30 == 1 # define _PRI64_PREFIX _LONG_LONG_FORMAT_PREFIX @@ -186,7 +186,7 @@ #ifdef UINT64_MAX # if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @UINT64_MAX_EQ_ULONG_MAX@) # define _PRIu64_PREFIX "l" -# elif defined _MSC_VER || defined __MINGW32__ +# elif (defined _MSC_VER || defined __MINGW32__) && !defined(__USE_MINGW_ANSI_STDIO) # define _PRIu64_PREFIX "I64" # elif ULONG_MAX >> 31 == 1 # define _PRIu64_PREFIX _LONG_LONG_FORMAT_PREFIX @@ -583,7 +583,7 @@ #ifdef INT64_MAX # if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @INT64_MAX_EQ_LONG_MAX@) # define _SCN64_PREFIX "l" -# elif defined _MSC_VER || defined __MINGW32__ +# elif (defined _MSC_VER || defined __MINGW32__) && !defined(__USE_MINGW_ANSI_STDIO) # define _SCN64_PREFIX "I64" # elif LONG_MAX >> 30 == 1 # define _SCN64_PREFIX _LONG_LONG_FORMAT_PREFIX @@ -598,7 +598,7 @@ #ifdef UINT64_MAX # if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @UINT64_MAX_EQ_ULONG_MAX@) # define _SCNu64_PREFIX "l" -# elif defined _MSC_VER || defined __MINGW32__ +# elif (defined _MSC_VER || defined __MINGW32__) && !defined(__USE_MINGW_ANSI_STDIO) # define _SCNu64_PREFIX "I64" # elif ULONG_MAX >> 31 == 1 # define _SCNu64_PREFIX _LONG_LONG_FORMAT_PREFIX -- 2.25.1