From owner-svn-src-projects@FreeBSD.ORG  Thu Oct 21 20:29:17 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2E20E1065672;
	Thu, 21 Oct 2010 20:29:17 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1D7028FC1F;
	Thu, 21 Oct 2010 20:29:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9LKTHsA003326;
	Thu, 21 Oct 2010 20:29:17 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9LKTGfo003323;
	Thu, 21 Oct 2010 20:29:17 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201010212029.o9LKTGfo003323@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 21 Oct 2010 20:29:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r214179 - projects/binutils-2.17/gnu/usr.bin/binutils/ld
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Oct 2010 20:29:17 -0000

Author: dim
Date: Thu Oct 21 20:29:16 2010
New Revision: 214179
URL: http://svn.freebsd.org/changeset/base/214179

Log:
  Remove weird double-pasted sections in armelfb?_fbsd.sh.

Modified:
  projects/binutils-2.17/gnu/usr.bin/binutils/ld/armelf_fbsd.sh
  projects/binutils-2.17/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh

Modified: projects/binutils-2.17/gnu/usr.bin/binutils/ld/armelf_fbsd.sh
==============================================================================
--- projects/binutils-2.17/gnu/usr.bin/binutils/ld/armelf_fbsd.sh	Thu Oct 21 20:28:23 2010	(r214178)
+++ projects/binutils-2.17/gnu/usr.bin/binutils/ld/armelf_fbsd.sh	Thu Oct 21 20:29:16 2010	(r214179)
@@ -6,10 +6,3 @@ GENERATE_PIE_SCRIPT=yes
 
 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

Modified: projects/binutils-2.17/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh
==============================================================================
--- projects/binutils-2.17/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh	Thu Oct 21 20:28:23 2010	(r214178)
+++ projects/binutils-2.17/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh	Thu Oct 21 20:29:16 2010	(r214179)
@@ -11,15 +11,3 @@ GENERATE_PIE_SCRIPT=yes
 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"