qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Kamil Rytarowski" <kamil@netbsd.org>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH v2 7/8] qemu/bswap: Use compiler __builtin_bswap() on NetBSD
Date: Mon, 28 Sep 2020 15:19:33 +0200	[thread overview]
Message-ID: <20200928131934.739451-8-philmd@redhat.com> (raw)
In-Reply-To: <20200928131934.739451-1-philmd@redhat.com>

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().
Remove the NetBSD specific ifdef'ry.

This reverts commit 1360677cfe3ca8f945fa1de77823df21a77e4500
("makes NetBSD use the native bswap functions").

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 configure            | 15 ---------------
 include/qemu/bswap.h |  5 -----
 2 files changed, 20 deletions(-)

diff --git a/configure b/configure
index bff787daea7..1b0a02a0af8 100755
--- a/configure
+++ b/configure
@@ -4886,18 +4886,6 @@ if test "$docs" != "no" ; then
   fi
 fi
 
-# Search for bswap32 function
-bswap_h=no
-cat > $TMPC << EOF
-#include <sys/endian.h>
-#include <sys/types.h>
-#include <machine/bswap.h>
-int main(void) { return bswap32(0); }
-EOF
-if compile_prog "" "" ; then
-  bswap_h=yes
-fi
-
 ##########################################
 # Do we have libiscsi >= 1.9.0
 if test "$libiscsi" != "no" ; then
@@ -6779,9 +6767,6 @@ fi
 if test "$st_atim" = "yes" ; then
   echo "HAVE_STRUCT_STAT_ST_ATIM=y" >> $config_host_mak
 fi
-if test "$bswap_h" = "yes" ; then
-  echo "CONFIG_MACHINE_BSWAP_H=y" >> $config_host_mak
-fi
 if test "$curl" = "yes" ; then
   echo "CONFIG_CURL=y" >> $config_host_mak
   echo "CURL_CFLAGS=$curl_cflags" >> $config_host_mak
diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h
index 1a297bfec22..7e586531c09 100644
--- a/include/qemu/bswap.h
+++ b/include/qemu/bswap.h
@@ -3,17 +3,12 @@
 
 #include "fpu/softfloat-types.h"
 
-#ifdef CONFIG_MACHINE_BSWAP_H
-# include <sys/endian.h>
-# include <machine/bswap.h>
-#else
 #undef  bswap16
 #define bswap16(_x) __builtin_bswap16(_x)
 #undef  bswap32
 #define bswap32(_x) __builtin_bswap32(_x)
 #undef  bswap64
 #define bswap64(_x) __builtin_bswap64(_x)
-#endif /* ! CONFIG_MACHINE_BSWAP_H */
 
 static inline void bswap16s(uint16_t *s)
 {
-- 
2.26.2



  parent reply	other threads:[~2020-09-28 13:33 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-28 13:19 [PATCH v2 0/8] qemu/bswap: Use compiler __builtin_bswap() Philippe Mathieu-Daudé
2020-09-28 13:19 ` [PATCH v2 1/8] qemu/bswap: Remove unused qemu_bswap_len() Philippe Mathieu-Daudé
2020-09-28 13:19 ` [PATCH v2 2/8] qemu/bswap: Replace bswapXX() by compiler __builtin_bswap() Philippe Mathieu-Daudé
2020-09-28 13:19 ` [PATCH v2 3/8] qemu/bswap: Replace bswapXXs() " Philippe Mathieu-Daudé
2020-09-28 17:29   ` Thomas Huth
2020-09-28 13:19 ` [PATCH v2 4/8] qemu/bswap: Remove <byteswap.h> dependency Philippe Mathieu-Daudé
2020-09-28 13:19 ` [PATCH v2 5/8] qemu/bswap: Use compiler __builtin_bswap() on Haiku Philippe Mathieu-Daudé
2020-09-28 14:09   ` David CARLIER
2020-09-28 14:13     ` Daniel P. Berrangé
2020-09-28 14:18       ` Philippe Mathieu-Daudé
2020-10-19 11:00         ` Philippe Mathieu-Daudé
2020-09-28 15:00       ` David CARLIER
2020-09-28 17:29   ` Thomas Huth
2020-09-28 13:19 ` [PATCH v2 6/8] qemu/bswap: Use compiler __builtin_bswap() on FreeBSD Philippe Mathieu-Daudé
2020-09-28 17:32   ` Thomas Huth
2020-09-28 17:57     ` Philippe Mathieu-Daudé
2020-09-28 17:58       ` Philippe Mathieu-Daudé
2020-09-28 21:16   ` Ed Maste
2020-09-28 13:19 ` Philippe Mathieu-Daudé [this message]
2020-09-28 21:51   ` [PATCH v2 7/8] qemu/bswap: Use compiler __builtin_bswap() on NetBSD Kamil Rytarowski
2020-09-29  8:58     ` Peter Maydell
2020-09-29 14:06       ` Kamil Rytarowski
2020-09-28 13:19 ` [RFC PATCH v2 8/8] tests/vm: Add Haiku test based on their vagrant images Philippe Mathieu-Daudé

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=20200928131934.739451-8-philmd@redhat.com \
    --to=philmd@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=fam@euphon.net \
    --cc=kamil@netbsd.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).