From owner-freebsd-alpha  Mon Oct 30 16:21:54 2000
Delivered-To: freebsd-alpha@freebsd.org
Received: from dragon.nuxi.com (trang.nuxi.com [209.152.133.57])
	by hub.freebsd.org (Postfix) with ESMTP id 8697C37B479
	for <alpha@freebsd.org>; Mon, 30 Oct 2000 16:21:51 -0800 (PST)
Received: (from obrien@localhost)
	by dragon.nuxi.com (8.9.3/8.9.1) id QAA63015
	for alpha@freebsd.org; Mon, 30 Oct 2000 16:21:50 -0800 (PST)
	(envelope-from obrien)
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>
Reply-To: obrien@freebsd.org
References: <XFMail.001030141336.jdp@polstra.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
In-Reply-To: <XFMail.001030141336.jdp@polstra.com>; from jdp@polstra.com on Mon, Oct 30, 2000 at 02:13:36PM -0800
X-Operating-System: FreeBSD 5.0-CURRENT
Organization: The NUXI BSD group
X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3  90 76 5D 69 58 D9 98 7A
X-Pgp-Rsa-Keyid: 1024/34F9F9D5
Sender: owner-freebsd-alpha@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org

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