Index: head/gnu/usr.bin/binutils/as/Makefile
===================================================================
--- head/gnu/usr.bin/binutils/as/Makefile	(revision 233387)
+++ head/gnu/usr.bin/binutils/as/Makefile	(revision 233388)
@@ -1,82 +1,89 @@
 # $FreeBSD$
 
 
 # BINDIR
 .include "${.CURDIR}/../../Makefile.inc"
 .include "${.CURDIR}/../Makefile.inc0"
 
 .PATH: ${SRCDIR}/gas ${SRCDIR}/gas/config
 
 PROG=	as
 SRCS+=	app.c \
 	as.c \
 	atof-generic.c \
 	atof-ieee.c \
 	cond.c \
 	depend.c \
 	dw2gencfi.c \
 	dwarf2dbg.c \
 	ecoff.c \
 	ehopt.c \
 	expr.c \
 	flonum-copy.c \
 	flonum-konst.c \
 	flonum-mult.c \
 	frags.c \
 	hash.c \
 	input-file.c \
 	input-scrub.c \
 	listing.c \
 	literal.c \
 	macro.c \
 	messages.c \
 	obj-elf.c \
 	output-file.c \
 	read.c \
 	sb.c \
 	stabs.c \
 	subsegs.c \
 	symbols.c \
 	write.c
 # DEO: why not used?
 #SRCS+=	itbl-ops.c
 
 .if ${TARGET_CPUARCH} == "mips"
 SRCS+=	itbl-ops.c itbl-parse.y itbl-lex.l
+.if ${TARGET_ARCH:Mmips64*} != ""
+CFLAGS+=	-DMIPS_DEFAULT_ABI=N64_ABI -DMIPS_DEFAULT_64BIT=1
+.elif ${TARGET_ARCH:Mmipsn32*} != ""
+CFLAGS+=	-DMIPS_DEFAULT_ABI=N32_ABI
+.else
+MIPS_ABI_DEFAULT=ABI_32
+.endif
 .endif
 
 .if ${TARGET_ARCH} == "amd64"
 SRCS+=	tc-i386.c
 .elif ${TARGET_CPUARCH} == "powerpc"
 SRCS+=	tc-ppc.c
 .elif ${TARGET_ARCH} == "sparc64"
 SRCS+=	tc-sparc.c
 .else
 SRCS+=	tc-${TARGET_CPUARCH}.c
 .endif
 
 .if ${TARGET_ARCH} == "sparc64"
 CFLAGS+= -DDEFAULT_ARCH=\"v9-64\"
 .else
 CFLAGS+= -DDEFAULT_ARCH=\"${BINUTILS_ARCH}\"
 .endif
 .if defined(TARGET_BIG_ENDIAN)
 CFLAGS+= -DTARGET_BYTES_BIG_ENDIAN=1
 .endif
 CFLAGS+= -DTARGET_CPU=\"${BINUTILS_ARCH}\"
 CFLAGS+= -DTARGET_OS=\"${TARGET_OS}\"
 CFLAGS+= -DTARGET_CANONICAL=\"${TARGET_TUPLE}\"
 CFLAGS+= -DTARGET_ALIAS=\"${TARGET_TUPLE}\"
 CFLAGS+= -DVERSION=\"${VERSION}\"
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${SRCDIR}/gas -I${SRCDIR}/bfd -I${SRCDIR}/gas/config -I${SRCDIR}
 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/${TARGET_CPUARCH}-freebsd
 
 NO_SHARED?=	yes
 
 DPADD=	${RELTOP}/libbfd/libbfd.a
 DPADD+=	${RELTOP}/libiberty/libiberty.a
 DPADD+=	${RELTOP}/libopcodes/libopcodes.a
 LDADD=	${DPADD}
 
 .include <bsd.prog.mk>
Index: head/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h
===================================================================
--- head/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h	(revision 233387)
+++ head/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h	(revision 233388)
@@ -1,19 +1,22 @@
 /* $FreeBSD$ */
 
 #include "itbl-mips.h"
 
 /* Choose a default ABI for MIPS targets.  */
-/* XXX: Where should this be ? */
+#ifndef	MIPS_DEFAULT_ABI
 #define MIPS_DEFAULT_ABI NO_ABI
+#endif
 
 /* Default CPU for MIPS targets.  */
 #define MIPS_CPU_STRING_DEFAULT "from-abi"
 
 /* Generate 64-bit code by default on MIPS targets.  */
+#ifndef	MIPS_DEFAULT_64BIT
 #define MIPS_DEFAULT_64BIT 0
+#endif
 
 /* Allow use of E_MIPS_ABI_O32 on MIPS targets.  */
 #define USE_E_MIPS_ABI_O32 1
 
 /* Use traditional mips */
 #define TE_TMIPS 1