diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
commit | 03ba4131783cc9e872f8bb26a03f15bc11f27564 (patch) | |
tree | 88db8dba75ae06ba3bad08e42c5e52efc162535c /arch/alpha/boot/Makefile | |
parent | 257730f99381dd26e10b832fce4c94cae7ac1176 (diff) |
- Merge with Linux 2.1.121.
- Bugfixes.
Diffstat (limited to 'arch/alpha/boot/Makefile')
-rw-r--r-- | arch/alpha/boot/Makefile | 41 |
1 files changed, 8 insertions, 33 deletions
diff --git a/arch/alpha/boot/Makefile b/arch/alpha/boot/Makefile index ee2ecd379..13d9f514c 100644 --- a/arch/alpha/boot/Makefile +++ b/arch/alpha/boot/Makefile @@ -8,17 +8,7 @@ # Copyright (C) 1994 by Linus Torvalds # -ifdef CONFIG_CROSSCOMPILE -# enable this for linking under OSF/1: -LINKFLAGS = -non_shared -T 0x20000000 -N -else - elf=$(shell if $(LD) --help | grep elf64alpha >/dev/null; then echo yes; fi) - ifeq ($(elf),yes) - LINKFLAGS = -static -Ttext 0x20000000 -N - else - LINKFLAGS = -static -T bootloader.lds -N - endif -endif +LINKFLAGS = -static -T bootloader.lds #-N -relax .S.s: $(CC) -D__ASSEMBLY__ -traditional -E -o $*.o $< @@ -56,7 +46,7 @@ bootdevice: @test "$(BOOTDEV)" != "" || (echo You must specify BOOTDEV ; exit -1) vmlinux.gz: vmlinux - gzip -fv vmlinux + gzip -fv9 vmlinux # # A raw binary without header. Used by raw boot. @@ -69,18 +59,10 @@ ksize.h: $(OBJSTRIP) vmlinux.nh echo "#define KERNEL_SIZE `$(OBJSTRIP) -p vmlinux.nh /dev/null`" > $@ vmlinux.nh: $(VMLINUX) $(OBJSTRIP) -ifeq ($(elf),yes) - cp $(VMLINUX) vmlinux.stripped - strip vmlinux.stripped # work around ELF binutils bug... - $(OBJSTRIP) -v vmlinux.stripped vmlinux.nh - rm -f vmlinux.stripped -else $(OBJSTRIP) -v $(VMLINUX) vmlinux.nh -endif vmlinux: $(TOPDIR)/vmlinux - cp $(TOPDIR)/vmlinux vmlinux - strip vmlinux + strip -o vmlinux $(VMLINUX) tools/lxboot: $(OBJSTRIP) bootloader $(OBJSTRIP) -p bootloader tools/lxboot @@ -98,21 +80,14 @@ tools/mkbb: tools/mkbb.c $(HOSTCC) tools/mkbb.c -o tools/mkbb bootloader: $(OBJECTS) - $(LD) $(LINKFLAGS) \ - $(OBJECTS) \ - $(LIBS) \ - -o bootloader && strip bootloader || \ - (rm -f bootloader && exit 1) + $(LD) $(LINKFLAGS) $(OBJECTS) $(LIBS) -o bootloader bootpheader: $(BPOBJECTS) - $(LD) $(LINKFLAGS) \ - $(BPOBJECTS) \ - $(LIBS) \ - -o bootpheader && strip bootpheader || \ - (rm -f bootpheader && exit 1) + $(LD) $(LINKFLAGS) $(BPOBJECTS) $(LIBS) -o bootpheader clean: - rm -f $(TARGETS) bootloader bootimage vmlinux.nh \ - tools/mkbb tools/bootlx tools/lxboot ksize.h + rm -f $(TARGETS) bootloader bootimage bootpfile bootpheader + rm -f tools/mkbb tools/bootlx tools/lxboot tools/bootph + rm -f vmlinux.nh ksize.h dep: |