[Qemu-devel] [PATCH 51/81] Introduce CONFIG_NOSOFTFLOAT and simplify Makefile.target

[Juan Quintela]

Signed-off-by: Juan Quintela <address@hidden>
---
 Makefile.target |    8 +++-----
 configure       |    3 +++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index 6234648..cff80c7 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -58,12 +58,10 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/$(ARCH)
 ifeq ($(ARCH),sparc64)
 QEMU_CFLAGS+=-I$(SRC_PATH)/tcg/sparc
 endif
-ifdef CONFIG_SOFTFLOAT
-libobj-y += fpu/softfloat.o
-else
-libobj-y += fpu/softfloat-native.o
-endif
 QEMU_CFLAGS+=-I$(SRC_PATH)/fpu
+
+libobj-$(CONFIG_SOFTFLOAT) += fpu/softfloat.o
+libobj-$(CONFIG_NOSOFTFLOAT) += fpu/softfloat-native.o
 libobj-y += op_helper.o helper.o

 ifeq ($(TARGET_BASE_ARCH), arm)
diff --git a/configure b/configure
index fd7c6b0..8cfd4ad 100755
--- a/configure
+++ b/configure
@@ -2043,6 +2043,9 @@ case "$target_arch2" in
   
arm|armeb|m68k|microblaze|mips|mipsel|mipsn32|mipsn32el|mips64|mips64el|ppc|ppc64|ppc64abi32|ppcemb|sparc|sparc64|sparc32plus)
     echo "CONFIG_SOFTFLOAT=y" >> $config_mak
     ;;
+  *)
+    echo "CONFIG_NOSOFTFLOAT=y" >> $config_mak
+    ;;
 esac

 if test "$target_user_only" = "yes" -a "$bflt" = "yes"; then
-- 
1.6.2.5