> Date: Mon, 26 Jun 2023 11:57:49 -0700
> From: Thomas Rodgers via Gcc-patches <gcc-patches@gcc.gnu.org>
> On Wed, May 17, 2023 at 12:32 PM Jonathan Wakely <jwak...@redhat.com> wrote:
> > All the actual code changes look good.
Unfortunately, this overwrote the fix for PR108672. I take
it there's a step missing from the synchronization process;
a check that no local commits are overwritten? Sounds like
something that can be fully scripted (not volunteering) or
already available (like, "list all commits affecting
contents touched by/between two named commits").
I did *not* check whether any other local commits were also
overwritten. Also, not sure about whether better try to get
this upstreamed: __INT32_TYPE__ seems gcc-specific.
Anyway, r13-5702-g72058eea9d407e was "re-committed" per
below as obvious after regtesting cris-elf.
brgds, H-P
-- >8 --
Subject: libstdc++: Re-apply PR108672 fix (avoid use of naked int32_t in
unseq_backend_simd.h)
The fix was overwritten by r14-2109-g3162ca09dbdc2e "libstdc++:
Synchronize PSTL with upstream".
libstdc++-v3:
PR libstdc++/108672
* include/pstl/unseq_backend_simd.h (__simd_or): Re-apply using
__INT32_TYPE__ instead of int32_t.
---
libstdc++-v3/include/pstl/unseq_backend_simd.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libstdc++-v3/include/pstl/unseq_backend_simd.h
b/libstdc++-v3/include/pstl/unseq_backend_simd.h
index 69784bcdbe66..f3c38fbbbc2a 100644
--- a/libstdc++-v3/include/pstl/unseq_backend_simd.h
+++ b/libstdc++-v3/include/pstl/unseq_backend_simd.h
@@ -74,7 +74,7 @@ __simd_or(_Index __first, _DifferenceType __n, _Pred __pred)
noexcept
const _Index __last = __first + __n;
while (__last != __first)
{
- int32_t __flag = 1;
+ __INT32_TYPE__ __flag = 1;
_PSTL_PRAGMA_SIMD_REDUCTION(& : __flag)
for (_DifferenceType __i = 0; __i < __block_size; ++__i)
if (__pred(*(__first + __i)))
--
2.30.2
