svn commit: r216435 - stable/7/lib/csu/ia64

[Tijl Coosemans]

Author: tijl
Date: Tue Dec 14 15:35:44 2010
New Revision: 216435
URL: http://svn.freebsd.org/changeset/base/216435

Log:
  MFC r216351:
  
  Add a .note.ABI-tag section to ia64 startup files by linking crtbrand.c
  in crt1.o. On other architectures crtbrand.c is included from crt1.c,
  but that's not a C source code file on ia64. Instead it is compiled
  separately and included in crt1.o using incremental linking.
  
  Approved by:	re (kensmith), kib (mentor)

Modified:
  stable/7/lib/csu/ia64/Makefile
Directory Properties:
  stable/7/lib/csu/   (props changed)

Modified: stable/7/lib/csu/ia64/Makefile
==============================================================================
--- stable/7/lib/csu/ia64/Makefile	Tue Dec 14 15:33:59 2010	(r216434)
+++ stable/7/lib/csu/ia64/Makefile	Tue Dec 14 15:35:44 2010	(r216435)
@@ -2,22 +2,43 @@
 
 .PATH: ${.CURDIR}/../common
 
-SRCS=		crt1.S crti.S crtn.S
+SRCS=		crti.S crtn.S
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
-OBJS+=		Scrt1.o gcrt1.o
-CFLAGS+=	-Wall -Wno-unused \
-		-I${.CURDIR}/../common \
-		-I${.CURDIR}/../../libc/include
+OBJS+=		crt1.o gcrt1.o Scrt1.o
+CFLAGS+=	-Wall -Wno-unused
 
 all: ${OBJS}
 
 CLEANFILES=	${OBJS}
+CLEANFILES+=	crt1_.o gcrt1_.o Scrt1_.o
+CLEANFILES+=	crtbrand.o gcrtbrand.o Scrtbrand.o
 
-gcrt1.o: crt1.S
-	${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.ALLSRC}
+crt1_.o: crt1.S
+	${CC} ${CFLAGS} -c -o ${.TARGET} ${.ALLSRC}
 
-Scrt1.o: crt1.S
-	${CC} ${CFLAGS} -fPIC -DPIC -c -o Scrt1.o ${.ALLSRC}
+crtbrand.o: crtbrand.c
+	${CC} ${CFLAGS} -c -o ${.TARGET} ${.ALLSRC}
+
+crt1.o: crt1_.o crtbrand.o
+	${LD} ${LDFLAGS} -r -o ${.TARGET} crt1_.o crtbrand.o
+
+gcrt1_.o: crt1.S
+	${CC} ${CFLAGS} -DGCRT -c -o ${.TARGET} ${.ALLSRC}
+
+gcrtbrand.o: crtbrand.c
+	${CC} ${CFLAGS} -DGCRT -c -o ${.TARGET} ${.ALLSRC}
+
+gcrt1.o: gcrt1_.o gcrtbrand.o
+	${LD} ${LDFLAGS} -r -o ${.TARGET} ${.ALLSRC}
+
+Scrt1_.o: crt1.S
+	${CC} ${CFLAGS} -fPIC -DPIC -c -o ${.TARGET} ${.ALLSRC}
+
+Scrtbrand.o: crtbrand.c
+	${CC} ${CFLAGS} -fPIC -DPIC -c -o ${.TARGET} ${.ALLSRC}
+
+Scrt1.o: Scrt1_.o Scrtbrand.o
+	${LD} ${LDFLAGS} -r -o ${.TARGET} ${.ALLSRC}
 
 realinstall:
 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \