From: Junio C Hamano <gitster@pobox•com>
To: Sebastian Andrzej Siewior <sebastian@breakpoint•cc>
Cc: git@vger•kernel.org
Subject: Re: [PATCH v2 1/6] Revert "bswap.h: add support for built-in bswap functions"
Date: Thu, 12 Jun 2025 13:04:17 -0700 [thread overview]
Message-ID: <xmqq34c4enge.fsf@gitster.g> (raw)
In-Reply-To: <20250611221444.1567638-2-sebastian@breakpoint.cc> (Sebastian Andrzej Siewior's message of "Thu, 12 Jun 2025 00:14:37 +0200")
Sebastian Andrzej Siewior <sebastian@breakpoint•cc> writes:
> Since 6547d1c9 (bswap.h: add support for built-in bswap
> functions, 2025-04-23) tweaked the way the bswap32/64 macros are
> defined, on platforms with __builtin_bswap32/64 supported, the
> bswap32/64 macros are defined even on big endian platforms.
>
> However this file assumes that bswap31/64 are defined ONLY on
31/64 -> 32/64? Just sanity checking the typofix I plan to make
locally while applying this patch.
> little endian machines and uses that assumption to redefine
> ntohl/ntohll macros. The said commit broke t4014-format-patch.sh test,
> among many others on s390x.
>
> Revert the commit.
>
> Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint•cc>
> ---
> compat/bswap.h | 14 +-------------
> 1 file changed, 1 insertion(+), 13 deletions(-)
>
> diff --git a/compat/bswap.h b/compat/bswap.h
> index 9e0f98e00b93a..b34054f2bd728 100644
> --- a/compat/bswap.h
> +++ b/compat/bswap.h
> @@ -35,19 +35,7 @@ static inline uint64_t default_bswap64(uint64_t val)
> #undef bswap32
> #undef bswap64
>
> -/**
> - * __has_builtin is available since Clang 10 and GCC 10.
> - * Below is a fallback for older compilers.
> - */
> -#ifndef __has_builtin
> - #define __has_builtin(x) 0
> -#endif
> -
> -#if __has_builtin(__builtin_bswap32) && __has_builtin(__builtin_bswap64)
> -#define bswap32(x) __builtin_bswap32((x))
> -#define bswap64(x) __builtin_bswap64((x))
> -
> -#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
> +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
>
> #define bswap32 git_bswap32
> static inline uint32_t git_bswap32(uint32_t x)
next prev parent reply other threads:[~2025-06-12 20:04 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-11 22:14 [PATCH v2 0/6] bswap.h: Rework ntohl handling Sebastian Andrzej Siewior
2025-06-11 22:14 ` [PATCH v2 1/6] Revert "bswap.h: add support for built-in bswap functions" Sebastian Andrzej Siewior
2025-06-12 20:04 ` Junio C Hamano [this message]
2025-06-11 22:14 ` [PATCH v2 2/6] bswap.h: Add support for __BYTE_ORDER__ Sebastian Andrzej Siewior
2025-06-12 0:24 ` brian m. carlson
2025-06-12 0:43 ` Collin Funk
2025-06-12 20:10 ` Junio C Hamano
2025-06-11 22:14 ` [PATCH v2 3/6] bswap.h: Define GIT_LITTLE_ENDIAN on msvc as little endian Sebastian Andrzej Siewior
2025-06-12 20:11 ` Junio C Hamano
2025-06-11 22:14 ` [PATCH v2 4/6] bswap.h: Always overwrite ntohl/ ntohll macros Sebastian Andrzej Siewior
2025-06-12 0:14 ` brian m. carlson
2025-06-12 20:16 ` Junio C Hamano
2025-06-11 22:14 ` [PATCH v2 5/6] bswap.h: Remove optimized x86 version of bswap32/64 Sebastian Andrzej Siewior
2025-06-26 15:55 ` Kristoffer Haugsbakk
2025-07-15 19:02 ` Sebastian Andrzej Siewior
2025-06-11 22:14 ` [PATCH v2 5/6] bswap: " Sebastian Andrzej Siewior
2025-06-11 22:14 ` [PATCH v2 6/6] bswap.h: Provide a built-in based version of bswap32/64 if possible Sebastian Andrzej Siewior
2025-06-12 20:21 ` [PATCH v2 0/6] bswap.h: Rework ntohl handling Junio C Hamano
2025-07-07 22:43 ` Junio C Hamano
2025-07-09 6:04 ` Sebastian Andrzej Siewior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq34c4enge.fsf@gitster.g \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=sebastian@breakpoint$(echo .)cc \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox