svn commit: r205577 - in user/jmallett/octeon/gnu/usr.bin/binutils: . libbfd

[Juli Mallett]

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 \