From owner-p4-projects  Fri May 10  8:14:44 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3AD0237B401; Fri, 10 May 2002 08:14:28 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id C0DE537B404
	for <perforce@freebsd.org>; Fri, 10 May 2002 08:14:24 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g4AFEOV06131
	for perforce@freebsd.org; Fri, 10 May 2002 08:14:24 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Fri, 10 May 2002 08:14:24 -0700 (PDT)
Message-Id: <200205101514.g4AFEOV06131@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
Subject: PERFORCE change 11118 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11118

Change 11118 by peter@peter_ia64 on 2002/05/10 08:13:37

	use the correct crt*.asm files.

Affected files ...

... //depot/projects/ia64/gnu/lib/csu/Makefile#4 edit

Differences ...

==== //depot/projects/ia64/gnu/lib/csu/Makefile#4 (text+ko) ====

@@ -6,7 +6,13 @@
 CCDIR=	${.CURDIR}/../../usr.bin/cc
 .include "${CCDIR}/Makefile.tgt"
 
+.PATH: ${GCCDIR}/config/${GCC_CPU}
+
+.if ${TARGET_ARCH} == "ia64"
+SRCS=		crtbegin.asm crtend.asm
+.else
 SRCS=		crtstuff.c tconfig.h
+.endif
 OBJS=		crtbegin.o crtend.o
 SOBJS=		crtbegin.So crtend.So
 CFLAGS+=	-DIN_GCC -DHAVE_LD_EH_FRAME_HDR
@@ -19,7 +25,6 @@
 NOLIB=		true
 
 .if ${TARGET_ARCH} == "sparc64"
-.PATH: ${GCCDIR}/config/${GCC_CPU}
 TGTOBJS=	crtfastmath.o
 SRCS+=		crtfastmath.c
 .endif
@@ -28,7 +33,26 @@
 
 crtbegin.o crtbegin.So crtend.o crtend.So: ${SRCS}
 
+.if ${TARGET_ARCH} == "ia64"
+depend:
+
 crtbegin.o:
+	${CC} -x assembler-with-cpp \
+		-c -o ${.TARGET} ${.ALLSRC:M*crtbegin*}
+
+crtbegin.So:
+	${CC} -x assembler-with-cpp -DSHARED \
+		-c -o ${.TARGET} ${.ALLSRC:M*crtbegin*}
+
+crtend.o:
+	${CC} -x assembler-with-cpp \
+		-c -o ${.TARGET} ${.ALLSRC:M*crtend*}
+
+crtend.So:
+	${CC} -x assembler-with-cpp -DSHARED \
+		-c -o ${.TARGET} ${.ALLSRC:M*crtend*}
+.else
+crtbegin.o:
 	${CC} ${CFLAGS} -g0 -DCRT_BEGIN \
 		-c -o ${.TARGET} ${.ALLSRC:M*crtstuff*}
 
@@ -43,6 +67,7 @@
 crtend.So:
 	${CC} ${CFLAGS} -g0 -DCRT_END ${CRTS_CFLAGS} \
 		-c -o ${.TARGET} ${.ALLSRC:M*crtstuff*}
+.endif
 
 CLEANFILES=	tconfig.h
 tconfig.h: ${CCDIR}/cc_tools/Makefile

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message