svn commit: r233388 - in head/gnu/usr.bin/binutils/as: . mips-freebsd

[Oleksandr Tymoshenko]

Author: gonzo
Date: Fri Mar 23 19:37:45 2012
New Revision: 233388
URL: http://svn.freebsd.org/changeset/base/233388

Log:
  Make default ABI for as(1) to be the same as target platform.
  This change makes object files compiled with default flags by
  gcc and as compatible.

Modified:
  head/gnu/usr.bin/binutils/as/Makefile
  head/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h

Modified: head/gnu/usr.bin/binutils/as/Makefile
==============================================================================
--- head/gnu/usr.bin/binutils/as/Makefile	Fri Mar 23 19:32:30 2012	(r233387)
+++ head/gnu/usr.bin/binutils/as/Makefile	Fri Mar 23 19:37:45 2012	(r233388)
@@ -43,6 +43,13 @@ SRCS+=	app.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"

Modified: head/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h
==============================================================================
--- head/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h	Fri Mar 23 19:32:30 2012	(r233387)
+++ head/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h	Fri Mar 23 19:37:45 2012	(r233388)
@@ -3,14 +3,17 @@
 #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