From: Adam H. <do...@de...> - 2001-10-11 01:41:34
|
This applies against uml-2.4.10-7 The important fix is the dependancy on link.ld.in, and the clean rule. == --- uml-3/arch/um/Makefile Wed Oct 10 17:23:33 2001 +++ uml-4/arch/um/Makefile Wed Oct 10 20:39:04 2001 @@ -52,10 +52,10 @@ LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc -$(ARCH_DIR)/link.ld: +$(ARCH_DIR)/link.ld: $(ARCH_DIR)/link.ld.in m4 -DSTART=$(START_ADDR) -DSUBARCH=$(SUBARCH) \ -DELF_SUBARCH=$(ELF_SUBARCH) \ - $(ARCH_DIR)/link.ld.in > $(ARCH_DIR)/link.ld + $< > $@ SYMLINK_HEADERS = include/asm-um/archparam.h include/asm-um/system.h \ include/asm-um/sigcontext.h include/asm-um/processor.h @@ -66,7 +66,6 @@ mv vmlinux vmlinux.o $(CC) -Wl,-T,$(ARCH_DIR)/link.ld $(LINK_PROFILE) $(LINK_WRAPS) \ -o linux -static $(ARCH_DIR)/main.o vmlinux.o -L/usr/lib - rm -f $(ARCH_DIR)/link.ld USER_CFLAGS := $(patsubst -I%,,$(CFLAGS)) USER_CFLAGS := $(patsubst -Derrno=kernel_errno,,$(USER_CFLAGS)) @@ -83,7 +82,7 @@ archclean: find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \ -o -name '*.gcov' \) -type f -print | xargs rm -f - rm -f linux x.i gmon.out link.ld + rm -f linux x.i gmon.out $(ARCH_DIR)/link.ld @$(MAKEBOOT) clean archdep: $(ARCH_SYMLINKS) == |