From owner-svn-src-all@FreeBSD.ORG  Thu May 17 20:38:02 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 602CA1065675;
	Thu, 17 May 2012 20:38:02 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4C2848FC16;
	Thu, 17 May 2012 20:38:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4HKc2oj016088;
	Thu, 17 May 2012 20:38:02 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4HKc2HM016086;
	Thu, 17 May 2012 20:38:02 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201205172038.q4HKc2HM016086@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Thu, 17 May 2012 20:38:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235566 - head/gnu/lib/csu
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 May 2012 20:38:02 -0000

Author: marcel
Date: Thu May 17 20:38:01 2012
New Revision: 235566
URL: http://svn.freebsd.org/changeset/base/235566

Log:
  Build the "S" objects with the same name they get installed under.
  That is, build crtbeginS.o and crtendS.o instead of crtbegin.So and
  crtend.So. Remove the name substitution during install.
  
  Obtained from:	Juniper Networks, Inc.

Modified:
  head/gnu/lib/csu/Makefile

Modified: head/gnu/lib/csu/Makefile
==============================================================================
--- head/gnu/lib/csu/Makefile	Thu May 17 20:29:15 2012	(r235565)
+++ head/gnu/lib/csu/Makefile	Thu May 17 20:38:01 2012	(r235566)
@@ -12,7 +12,7 @@ CCDIR=	${.CURDIR}/../../usr.bin/cc
 
 SRCS=		crtstuff.c tconfig.h tm.h options.h
 OBJS=		crtbegin.o crtend.o crtbeginT.o
-SOBJS=		crtbegin.So crtend.So
+SOBJS=		crtbeginS.o crtendS.o
 CSTD?=		gnu89
 CFLAGS+=	-DIN_GCC -DHAVE_LD_EH_FRAME_HDR -DDT_CONFIG -D__GLIBC__=3
 CFLAGS+=	-finhibit-size-directive -fno-inline-functions \
@@ -55,7 +55,7 @@ crtbeginT.o:	${BEGINSRC}
 	${CC} ${CFLAGS} -g0 -DCRT_BEGIN -DCRTSTUFFT_O \
 		-c -o ${.TARGET} ${.ALLSRC:N*.h}
 
-crtbegin.So:	${BEGINSRC}
+crtbeginS.o:	${BEGINSRC}
 	${CC} ${CFLAGS} -g0 -DCRT_BEGIN ${CRTS_CFLAGS} \
 		-c -o ${.TARGET} ${.ALLSRC:N*.h}
 
@@ -63,7 +63,7 @@ crtend.o:	${ENDSRC}
 	${CC} ${CFLAGS} -g0 -DCRT_END \
 		-c -o ${.TARGET} ${.ALLSRC:N*.h}
 
-crtend.So:	${ENDSRC}
+crtendS.o:	${ENDSRC}
 	${CC} ${CFLAGS} -g0 -DCRT_END ${CRTS_CFLAGS} \
 		-c -o ${.TARGET} ${.ALLSRC:N*.h}
 
@@ -74,7 +74,7 @@ tm.h tconfig.h options.h: ${CCDIR}/cc_to
 realinstall:
 .for file in ${OBJS} ${SOBJS} ${TGTOBJS}
 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-	    ${file} ${DESTDIR}${LIBDIR}/${file:S/.So$/S.o/}
+	    ${file} ${DESTDIR}${LIBDIR}/${file}
 .endfor
 
 .include <bsd.lib.mk>