Commit 38ca2abc2eb0fc8edd067420b3fcfa10ffa0054b
1 parent
73bdea19
m68k compile fix
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@655 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
6 additions
and
7 deletions
Makefile.target
| @@ -27,15 +27,14 @@ PROGS+=$(QEMU_SYSTEM) | @@ -27,15 +27,14 @@ PROGS+=$(QEMU_SYSTEM) | ||
| 27 | ifndef CONFIG_SOFTMMU | 27 | ifndef CONFIG_SOFTMMU |
| 28 | CONFIG_STATIC=y | 28 | CONFIG_STATIC=y |
| 29 | endif | 29 | endif |
| 30 | -endif | ||
| 31 | - | ||
| 32 | -ifeq ($(ARCH), ppc) | 30 | +else |
| 31 | +# the system emulator using soft mmu is portable | ||
| 33 | ifdef CONFIG_SOFTMMU | 32 | ifdef CONFIG_SOFTMMU |
| 34 | PROGS+=$(QEMU_SYSTEM) | 33 | PROGS+=$(QEMU_SYSTEM) |
| 35 | endif | 34 | endif |
| 36 | -endif | 35 | +endif # ARCH != i386 |
| 37 | 36 | ||
| 38 | -endif | 37 | +endif # TARGET_ARCH = i386 |
| 39 | 38 | ||
| 40 | ifeq ($(TARGET_ARCH), ppc) | 39 | ifeq ($(TARGET_ARCH), ppc) |
| 41 | 40 |
configure
| @@ -278,8 +278,8 @@ elif test "$cpu" = "ia64" ; then | @@ -278,8 +278,8 @@ elif test "$cpu" = "ia64" ; then | ||
| 278 | echo "ARCH=ia64" >> $config_mak | 278 | echo "ARCH=ia64" >> $config_mak |
| 279 | echo "#define HOST_IA64 1" >> $config_h | 279 | echo "#define HOST_IA64 1" >> $config_h |
| 280 | elif test "$cpu" = "m68k" ; then | 280 | elif test "$cpu" = "m68k" ; then |
| 281 | - echo "ARCH=m68k" >> config.mak | ||
| 282 | - echo "#define HOST_M68K 1" >> $TMPH | 281 | + echo "ARCH=m68k" >> $config_mak |
| 282 | + echo "#define HOST_M68K 1" >> $config_h | ||
| 283 | else | 283 | else |
| 284 | echo "Unsupported CPU" | 284 | echo "Unsupported CPU" |
| 285 | exit 1 | 285 | exit 1 |