kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Revert "bswap.h: add support for built-in bswap functions" 

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 the rest of this file assumes that bswap32/64() are defined
ONLY on 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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Sebastian Andrzej Siewior 2025-06-12 00:14:37 +02:00 committed by Junio C Hamano
parent b50795db79
commit 1c62df0abe
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compat/bswap.h
View File

@ -35,19 +35,7 @@ static inline uint64_t default_bswap64(uint64_t val)
#undef bswap32 #undef bswap32
#undef bswap64 #undef bswap64


/** #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
* __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__))


#define bswap32 git_bswap32 #define bswap32 git_bswap32
static inline uint32_t git_bswap32(uint32_t x) static inline uint32_t git_bswap32(uint32_t x)