From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46546) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USTKf-0006T0-Iz for qemu-devel@nongnu.org; Wed, 17 Apr 2013 10:27:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1USTKa-0005f0-Kh for qemu-devel@nongnu.org; Wed, 17 Apr 2013 10:27:33 -0400 Received: from mail-ee0-f46.google.com ([74.125.83.46]:57923) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USTKa-0005el-Ef for qemu-devel@nongnu.org; Wed, 17 Apr 2013 10:27:28 -0400 Received: by mail-ee0-f46.google.com with SMTP id d49so802572eek.33 for ; Wed, 17 Apr 2013 07:27:27 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 17 Apr 2013 16:26:47 +0200 Message-Id: <1366208807-4433-14-git-send-email-pbonzini@redhat.com> In-Reply-To: <1366208807-4433-1-git-send-email-pbonzini@redhat.com> References: <1366208807-4433-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 13/13] configure: remove duplicate test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, edgar.iglesias@gmail.com We already had a test to add -march=i486 when needed. Make the existing test independent of vhost-net, so that it is also used under Win32. Signed-off-by: Paolo Bonzini --- configure | 56 ++++++++++++++++++++++++++------------------------------ 1 file changed, 26 insertions(+), 30 deletions(-) diff --git a/configure b/configure index 78afded..9525bd7 100755 --- a/configure +++ b/configure @@ -574,11 +574,6 @@ if test "$mingw32" = "yes" ; then QEMU_CFLAGS="-DWIN32_LEAN_AND_MEAN -DWINVER=0x501 $QEMU_CFLAGS" # enable C99/POSIX format strings (needs mingw32-runtime 3.15 or later) QEMU_CFLAGS="-D__USE_MINGW_ANSI_STDIO=1 $QEMU_CFLAGS" - if test "$cpu" = "i386"; then - # We need something better than i386 for __sync_val_compare_and_swap - # and can expect that QEMU will only run on i686 or later. - QEMU_CFLAGS="-march=i686 $QEMU_CFLAGS" - fi LIBS="-lwinmm -lws2_32 -liphlpapi $LIBS" cat > $TMPC << EOF int main(void) { return 0; } @@ -1323,9 +1318,33 @@ EOF fi fi -# +########################################## +# __sync_fetch_and_and requires at least -march=i486. Many toolchains +# use i686 as default anyway, but for those that don't, an explicit +# specification is necessary + +if test "$cpu" = "i386"; then + cat > $TMPC << EOF +static int sfaa(int *ptr) +{ + return __sync_fetch_and_and(ptr, 0); +} + +int main(void) +{ + int val = 42; + sfaa(&val); + return val; +} +EOF + if ! compile_prog "" "" ; then + QEMU_CFLAGS="-march=i486 $QEMU_CFLAGS" + fi +fi + +######################################### # Solaris specific configure tool chain decisions -# + if test "$solaris" = "yes" ; then if has $install; then : @@ -3149,29 +3168,6 @@ if test "$trace_backend" = "dtrace"; then fi ########################################## -# __sync_fetch_and_and requires at least -march=i486. Many toolchains -# use i686 as default anyway, but for those that don't, an explicit -# specification is necessary -if test "$vhost_net" = "yes" && test "$cpu" = "i386"; then - cat > $TMPC << EOF -static int sfaa(int *ptr) -{ - return __sync_fetch_and_and(ptr, 0); -} - -int main(void) -{ - int val = 42; - sfaa(&val); - return val; -} -EOF - if ! compile_prog "" "" ; then - QEMU_CFLAGS="-march=i486 $QEMU_CFLAGS" - fi -fi - -########################################## # check and set a backend for coroutine # We prefer ucontext, but it's not always possible. The fallback -- 1.8.1.4