patch-2.0.11 linux/arch/alpha/Makefile

Next file: linux/arch/alpha/boot/Makefile
Previous file: linux/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.0.10/linux/arch/alpha/Makefile linux/arch/alpha/Makefile
@@ -14,8 +14,12 @@
 # enable this for linking under OSF/1:
 LINKFLAGS = -non_shared -T 0xfffffc0000310000 -N
 else
-# enable this for linking under Linux:
-LINKFLAGS = -static -T arch/alpha/vmlinux.lds -N
+ elf=$(shell if $(LD) --help | grep elf64alpha >/dev/null; then echo yes; fi)
+ ifeq ($(elf),yes)
+   LINKFLAGS = -static -Ttext 0xfffffc0000310000 -N
+ else
+   LINKFLAGS = -static -T arch/alpha/vmlinux.lds -N
+ endif
 # GNU gcc/cc1/as can use pipes instead of temporary files
 CFLAGS := $(CFLAGS) -pipe
 endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov