diff options
| author | awilliam@xenbuild2.aw <awilliam@xenbuild2.aw> | 2007-02-20 12:58:22 -0700 |
|---|---|---|
| committer | awilliam@xenbuild2.aw <awilliam@xenbuild2.aw> | 2007-02-20 12:58:22 -0700 |
| commit | 5a0cbf9162720a3f24cc139c317e4bcb75f2953c (patch) | |
| tree | dad05e32e01b5beed9b77234320d40b6e488cf3b /extras/mini-os/arch | |
| parent | 6cd752dcc9af545e4d9b5c81a45e7ca19c89361f (diff) | |
| parent | 99f8ff2844af4b9a4d45077a2cfcc3ebb4868184 (diff) | |
| download | xen-5a0cbf9162720a3f24cc139c317e4bcb75f2953c.tar.gz xen-5a0cbf9162720a3f24cc139c317e4bcb75f2953c.tar.bz2 xen-5a0cbf9162720a3f24cc139c317e4bcb75f2953c.zip | |
merge with xen-unstable.hg
Diffstat (limited to 'extras/mini-os/arch')
| -rw-r--r-- | extras/mini-os/arch/x86/Makefile | 5 | ||||
| -rw-r--r-- | extras/mini-os/arch/x86/arch.mk | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/extras/mini-os/arch/x86/Makefile b/extras/mini-os/arch/x86/Makefile index 45cfe19136..8e655f1d64 100644 --- a/extras/mini-os/arch/x86/Makefile +++ b/extras/mini-os/arch/x86/Makefile @@ -3,9 +3,6 @@ # It's is used for x86_32, x86_32y and x86_64 # -# Rebuild all after touching this/these extra file(s) (see mini-os.mk) -SPEC_DEP = arch.mk - # include arch.mk has to be before mini-os.mk! include arch.mk include ../../minios.mk @@ -25,5 +22,5 @@ $(ARCH_LIB): $(ARCH_OBJS) $(HEAD_ARCH_OBJ) $(AR) rv $(ARCH_LIB) $(ARCH_OBJS) clean: - rm -f $(ARCH_LIB) $(ARCH_OBJS) + rm -f $(ARCH_LIB) $(ARCH_OBJS) $(HEAD_ARCH_OBJ) diff --git a/extras/mini-os/arch/x86/arch.mk b/extras/mini-os/arch/x86/arch.mk index 5d0ee4add7..9a7704b490 100644 --- a/extras/mini-os/arch/x86/arch.mk +++ b/extras/mini-os/arch/x86/arch.mk @@ -6,6 +6,7 @@ ifeq ($(TARGET_ARCH),x86_32) ARCH_CFLAGS := -m32 -march=i686 ARCH_LDFLAGS := -m elf_i386 +ARCH_ASFLAGS := -m32 EXTRA_INC += $(TARGET_ARCH_FAM)/$(TARGET_ARCH) EXTRA_SRC += arch/$(EXTRA_INC) endif @@ -19,10 +20,10 @@ endif ifeq ($(TARGET_ARCH),x86_64) ARCH_CFLAGS := -m64 -mno-red-zone -fpic -fno-reorder-blocks -ARCH_CFLAGS := -fno-asynchronous-unwind-tables +ARCH_CFLAGS += -fno-asynchronous-unwind-tables +ARCH_ASFLAGS := -m64 ARCH_LDFLAGS := -m elf_x86_64 EXTRA_INC += $(TARGET_ARCH_FAM)/$(TARGET_ARCH) EXTRA_SRC += arch/$(EXTRA_INC) endif - |