Only in xxen-unstable/extras/mini-os/console: console.o Only in xxen-unstable/extras/mini-os/console: xencons_ring.o Only in xxen-unstable/extras/mini-os: events.o Only in xxen-unstable/extras/mini-os: hypervisor.o Only in xxen-unstable/extras/mini-os/include: xen Only in xxen-unstable/extras/mini-os: kernel.o Only in xxen-unstable/extras/mini-os/lib: math.o Only in xxen-unstable/extras/mini-os/lib: printf.o Only in xxen-unstable/extras/mini-os/lib: string.o Only in xxen-unstable/extras/mini-os/lib: xmalloc.o Only in xxen-unstable/extras/mini-os: libminios.a diff -ur axen-unstable/extras/mini-os/Makefile xxen-unstable/extras/mini-os/Makefile --- axen-unstable/extras/mini-os/Makefile 2006-05-22 06:08:42.000000000 -0400 +++ xxen-unstable/extras/mini-os/Makefile 2006-05-22 06:24:00.000000000 -0400 @@ -2,8 +2,8 @@ include $(CURDIR)/../../Config.mk -# Set TARGET_ARCH -override TARGET_ARCH := $(XEN_TARGET_ARCH) +# Set MINIOS_TARGET_OS +override MINIOS_TARGET_OS := $(XEN_TARGET_ARCH) # NB. '-Wcast-qual' is nasty, so I omitted it. CFLAGS := -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format @@ -13,14 +13,14 @@ ASFLAGS = -D__ASSEMBLY__ LDLIBS = -L. -lminios -LDFLAGS := -N -T minios-$(TARGET_ARCH).lds +LDFLAGS := -N -T minios-$(MINIOS_TARGET_OS).lds -ifeq ($(TARGET_ARCH),x86_32) +ifeq ($(MINIOS_TARGET_OS),x86_32) CFLAGS += -m32 -march=i686 LDFLAGS += -m elf_i386 endif -ifeq ($(TARGET_ARCH),x86_64) +ifeq ($(MINIOS_TARGET_OS),x86_64) CFLAGS += -m64 -mno-red-zone -fpic -fno-reorder-blocks CFLAGS += -fno-asynchronous-unwind-tables LDFLAGS += -m elf_x86_64 @@ -34,7 +34,7 @@ TARGET := mini-os -HEAD := $(TARGET_ARCH).o +HEAD := $(MINIOS_TARGET_OS).o OBJS := $(patsubst %.c,%.o,$(wildcard *.c)) OBJS += $(patsubst %.c,%.o,$(wildcard lib/*.c)) OBJS += $(patsubst %.c,%.o,$(wildcard xenbus/*.c)) @@ -54,7 +54,7 @@ ar r libminios.a $(HEAD) $(OBJS) $(TARGET): links libminios.a $(HEAD) - $(LD) $(LDFLAGS) $(HEAD) $(LDLIBS) -o $@.elf + $(LD) $(LDFLAGS) $(TARGET_ARCH) $(HEAD) $(LDLIBS) -o $@.elf gzip -f -9 -c $@.elf >$@.gz .PHONY: clean @@ -65,10 +65,10 @@ find . -type l | xargs rm -f %.o: %.c $(HDRS) Makefile - $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@ %.o: %.S $(HDRS) Makefile - $(CC) $(ASFLAGS) $(CPPFLAGS) -c $< -o $@ + $(CC) $(ASFLAGS) $(CPPFLAGS) $(TARGET_MACH) -c $< -o $@ define all_sources ( find . -follow -name SCCS -prune -o -name '*.[chS]' -print ) @@ -78,4 +78,3 @@ cscope: $(all_sources) > cscope.files cscope -k -b -q - Only in xxen-unstable/extras/mini-os: Makefile~ Only in xxen-unstable/extras/mini-os: mini-os.elf Only in xxen-unstable/extras/mini-os: mini-os.gz Only in xxen-unstable/extras/mini-os: mm.o Only in xxen-unstable/extras/mini-os: sched.o Only in xxen-unstable/extras/mini-os: time.o Only in xxen-unstable/extras/mini-os: traps.o Only in xxen-unstable/extras/mini-os: x86_32.o Only in xxen-unstable/extras/mini-os/xenbus: xenbus.o