[src/trunk]: src/sys/arch/i386/stand Make the ld workaround work on x88_64, a...

[fvdl <fvdl%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/02b8cd13c164
branches:  trunk
changeset: 542456:02b8cd13c164
user:      fvdl <fvdl%NetBSD.org@localhost>
date:      Wed Jan 29 18:44:47 2003 +0000

description:
Make the ld workaround work on x88_64, and add the temporary ld script
to CLEANFILES.

diffstat:

 sys/arch/i386/stand/Makefile.booters |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 5fcf9aa31dd5 -r 02b8cd13c164 sys/arch/i386/stand/Makefile.booters
--- a/sys/arch/i386/stand/Makefile.booters      Wed Jan 29 16:50:37 2003 +0000
+++ b/sys/arch/i386/stand/Makefile.booters      Wed Jan 29 18:44:47 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.booters,v 1.39 2003/01/28 16:21:58 dsl Exp $
+#      $NetBSD: Makefile.booters,v 1.40 2003/01/29 18:44:47 fvdl Exp $
 
 .include <bsd.own.mk>
 
@@ -54,7 +54,7 @@
 KERNMISCMAKEFLAGS="LIBKERN_ARCH=i386"
 .endif
 
-CLEANFILES+= ${STARTFILE} vers.c ${BASE}.list
+CLEANFILES+= ${STARTFILE} vers.c ${BASE}.list ${BASE}.ldscript
 SRCS+= vers.c
 
 .if !make(obj) && !make(clean) && !make(cleandir)
@@ -117,7 +117,7 @@
        @# Get linker to tell us its link script and remove the line.
        @rm -f ${BASE}.ldscript
        @ ${LD} --verbose >${BASE}.ldscript
-       @ printf '%b'  "1,/^===/d\nd\nd\n/ALIGN(0x1000)/\nd\n/^===/\nd\nwq\n" \
+       @ printf '%b' "1,/^===/d\n/ALIGN(0x1000.*)/\nd\n/^===/\nd\nwq\n" \
                | ed -s ${BASE}.ldscript >/dev/null
        ${LD} -o ${BASE}.sym ${LDFLAGS} -Ttext ${RELOC} -T ${BASE}.ldscript \
            ${STARTFILE} ${OBJS} ${LIBLIST} >${BASE}.list