From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 780923898525; Fri, 18 Dec 2020 16:55:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 780923898525 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Patrick Palka To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-6260] libstdc++: Fix build failure on AArch64 ILP32 [PR98370] X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/master X-Git-Oldrev: d7bab388b818fc21dbb9111311e114ae33e11fff X-Git-Newrev: 22a7e82c200d01d12e34e757e86dc9796a9bf085 Message-Id: <20201218165526.780923898525@sourceware.org> Date: Fri, 18 Dec 2020 16:55:26 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Dec 2020 16:55:26 -0000 https://gcc.gnu.org/g:22a7e82c200d01d12e34e757e86dc9796a9bf085 commit r11-6260-g22a7e82c200d01d12e34e757e86dc9796a9bf085 Author: Patrick Palka Date: Fri Dec 18 11:52:24 2020 -0500 libstdc++: Fix build failure on AArch64 ILP32 [PR98370] This should fix a build failure on AArch64 ILP32 due to int32_t mapping to long int instead of int on this platform, which causes type deduction to fail in the below call to std::max as reported in the PR. libstdc++-v3/ChangeLog: PR libstdc++/98370 * src/c++17/floating_to_chars.cc (__floating_to_chars_shortest): Provide explicit template arguments to the call to std::max. Diff: --- libstdc++-v3/src/c++17/floating_to_chars.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/src/c++17/floating_to_chars.cc b/libstdc++-v3/src/c++17/floating_to_chars.cc index 6470fbb0b95..3f46bce7a15 100644 --- a/libstdc++-v3/src/c++17/floating_to_chars.cc +++ b/libstdc++-v3/src/c++17/floating_to_chars.cc @@ -977,7 +977,7 @@ template // fd.exponent contain all of the information needed to format the // number in fixed notation "as if by std::printf" (with precision // equal to -fd.exponent). - const int whole_digits = max(mantissa_length + fd.exponent, 1); + const int whole_digits = max(mantissa_length + fd.exponent, 1); const int expected_output_length = fd.sign + whole_digits + strlen(".") + -fd.exponent; if (last - first < expected_output_length)