ChangeSet 1.1481, 2005/05/20 11:27:36+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx
Remove docs and tests from qemu-ioemu: they mostly pertain to whole
platform (inc. cpu) emulation anyway. Move Makefile.target into the
target directory -- otherwise the build system sometimes gets confused
in a way that I do not understand.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
b/tools/ioemu/Makefile | 12
b/tools/ioemu/configure | 2
b/tools/ioemu/target-i386-dm/Makefile | 392 +++++++
b/tools/ioemu/tests/pi_10.com |binary
tools/ioemu/Makefile.target | 392 -------
tools/ioemu/README.distrib | 16
tools/ioemu/qemu-doc.html | 1792 ----------------------------------
tools/ioemu/qemu-doc.texi | 1295 ------------------------
tools/ioemu/qemu-mkcow.1 | 105 -
tools/ioemu/qemu-tech.html | 1302 ------------------------
tools/ioemu/qemu-tech.texi | 494 ---------
tools/ioemu/qemu.1 | 457 --------
tools/ioemu/tests/Makefile | 83 -
tools/ioemu/tests/hello-arm.c | 113 --
tools/ioemu/tests/hello-i386.c | 26
tools/ioemu/tests/linux-test.c | 536 ----------
tools/ioemu/tests/qruncom.c | 308 -----
tools/ioemu/tests/runcom.c | 195 ---
tools/ioemu/tests/sha1.c | 242 ----
tools/ioemu/tests/test-i386-code16.S | 97 -
tools/ioemu/tests/test-i386-muldiv.h | 56 -
tools/ioemu/tests/test-i386-shift.h | 143 --
tools/ioemu/tests/test-i386-vm86.S | 104 -
tools/ioemu/tests/test-i386.c | 1706 --------------------------------
tools/ioemu/tests/test-i386.h | 131 --
tools/ioemu/tests/test_path.c | 152 --
tools/ioemu/tests/testthread.c | 51
tools/ioemu/texi2pod.pl | 428 --------
28 files changed, 399 insertions(+), 10231 deletions(-)
diff -Nru a/tools/ioemu/Makefile b/tools/ioemu/Makefile
--- a/tools/ioemu/Makefile 2005-05-20 07:03:37 -04:00
+++ b/tools/ioemu/Makefile 2005-05-20 07:03:37 -04:00
@@ -14,7 +14,7 @@
ifdef CONFIG_STATIC
LDFLAGS+=-static
endif
-DOCS=qemu-doc.html qemu-tech.html qemu.1
+#DOCS=qemu-doc.html qemu-tech.html qemu.1
all: $(DOCS) HEADERS
for d in $(TARGET_DIRS); do \
@@ -31,7 +31,7 @@
# avoid old build problems by removing potentially incorrect old files
rm -f config.mak config.h op-i386.h opc-i386.h gen-op-i386.h op-arm.h
opc-arm.h gen-op-arm.h
rm -f *.o *.a $(TOOLS) dyngen$(EXESUF) TAGS qemu.pod *~ */*~
- $(MAKE) -C tests clean
+ #$(MAKE) -C tests clean
for d in $(TARGET_DIRS); do \
$(MAKE) -C $$d $@ || exit 1 ; \
done
@@ -58,11 +58,11 @@
pc-bios/ppc_rom.bin \
pc-bios/proll.bin \
pc-bios/linux_boot.bin "$(DESTDIR)/$(datadir)"
- mkdir -p "$(DESTDIR)/$(docdir)"
- install -m 644 qemu-doc.html qemu-tech.html "$(DESTDIR)/$(docdir)"
+ #mkdir -p "$(DESTDIR)/$(docdir)"
+ #install -m 644 qemu-doc.html qemu-tech.html "$(DESTDIR)/$(docdir)"
ifndef CONFIG_WIN32
- mkdir -p "$(DESTDIR)/$(mandir)/man1"
- install qemu.1 qemu-mkcow.1 "$(DESTDIR)/$(mandir)/man1"
+ #mkdir -p "$(DESTDIR)/$(mandir)/man1"
+ #install qemu.1 qemu-mkcow.1 "$(DESTDIR)/$(mandir)/man1"
mkdir -p "$(DESTDIR)/$(datadir)/keymaps"
install -m 644 $(addprefix keymaps/,$(KEYMAPS))
"$(DESTDIR)/$(datadir)/keymaps"
endif
diff -Nru a/tools/ioemu/Makefile.target b/tools/ioemu/Makefile.target
--- a/tools/ioemu/Makefile.target 2005-05-20 07:03:37 -04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,392 +0,0 @@
-include config.mak
-
-#assume we directly put qemu code in tools/, same level as bochs dm(ioemu)
-XEN_PATH=../../..
-TARGET_PATH=$(SRC_PATH)/target-$(TARGET_ARCH)
-VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw:$(SRC_PATH)/audio
-DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH) -I$(XEN_PATH)/xen/include/public
-DEFINES+= -I$(XEN_PATH)/tools/libxc
-ifdef CONFIG_USER_ONLY
-VPATH+=:$(SRC_PATH)/linux-user
-DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
-endif
-CFLAGS=-Wall -O2 -g -fno-strict-aliasing
-LDFLAGS=-g
-LIBS=
-HELPER_CFLAGS=$(CFLAGS)
-DYNGEN=../dyngen$(EXESUF)
-# user emulator name
-QEMU_USER=qemu-$(TARGET_ARCH)
-# system emulator name
-ifdef CONFIG_SOFTMMU
-ifeq ($(TARGET_ARCH), i386)
-QEMU_SYSTEM=qemu$(EXESUF)
-else
-QEMU_SYSTEM=qemu-system-$(TARGET_ARCH)$(EXESUF)
-endif
-else
-QEMU_SYSTEM=qemu-fast
-endif
-
-QEMU_SYSTEM=qemu-dm
-PROGS=$(QEMU_SYSTEM)
-
-ifdef CONFIG_USER_ONLY
-PROGS=$(QEMU_USER)
-else
-ifeq ($(TARGET_ARCH), i386)
-
-ifeq ($(ARCH), i386)
-PROGS+=$(QEMU_SYSTEM)
-ifndef CONFIG_SOFTMMU
-CONFIG_STATIC=y
-endif
-else
-# the system emulator using soft mmu is portable
-ifdef CONFIG_SOFTMMU
-PROGS+=$(QEMU_SYSTEM)
-endif
-endif # ARCH != i386
-
-endif # TARGET_ARCH = i386
-
-ifeq ($(TARGET_ARCH), ppc)
-
-ifeq ($(ARCH), ppc)
-PROGS+=$(QEMU_SYSTEM)
-endif
-
-ifeq ($(ARCH), i386)
-ifdef CONFIG_SOFTMMU
-PROGS+=$(QEMU_SYSTEM)
-endif
-endif # ARCH = i386
-
-ifeq ($(ARCH), amd64)
-ifdef CONFIG_SOFTMMU
-PROGS+=$(QEMU_SYSTEM)
-endif
-endif # ARCH = amd64
-
-endif # TARGET_ARCH = ppc
-
-ifeq ($(TARGET_ARCH), sparc)
-
-ifeq ($(ARCH), ppc)
-PROGS+=$(QEMU_SYSTEM)
-endif
-
-ifeq ($(ARCH), i386)
-ifdef CONFIG_SOFTMMU
-PROGS+=$(QEMU_SYSTEM)
-endif
-endif # ARCH = i386
-
-ifeq ($(ARCH), amd64)
-ifdef CONFIG_SOFTMMU
-PROGS+=$(QEMU_SYSTEM)
-endif
-endif # ARCH = amd64
-
-endif # TARGET_ARCH = sparc
-endif # !CONFIG_USER_ONLY
-
-ifdef CONFIG_STATIC
-LDFLAGS+=-static
-endif
-
-ifeq ($(ARCH),i386)
-CFLAGS+=-fomit-frame-pointer
-OP_CFLAGS=$(CFLAGS) -mpreferred-stack-boundary=2
-ifeq ($(HAVE_GCC3_OPTIONS),yes)
-OP_CFLAGS+= -falign-functions=0 -fno-gcse
-else
-OP_CFLAGS+= -malign-functions=0
-endif
-
-ifdef TARGET_GPROF
-USE_I386_LD=y
-endif
-ifdef CONFIG_STATIC
-USE_I386_LD=y
-endif
-ifdef USE_I386_LD
-LDFLAGS+=-Wl,-T,$(SRC_PATH)/i386.ld
-else
-# WARNING: this LDFLAGS is _very_ tricky : qemu is an ELF shared object
-# that the kernel ELF loader considers as an executable. I think this
-# is the simplest way to make it self virtualizable!
-LDFLAGS+=-Wl,-shared
-endif
-endif
-
-ifeq ($(ARCH),amd64)
-OP_CFLAGS=$(CFLAGS) -falign-functions=0
-LDFLAGS+=-Wl,-T,$(SRC_PATH)/amd64.ld
-endif
-
-ifeq ($(ARCH),ppc)
-CFLAGS+= -D__powerpc__
-OP_CFLAGS=$(CFLAGS)
-LDFLAGS+=-Wl,-T,$(SRC_PATH)/ppc.ld
-endif
-
-ifeq ($(ARCH),s390)
-OP_CFLAGS=$(CFLAGS)
-LDFLAGS+=-Wl,-T,$(SRC_PATH)/s390.ld
-endif
-
-ifeq ($(ARCH),sparc)
-CFLAGS+=-m32 -ffixed-g1 -ffixed-g2 -ffixed-g3 -ffixed-g6
-LDFLAGS+=-m32
-OP_CFLAGS=$(CFLAGS) -fno-delayed-branch -ffixed-i0
-HELPER_CFLAGS=$(CFLAGS) -ffixed-i0 -mflat
-# -static is used to avoid g1/g3 usage by the dynamic linker
-LDFLAGS+=-Wl,-T,$(SRC_PATH)/sparc.ld -static
-endif
-
-ifeq ($(ARCH),sparc64)
-CFLAGS+=-m64 -ffixed-g1 -ffixed-g2 -ffixed-g3 -ffixed-g6
-LDFLAGS+=-m64
-OP_CFLAGS=$(CFLAGS) -fno-delayed-branch -ffixed-i0
-endif
-
-ifeq ($(ARCH),alpha)
-# -msmall-data is not used because we want two-instruction relocations
-# for the constant constructions
-OP_CFLAGS=-Wall -O2 -g
-# Ensure there's only a single GP
-CFLAGS += -msmall-data
-LDFLAGS+=-Wl,-T,$(SRC_PATH)/alpha.ld
-endif
-
-ifeq ($(ARCH),ia64)
-OP_CFLAGS=$(CFLAGS)
-endif
-
-ifeq ($(ARCH),arm)
-OP_CFLAGS=$(CFLAGS) -mno-sched-prolog
-LDFLAGS+=-Wl,-T,$(SRC_PATH)/arm.ld
-endif
-
-ifeq ($(ARCH),m68k)
-OP_CFLAGS=$(CFLAGS) -fomit-frame-pointer
-LDFLAGS+=-Wl,-T,m68k.ld
-endif
-
-ifeq ($(HAVE_GCC3_OPTIONS),yes)
-# very important to generate a return at the end of every operation
-OP_CFLAGS+=-fno-reorder-blocks -fno-optimize-sibling-calls
-endif
-
-ifeq ($(CONFIG_DARWIN),yes)
-OP_CFLAGS+= -mdynamic-no-pic
-endif
-
-#########################################################
-
-DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-LIBS+=-lm -L$(XEN_PATH)/dist/install/usr/$(LIBDIR) -lxc -lxutil
-ifndef CONFIG_USER_ONLY
-LIBS+=-lz
-endif
-ifdef CONFIG_WIN32
-LIBS+=-lwinmm -lws2_32 -liphlpapi
-endif
-
-# profiling code
-ifdef TARGET_GPROF
-LDFLAGS+=-p
-main.o: CFLAGS+=-p
-endif
-
-OBJS= elfload.o main.o syscall.o mmap.o signal.o path.o osdep.o thunk.o
-ifeq ($(TARGET_ARCH), i386)
-OBJS+= vm86.o
-endif
-ifeq ($(TARGET_ARCH), arm)
-OBJS+=nwfpe/softfloat.o nwfpe/fpa11.o nwfpe/fpa11_cpdo.o \
-nwfpe/fpa11_cpdt.o nwfpe/fpa11_cprt.o nwfpe/fpopcode.o nwfpe/single_cpdo.o \
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home