[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 4/8] qemu/bswap: Remove <byteswap.h> dependency
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 4/8] qemu/bswap: Remove <byteswap.h> dependency |
Date: |
Mon, 28 Sep 2020 15:19:30 +0200 |
Since commit efc6c070aca ("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>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
configure | 13 -------------
include/qemu/bswap.h | 17 -----------------
2 files changed, 30 deletions(-)
diff --git a/configure b/configure
index e8e8e984f24..bff787daea7 100755
--- a/configure
+++ b/configure
@@ -4886,16 +4886,6 @@ if test "$docs" != "no" ; then
fi
fi
-# Search for bswap_32 function
-byteswap_h=no
-cat > $TMPC << EOF
-#include <byteswap.h>
-int main(void) { return bswap_32(0); }
-EOF
-if compile_prog "" "" ; then
- byteswap_h=yes
-fi
-
# Search for bswap32 function
bswap_h=no
cat > $TMPC << EOF
@@ -6789,9 +6779,6 @@ fi
if test "$st_atim" = "yes" ; then
echo "HAVE_STRUCT_STAT_ST_ATIM=y" >> $config_host_mak
fi
-if test "$byteswap_h" = "yes" ; then
- echo "CONFIG_BYTESWAP_H=y" >> $config_host_mak
-fi
if test "$bswap_h" = "yes" ; then
echo "CONFIG_MACHINE_BSWAP_H=y" >> $config_host_mak
fi
diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h
index fed96dddd7a..55916670d39 100644
--- a/include/qemu/bswap.h
+++ b/include/qemu/bswap.h
@@ -10,23 +10,6 @@
# include <sys/endian.h>
#elif defined(__HAIKU__)
# include <endian.h>
-#elif defined(CONFIG_BYTESWAP_H)
-# include <byteswap.h>
-
-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);
-}
#else
#undef bswap16
#define bswap16(_x) __builtin_bswap16(_x)
--
2.26.2
- [PATCH v2 0/8] qemu/bswap: Use compiler __builtin_bswap(), Philippe Mathieu-Daudé, 2020/09/28
- [PATCH v2 1/8] qemu/bswap: Remove unused qemu_bswap_len(), Philippe Mathieu-Daudé, 2020/09/28
- [PATCH v2 2/8] qemu/bswap: Replace bswapXX() by compiler __builtin_bswap(), Philippe Mathieu-Daudé, 2020/09/28
- [PATCH v2 4/8] qemu/bswap: Remove <byteswap.h> dependency,
Philippe Mathieu-Daudé <=
- [PATCH v2 3/8] qemu/bswap: Replace bswapXXs() by compiler __builtin_bswap(), Philippe Mathieu-Daudé, 2020/09/28
- [PATCH v2 5/8] qemu/bswap: Use compiler __builtin_bswap() on Haiku, Philippe Mathieu-Daudé, 2020/09/28
- Re: [PATCH v2 5/8] qemu/bswap: Use compiler __builtin_bswap() on Haiku, Thomas Huth, 2020/09/28
- [PATCH v2 6/8] qemu/bswap: Use compiler __builtin_bswap() on FreeBSD, Philippe Mathieu-Daudé, 2020/09/28