OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

kqemu build fix 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1370 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2005-04-23 17:44:28 +00:00
parent 5516d670f6
commit 07f4ddbf7e
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -18,8 +18,12 @@ all: dyngen$(EXESUF) $(TOOLS) $(DOCS)
$(MAKE) -C $$d $@ || exit 1 ; \ $(MAKE) -C $$d $@ || exit 1 ; \
done done
ifdef CONFIG_KQEMU ifdef CONFIG_KQEMU
ifdef CONFIG_WIN32
$(MAKE) -C kqemu -f Makefile.winnt
else
$(MAKE) -C kqemu $(MAKE) -C kqemu
endif endif
endif
qemu-img$(EXESUF): qemu-img.c block.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c qemu-img$(EXESUF): qemu-img.c block.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c
$(CC) -DQEMU_TOOL $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ -lz $(LIBS) $(CC) -DQEMU_TOOL $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ -lz $(LIBS)

26
configure vendored
View File

@ -94,6 +94,9 @@ mingw32="yes"
FreeBSD) FreeBSD)
bsd="yes" bsd="yes"
oss="yes" oss="yes"
if [ "$cpu" = "i386" ] ; then
kqemu="yes"
fi
;; ;;
NetBSD) NetBSD)
bsd="yes" bsd="yes"
@ -110,7 +113,7 @@ darwin="yes"
*) *)
oss="yes" oss="yes"
linux="yes" linux="yes"
if [ "$cpu" = "i386" ] ; then if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
kqemu="yes" kqemu="yes"
fi fi
;; ;;
@ -198,7 +201,9 @@ if test "$mingw32" = "yes" ; then
EXESUF=".exe" EXESUF=".exe"
gdbstub="no" gdbstub="no"
oss="no" oss="no"
kqemu="no" if [ "$cpu" = "i386" ] ; then
kqemu="yes"
fi
fi fi
if test -z "$target_list" ; then if test -z "$target_list" ; then
@ -350,7 +355,7 @@ docdir="$prefix/share/doc/qemu"
bindir="$prefix/bin" bindir="$prefix/bin"
fi fi
# kernel module support # kqemu support
if test $kqemu = "yes" ; then if test $kqemu = "yes" ; then
# test if the source code is installed # test if the source code is installed
if test '!' -f "kqemu/Makefile" ; then if test '!' -f "kqemu/Makefile" ; then
@ -358,7 +363,8 @@ if test $kqemu = "yes" ; then
fi fi
fi fi
if test $kqemu = "yes" ; then # Linux specific kqemu configuration
if test $kqemu = "yes" -a $linux = "yes" ; then
# find the kernel path # find the kernel path
if test -z "$kernel_path" ; then if test -z "$kernel_path" ; then
kernel_version=`uname -r` kernel_version=`uname -r`
@ -388,7 +394,7 @@ fi
fi # kqemu fi # kqemu
fi # kqemu fi # kqemu and linux
echo "Install prefix $prefix" echo "Install prefix $prefix"
@ -418,9 +424,10 @@ if test $fmod = "yes"; then
echo -n " (lib='$fmod_lib' include='$fmod_inc')" echo -n " (lib='$fmod_lib' include='$fmod_inc')"
fi fi
echo "" echo ""
if test $kqemu = "yes" ; then echo "kqemu support $kqemu"
if test $kqemu = "yes" -a $linux = "yes" ; then
echo "" echo ""
echo "KQEMU module configuration:" echo "KQEMU Linux module configuration:"
echo "kernel sources $kernel_path" echo "kernel sources $kernel_path"
echo -n "kbuild type " echo -n "kbuild type "
if test $kbuild26 = "yes"; then if test $kbuild26 = "yes"; then
@ -617,7 +624,7 @@ if test "$target_cpu" = "i386" ; then
echo "TARGET_ARCH=i386" >> $config_mak echo "TARGET_ARCH=i386" >> $config_mak
echo "#define TARGET_ARCH \"i386\"" >> $config_h echo "#define TARGET_ARCH \"i386\"" >> $config_h
echo "#define TARGET_I386 1" >> $config_h echo "#define TARGET_I386 1" >> $config_h
if test $kqemu = "yes" -a "$target_softmmu" = "yes" ; then if test $kqemu = "yes" -a "$target_softmmu" = "yes" -a $cpu = "i386" ; then
echo "#define USE_KQEMU 1" >> $config_h echo "#define USE_KQEMU 1" >> $config_h
fi fi
elif test "$target_cpu" = "arm" -o "$target_cpu" = "armeb" ; then elif test "$target_cpu" = "arm" -o "$target_cpu" = "armeb" ; then
@ -642,6 +649,9 @@ elif test "$target_cpu" = "x86_64" ; then
echo "#define TARGET_ARCH \"x86_64\"" >> $config_h echo "#define TARGET_ARCH \"x86_64\"" >> $config_h
echo "#define TARGET_I386 1" >> $config_h echo "#define TARGET_I386 1" >> $config_h
echo "#define TARGET_X86_64 1" >> $config_h echo "#define TARGET_X86_64 1" >> $config_h
if test $kqemu = "yes" -a "$target_softmmu" = "yes" -a $cpu = "x86_64" ; then
echo "#define USE_KQEMU 1" >> $config_h
fi
else else
echo "Unsupported target CPU" echo "Unsupported target CPU"
exit 1 exit 1