mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu/bswap: Remove <byteswap.h> dependency

Browse Source 
Since commit efc6c070ac ("configure: Add a test for the minimum
compiler version") the minimum compiler version required for GCC
is 4.8, which supports __builtin_bswap().
Drop the <byteswap.h> dependency.

Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230111163147.71761-4-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2023-01-11 17:31:44 +01:00 committed by Thomas Huth
parent b1032a23ed
commit e76ce15db7
2 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/qemu/bswap.h
View File

@ -8,9 +8,6 @@
# include <sys/endian.h> # include <sys/endian.h>
#elif defined(__HAIKU__) #elif defined(__HAIKU__)
# include <endian.h> # include <endian.h>
#elif defined(CONFIG_BYTESWAP_H)
# include <byteswap.h>
#define BSWAP_FROM_BYTESWAP
# else # else
#define BSWAP_FROM_FALLBACKS #define BSWAP_FROM_FALLBACKS
#endif /* ! CONFIG_MACHINE_BSWAP_H */ #endif /* ! CONFIG_MACHINE_BSWAP_H */
@ -19,23 +16,6 @@
extern "C" { extern "C" {
#endif #endif
#ifdef BSWAP_FROM_BYTESWAP
static inline uint16_t bswap16(uint16_t x)
{
return bswap_16(x);
}
static inline uint32_t bswap32(uint32_t x)
{
return bswap_32(x);
}
static inline uint64_t bswap64(uint64_t x)
{
return bswap_64(x);
}
#endif
#ifdef BSWAP_FROM_FALLBACKS #ifdef BSWAP_FROM_FALLBACKS
#undef bswap16 #undef bswap16
#define bswap16(_x) __builtin_bswap16(_x) #define bswap16(_x) __builtin_bswap16(_x)
@ -45,7 +25,6 @@ static inline uint64_t bswap64(uint64_t x)
#define bswap64(_x) __builtin_bswap64(_x) #define bswap64(_x) __builtin_bswap64(_x)
#endif #endif
#undef BSWAP_FROM_BYTESWAP
#undef BSWAP_FROM_FALLBACKS #undef BSWAP_FROM_FALLBACKS
static inline void bswap16s(uint16_t *s) static inline void bswap16s(uint16_t *s)

2
meson.build
View File

@ -2013,8 +2013,6 @@ if rdma.found()
endif endif
# has_header_symbol # has_header_symbol
config_host_data.set('CONFIG_BYTESWAP_H',
cc.has_header_symbol('byteswap.h', 'bswap_32'))
config_host_data.set('CONFIG_EPOLL_CREATE1', config_host_data.set('CONFIG_EPOLL_CREATE1',
cc.has_header_symbol('sys/epoll.h', 'epoll_create1')) cc.has_header_symbol('sys/epoll.h', 'epoll_create1'))
config_host_data.set('CONFIG_FALLOCATE_PUNCH_HOLE', config_host_data.set('CONFIG_FALLOCATE_PUNCH_HOLE',