From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7879) id ED8B8385480C; Wed, 15 Feb 2023 10:18:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ED8B8385480C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1676456329; bh=77nX3WishEiNJkvL7hSrPKdpBmWdTEkVCWwdwTzOrqw=; h=From:To:Subject:Date:From; b=je7jIs92spaXMpB6+22/N0MZyGv7caZcBspj/jK4Yy5VMkAyixrrZonYadV7NmFPC IOKrM/FNG85HONMCWhyiT0ABxY0LvpH3jGQlJtJybPyxrNWllS7BZ1rdqfnUArg4h4 o1Ouib4Bxtv9y6/lkqvlKbnO6wp8acuqsnldIzC8= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Filip Kastl To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/users/pheeck/heads/sccp)] libstdc++: Fix pool resource build errors for H8 [PR107801] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/users/pheeck/heads/sccp X-Git-Oldrev: acc9817a8542ce84116d4ef4ba080f2070457616 X-Git-Newrev: fd2d4632cefcf02f396a4b6a1db8935126ed4e30 Message-Id: <20230215101849.ED8B8385480C@sourceware.org> Date: Wed, 15 Feb 2023 10:18:49 +0000 (GMT) List-Id: https://gcc.gnu.org/g:fd2d4632cefcf02f396a4b6a1db8935126ed4e30 commit fd2d4632cefcf02f396a4b6a1db8935126ed4e30 Author: Jonathan Wakely Date: Tue Nov 22 09:53:36 2022 +0000 libstdc++: Fix pool resource build errors for H8 [PR107801] The array of pool sizes was previously adjusted to work for msp430-elf which has 16-bit int and either 16-bit size_t or 20-bit size_t. The largest pool sizes were disabled unless size_t has more than 20 bits. The H8 family has 16-bit int but 32-bit size_t, which means that the largest sizes are enabled, but 1<<15 produces a negative number that then cannot be narrowed to size_t. Replace the test for 32-bit size_t with a test for 32-bit int, which means we won't use the 4kiB to 4MiB pools for targets with 16-bit int even if they have a wider size_t. libstdc++-v3/ChangeLog: PR libstdc++/107801 * src/c++17/memory_resource.cc (pool_sizes): Disable large pools for targets with 16-bit int. Diff: --- libstdc++-v3/src/c++17/memory_resource.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/src/c++17/memory_resource.cc b/libstdc++-v3/src/c++17/memory_resource.cc index 651d07489aa..0bd94dbc6a7 100644 --- a/libstdc++-v3/src/c++17/memory_resource.cc +++ b/libstdc++-v3/src/c++17/memory_resource.cc @@ -873,9 +873,11 @@ namespace pmr 256, 320, 384, 448, 512, 768, #if __SIZE_WIDTH__ > 16 + // Use bigger pools if size_t has at least 20 bits. 1024, 1536, 2048, 3072, -#if __SIZE_WIDTH__ > 20 +#if __INT_WIDTH__ >= 32 + // Use even bigger pools if int has at least 32 bits. 1<<12, 1<<13, 1<<14, 1<<15, 1<<16, 1<<17, 1<<20, 1<<21, 1<<22 // 4MB should be enough for anybody