[61/81] Added CONFIG_NEED_MMU for microblaze and cris
diff mbox

Message ID 3ff72bd04d47e0116ee0e10b959c9eaa27b02b49.1249301360.git.quintela@redhat.com
State Superseded
Headers show

Commit Message

Juan Quintela Aug. 3, 2009, 12:46 p.m. UTC
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile.target |    4 +---
 configure       |    6 ++++++
 2 files changed, 7 insertions(+), 3 deletions(-)

Patch
diff mbox

diff --git a/Makefile.target b/Makefile.target
index 7fff12d..78f89d5 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -47,6 +47,7 @@  libobj-y += tcg/tcg.o tcg/tcg-runtime.o
 libobj-$(CONFIG_SOFTFLOAT) += fpu/softfloat.o
 libobj-$(CONFIG_NOSOFTFLOAT) += fpu/softfloat-native.o
 libobj-y += op_helper.o helper.o
+libobj-$(CONFIG_NEED_MMU) += mmu.o

 ifeq ($(TARGET_BASE_ARCH), arm)
 libobj-y += neon_helper.o iwmmxt_helper.o
@@ -58,8 +59,6 @@  endif

 ifeq ($(TARGET_BASE_ARCH), cris)
 libobj-y += cris-dis.o
-
-libobj-$(CONFIG_SOFTMMU) += mmu.o
 endif

 # NOTE: the disassembler code is only needed for debugging
@@ -79,7 +78,6 @@  libobj-y += ppc-dis.o
 endif
 ifeq ($(findstring microblaze, $(TARGET_BASE_ARCH) $(ARCH)),microblaze)
 libobj-y += microblaze-dis.o
-libobj-$(CONFIG_SOFTMMU) += mmu.o
 endif
 ifeq ($(findstring mips, $(TARGET_BASE_ARCH) $(ARCH)),mips)
 libobj-y += mips-dis.o
diff --git a/configure b/configure
index b5055e2..e2e11f4 100755
--- a/configure
+++ b/configure
@@ -2086,6 +2086,12 @@  ia64)
 ;;
 esac

+if test "$target_softmmu" = "yes" -a \( \
+        "$TARGET_ARCH" = "microblaze" -o \
+        "$TARGET_ARCH" = "cris" \) ; then
+  echo "CONFIG_NEED_MMU=y" >> $config_mak
+fi
+
 if test "$gprof" = "yes" ; then
   echo "TARGET_GPROF=yes" >> $config_mak
   if test "$target_linux_user" = "yes" ; then