diff options
| author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-02-15 14:18:21 +0000 |
|---|---|---|
| committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-02-15 14:18:21 +0000 |
| commit | a5333b24d531dbe61a99da386ef44bc642ee46b7 (patch) | |
| tree | 265c1c7df7710bd2b0a38b28f095fa94afa06102 /extras/mini-os/arch | |
| parent | a917e6d4785b384046c4bde29a615b745dacd9b8 (diff) | |
| download | xen-a5333b24d531dbe61a99da386ef44bc642ee46b7.tar.gz xen-a5333b24d531dbe61a99da386ef44bc642ee46b7.tar.bz2 xen-a5333b24d531dbe61a99da386ef44bc642ee46b7.zip | |
minios: build system cleanups.
- Added ARCH_LDFLAGS for architecture specific LDFLAGS
- Fixed build dependencies after changing makerule files
- Fixed ARCH_CFLAGS for 64bit guest, added ARCH_ASFLAGS
- Couple of variable renames
Signed-off-by: Dietmar Hahn <dietmar.hahn@fujitsu-siemens.com>
Signed-off-by: Grzegorz Milos <gm281@cam.ac.uk>
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 - |