From owner-p4-projects  Fri May 17  0:25:14 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 419F137B40B; Fri, 17 May 2002 00:25:05 -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 AD97E37B405
	for <perforce@freebsd.org>; Fri, 17 May 2002 00:25:00 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g4H7P0u51275
	for perforce@freebsd.org; Fri, 17 May 2002 00:25:00 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Fri, 17 May 2002 00:25:00 -0700 (PDT)
Message-Id: <200205170725.g4H7P0u51275@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 11435 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=11435

Change 11435 by peter@peter_ia64 on 2002/05/17 00:24:27

	Checkpoint.. this seems to work and might be commitable

Affected files ...

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

Differences ...

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

@@ -9,9 +9,14 @@
 .PATH: ${GCCDIR}/config/${GCC_CPU}
 
 .if ${TARGET_ARCH} == "ia64"
-SRCS=		crtbegin.asm crtend.asm
-.else
-SRCS=		crtstuff.c tconfig.h
+BEGINSRC=	crtbegin.asm
+ENDSRC=		crtend.asm
+CFLAGS+=	-x assembler-with-cpp	# Ugly hack
+.endif
+.if !defined(BEGINSRC) && !defined(ENDSRC)
+SRCS=		crtstuff.c		# for 'make depend'
+BEGINSRC=	crtstuff.c
+ENDSRC=		crtstuff.c
 .endif
 OBJS=		crtbegin.o crtend.o
 SOBJS=		crtbegin.So crtend.So
@@ -20,11 +25,10 @@
 		-fno-exceptions -fno-omit-frame-pointer
 CFLAGS+=	-I${GCCDIR}/config -I${GCCDIR} -I. \
 		-I${CCDIR}/cc_tools
-CRTS_CFLAGS=	-DCRTSTUFFS_O ${PICFLAG}
+CRTS_CFLAGS=	-DCRTSTUFFS_O -DSHARED ${PICFLAG}
 MKDEPCMD=	CC="${CC}" MKDEP_CPP_OPTS="-M -DCRT_BEGIN" mkdep
 
 .if ${TARGET_ARCH} == "powerpc"
-.PATH: ${GCCDIR}/config/${GCC_CPU}
 TGTOBJS=	crtsavres.o
 SRCS+=		crtsavres.asm
 .endif
@@ -35,45 +39,26 @@
 
 all: ${OBJS} ${SOBJS} ${TGTOBJS}
 
+beforedepend:	tconfig.h
+${OBJS} ${SOBJS} ${TGTOBJS}: tconfig.h
+
 CLEANFILES=	${OBJS} ${SOBJS} ${TGTOBJS}
 
-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:
+crtbegin.o:	${BEGINSRC}
 	${CC} ${CFLAGS} -g0 -DCRT_BEGIN \
-		-c -o ${.TARGET} ${.ALLSRC:M*crtstuff*}
+		-c -o ${.TARGET} ${.ALLSRC:M*.c} ${.ALLSRC:M*.asm}
 
-crtbegin.So:
+crtbegin.So:	${BEGINSRC}
 	${CC} ${CFLAGS} -g0 -DCRT_BEGIN ${CRTS_CFLAGS} \
-		-c -o ${.TARGET} ${.ALLSRC:M*crtstuff*}
+		-c -o ${.TARGET} ${.ALLSRC:M*.c} ${.ALLSRC:M*.asm}
 
-crtend.o:
+crtend.o:	${ENDSRC}
 	${CC} ${CFLAGS} -g0 -DCRT_END \
-		-c -o ${.TARGET} ${.ALLSRC:M*crtstuff*}
+		-c -o ${.TARGET} ${.ALLSRC:M*.c} ${.ALLSRC:M*.asm}
 
-crtend.So:
+crtend.So:	${ENDSRC}
 	${CC} ${CFLAGS} -g0 -DCRT_END ${CRTS_CFLAGS} \
-		-c -o ${.TARGET} ${.ALLSRC:M*crtstuff*}
-.endif
+		-c -o ${.TARGET} ${.ALLSRC:M*.c} ${.ALLSRC:M*.asm}
 
 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