From owner-p4-projects@FreeBSD.ORG  Sat Mar  8 05:31:20 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 032121065671; Sat,  8 Mar 2008 05:31:20 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B748E1065670
	for <perforce@freebsd.org>; Sat,  8 Mar 2008 05:31:19 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A6A068FC21
	for <perforce@freebsd.org>; Sat,  8 Mar 2008 05:31:19 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m285VJfn046946
	for <perforce@freebsd.org>; Sat, 8 Mar 2008 05:31:19 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m285VJIW046944
	for perforce@freebsd.org; Sat, 8 Mar 2008 05:31:19 GMT
	(envelope-from imp@freebsd.org)
Date: Sat, 8 Mar 2008 05:31:19 GMT
Message-Id: <200803080531.m285VJIW046944@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 137141 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Mar 2008 05:31:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=137141

Change 137141 by imp@imp_lighthouse on 2008/03/08 05:30:37

	I have a recurring feeling of de ja vu.
	I have a recurring feeling of de ja vu.
	I have a recurring feeling of de ja vu.
	
	Remove extra copy of these files from these files.  I love how patch
	treats '+' lines...

Affected files ...

.. //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/ld/armelf_fbsd.sh#2 edit
.. //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh#2 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/ld/armelf_fbsd.sh#2 (text+ko) ====

@@ -6,10 +6,3 @@
 
 unset STACK_ADDR
 unset EMBEDDED
-. ${srcdir}/emulparams/armelf.sh
-. ${srcdir}/emulparams/elf_fbsd.sh
-MAXPAGESIZE=0x8000
-GENERATE_PIE_SCRIPT=yes
-
-unset STACK_ADDR
-unset EMBEDDED

==== //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh#2 (text+ko) ====

@@ -11,15 +11,3 @@
 unset STACK_ADDR
 unset EMBEDDED
 OUTPUT_FORMAT="elf32-bigarm"
-#XXX: This should be used once those bits are merged back in the FSF repo.
-#. ${srcdir}/emulparams/armelf_fbsd.sh
-#
-#OUTPUT_FORMAT="elf32-bigarm"
-. ${srcdir}/emulparams/armelf.sh
-. ${srcdir}/emulparams/elf_fbsd.sh
-MAXPAGESIZE=0x8000
-GENERATE_PIE_SCRIPT=yes
-
-unset STACK_ADDR
-unset EMBEDDED
-OUTPUT_FORMAT="elf32-bigarm"