From owner-p4-projects@FreeBSD.ORG Thu Mar 1 05:44:55 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0ABD2106566C; Thu, 1 Mar 2012 05:44:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C18C2106566B for ; Thu, 1 Mar 2012 05:44:54 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id AA74E8FC08 for ; Thu, 1 Mar 2012 05:44:54 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q215iscf076912 for ; Thu, 1 Mar 2012 05:44:54 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q215isYX076909 for perforce@freebsd.org; Thu, 1 Mar 2012 05:44:54 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 1 Mar 2012 05:44:54 GMT Message-Id: <201203010544.q215isYX076909@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 207147 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Mar 2012 05:44:55 -0000 http://p4web.freebsd.org/@@207147?ac=10 Change 207147 by gonzo@gonzo_thinkpad on 2012/03/01 05:44:30 Set proper defaults for ABI and 32/64 bit flags (e.g. the same as target platform) Affected files ... .. //depot/projects/dtrace-mips/gnu/usr.bin/binutils/as/Makefile#2 edit .. //depot/projects/dtrace-mips/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h#2 edit .. //depot/projects/dtrace-mips/share/mk/sys.mk#2 edit Differences ... ==== //depot/projects/dtrace-mips/gnu/usr.bin/binutils/as/Makefile#2 (text+ko) ==== @@ -43,6 +43,13 @@ .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" ==== //depot/projects/dtrace-mips/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h#2 (text+ko) ==== @@ -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 ==== //depot/projects/dtrace-mips/share/mk/sys.mk#2 (text+ko) ====