Date: Mon, 30 Oct 2000 16:21:50 -0800 From: "David O'Brien" <obrien@freebsd.org> To: alpha@freebsd.org Subject: Re: Heads up: Problems with the new start-up files Message-ID: <20001030162150.A62959@dragon.nuxi.com> In-Reply-To: <XFMail.001030141336.jdp@polstra.com>; from jdp@polstra.com on Mon, Oct 30, 2000 at 02:13:36PM -0800 References: <XFMail.001030141336.jdp@polstra.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Oct 30, 2000 at 02:13:36PM -0800, John Polstra wrote:
> I'd advise folks to avoid making world on the alpha until David has
> figured out what's wrong and committed the fixes. He's aware of the
> problem and is working on it, so please don't nag him.
I've got a fix now (grrr) there are alternate crt*.asm files for the
Alpha hidden down in a GCC subdirectory. So much for the nice all-C
solution. Anyway, here is a patch I'm probably going to to with.
Index: Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/lib/csu/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile 2000/10/28 21:26:46 1.1
+++ Makefile 2000/10/31 00:14:08
@@ -1,9 +1,18 @@
# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.1 2000/10/28 21:26:46 obrien Exp $
GCCDIR= ${.CURDIR}/../../../contrib/gcc.295
-.PATH: ${GCCDIR}
+TARGET_ARCH?= ${MACHINE_ARCH}
+
+.if ${TARGET_ARCH} == "alpha"
+.PATH: ${GCCDIR}/config/alpha
+SRCS= crtbegin.asm crtend.asm
+UGLYHACK= -x assembler
+.else
+.PATH: ${GCCDIR}
SRCS= crtstuff.c tm.h
+.endif
+
OBJS= crtbegin.o crtend.o
SOBJS= crtbegin.So crtend.So
CFLAGS+= -I${GCCDIR}/config -I. -DIN_GCC \
@@ -18,22 +27,29 @@
CRTS_CFLAGS= -DCRTSTUFFS_O ${PICFLAG}
all: ${OBJS} ${SOBJS}
+
+.if ${TARGET_ARCH} == "alpha"
+crtbegin.o crtbegin.So: crtbegin.asm
+crtend.o crtend.So: crtend.asm
+.else
+crtbegin.o crtbegin.So crtend.o crtend.So: crtstuff.c tm.h
+.endif
-crtbegin.o: crtstuff.c tm.h
+crtbegin.o:
${CC} ${CFLAGS} -g0 -DCRT_BEGIN \
- -c -o ${.TARGET} ${GCCDIR}/crtstuff.c
+ -c -o ${.TARGET} ${UGLYHACK} ${.ALLSRC:N*.h}
-crtbegin.So: crtstuff.c tm.h
+crtbegin.So:
${CC} ${CFLAGS} -g0 -DCRT_BEGIN ${CRTS_CFLAGS} \
- -c -o ${.TARGET} ${GCCDIR}/crtstuff.c
+ -c -o ${.TARGET} ${UGLYHACK} ${.ALLSRC:N*.h}
-crtend.o: crtstuff.c tm.h
+crtend.o:
${CC} ${CFLAGS} -g0 -DCRT_END \
- -c -o ${.TARGET} ${GCCDIR}/crtstuff.c
+ -c -o ${.TARGET} ${UGLYHACK} ${.ALLSRC:N*.h}
-crtend.So: crtstuff.c tm.h
+crtend.So:
${CC} ${CFLAGS} -g0 -DCRT_END ${CRTS_CFLAGS} \
- -c -o ${.TARGET} ${GCCDIR}/crtstuff.c
+ -c -o ${.TARGET} ${UGLYHACK} ${.ALLSRC:N*.h}
# KEEP THIS IN SYNC with src/gnu/usr.bin/cc/cc_tools/Makefile !!
tm.h:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-alpha" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001030162150.A62959>