From: Collin Funk <collin.funk1@gmail.com>
Date: Tue, 5 Aug 2025 08:07:18 +0000 (+0200)
Subject: iconv: use bswap_32 instead of __builtin_bswap32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1eec8431a5454c23faf004f4d5141367b1ef536e;p=thirdparty%2Fglibc.git

iconv: use bswap_32 instead of __builtin_bswap32

This file uses a mix of both functions, prefer the non-builtin version.

Reviewed-by: Florian Weimer <fweimer@redhat.com>
---

diff --git a/iconv/gconv_simple.c b/iconv/gconv_simple.c
index 1e29eb1a80..0ebdccee90 100644
--- a/iconv/gconv_simple.c
+++ b/iconv/gconv_simple.c
@@ -90,7 +90,7 @@ internal_ucs4_loop (struct __gconv_step *step,
   for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4, outptr += 4)
     {
       uint32_t val = get32 (inptr);
-      put32 (outptr, __builtin_bswap32 (val));
+      put32 (outptr, bswap_32 (val));
     }
 
   *inptrp = inptr;
@@ -196,7 +196,7 @@ ucs4_internal_loop (struct __gconv_step *step,
     {
       uint32_t inval = get32 (inptr);
 #if __BYTE_ORDER == __LITTLE_ENDIAN
-      inval = __builtin_bswap32 (inval);
+      inval = bswap_32 (inval);
 #endif
 
       if (__glibc_unlikely (inval > 0x7fffffff))
@@ -337,7 +337,7 @@ internal_ucs4le_loop (struct __gconv_step *step,
   for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4, outptr += 4)
     {
       uint32_t val = get32 (inptr);
-      put32 (outptr, __builtin_bswap32 (val));
+      put32 (outptr, bswap_32 (val));
     }
 
   *inptrp = inptr;
@@ -442,7 +442,7 @@ ucs4le_internal_loop (struct __gconv_step *step,
     {
       uint32_t inval = get32 (inptr);
 #if __BYTE_ORDER == __BIG_ENDIAN
-      inval = __builtin_bswap32 (inval);
+      inval = bswap_32 (inval);
 #endif
 
       if (__glibc_unlikely (inval > 0x7fffffff))