From owner-svn-src-user@FreeBSD.ORG  Wed Mar 24 05:55:45 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D432D106564A;
	Wed, 24 Mar 2010 05:55:45 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A88DF8FC1F;
	Wed, 24 Mar 2010 05:55:45 +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 o2O5tjcH006826;
	Wed, 24 Mar 2010 05:55:45 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2O5tj1g006823;
	Wed, 24 Mar 2010 05:55:45 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003240555.o2O5tj1g006823@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Wed, 24 Mar 2010 05:55:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r205577 - in user/jmallett/octeon/gnu/usr.bin/binutils:
	. libbfd
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Mar 2010 05:55:45 -0000

Author: jmallett
Date: Wed Mar 24 05:55:45 2010
New Revision: 205577
URL: http://svn.freebsd.org/changeset/base/205577

Log:
  o) Recognize that N64 MIPS defaults to 64-bit.
  o) Set default vector for libbfd correctly.

Modified:
  user/jmallett/octeon/gnu/usr.bin/binutils/Makefile.inc0
  user/jmallett/octeon/gnu/usr.bin/binutils/libbfd/Makefile.mips

Modified: user/jmallett/octeon/gnu/usr.bin/binutils/Makefile.inc0
==============================================================================
--- user/jmallett/octeon/gnu/usr.bin/binutils/Makefile.inc0	Wed Mar 24 04:52:15 2010	(r205576)
+++ user/jmallett/octeon/gnu/usr.bin/binutils/Makefile.inc0	Wed Mar 24 05:55:45 2010	(r205577)
@@ -23,7 +23,8 @@ RELSRC=	${RELTOP}/../../../contrib/binut
 SRCDIR=	${.CURDIR}/${RELSRC}
 
 .if ${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "i386" || \
-	${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "mips"
+	${TARGET_ARCH} == "powerpc" || \
+	(${TARGET_ARCH} == "mips" && (!defined(TARGET_ABI) || ${TARGET_ABI} != "n64"))
 CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=32
 .else
 CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=64

Modified: user/jmallett/octeon/gnu/usr.bin/binutils/libbfd/Makefile.mips
==============================================================================
--- user/jmallett/octeon/gnu/usr.bin/binutils/libbfd/Makefile.mips	Wed Mar 24 04:52:15 2010	(r205576)
+++ user/jmallett/octeon/gnu/usr.bin/binutils/libbfd/Makefile.mips	Wed Mar 24 05:55:45 2010	(r205577)
@@ -1,8 +1,24 @@
 # $FreeBSD$
 
-#xxxIMPxxx: endian and size
+#xxxIMPxxx: TARGET_BIG_ENDIAN is lame.  We should use the netbsd convention
+# of mipsel and mips.
+.if !defined(TARGET_BIG_ENDIAN)
+_EMULATION_ENDIAN=little
+.else
+_EMULATION_ENDIAN=big
+.endif
+
 DEFAULT_VECTOR=	bfd_elf32_tradbigmips_vec
 
+.if defined(TARGET_ABI) && ${TARGET_ABI} != "o32"
+.if ${TARGET_ABI} == "n32"
+DEFAULT_VECTOR=	bfd_elf32_ntrad${_EMULATION_ENDIAN}mips_vec
+.elif ${TARGET_ABI} == "n64"
+DEFAULT_VECTOR=	bfd_elf64_trad${_EMULATION_ENDIAN}mips_vec
+.endif
+.endif
+DEFAULT_VECTOR?=bfd_elf32_trad${_EMULATION_ENDIAN}mips_vec
+
 SRCS+=	coff-mips.c \
 	cpu-mips.c \
 	ecoff.c \