From 1a17c23db22d7cac3bba580031ddff02bd792d0a Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Fri, 13 Feb 2004 12:28:53 +0000 Subject: [PATCH] Don't override the standard SYSTEM_LD setting from kern.pre.mk. Instead, use the linker script to record the correct entry point. --- sys/conf/Makefile.alpha | 5 ----- sys/conf/ldscript.alpha | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha index 6bc78506a4d..6536da654c9 100644 --- a/sys/conf/Makefile.alpha +++ b/sys/conf/Makefile.alpha @@ -28,11 +28,6 @@ S= ../../.. .endif .include "$S/conf/kern.pre.mk" -SYSTEM_LD= @${LD} -Bdynamic -T $S/conf/ldscript.$M \ - -e locorestart \ - -export-dynamic -dynamic-linker /red/herring \ - -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o - %BEFORE_DEPEND %OBJS diff --git a/sys/conf/ldscript.alpha b/sys/conf/ldscript.alpha index afc19aa05b9..46013802b04 100644 --- a/sys/conf/ldscript.alpha +++ b/sys/conf/ldscript.alpha @@ -1,7 +1,7 @@ /* $FreeBSD$ */ OUTPUT_FORMAT("elf64-alpha-freebsd", "elf64-alpha-freebsd", "elf64-alpha-freebsd") OUTPUT_ARCH(alpha) -ENTRY(__start) +ENTRY(locorestart) SEARCH_DIR(/usr/lib); kernel_text = kernbase; SECTIONS