From owner-p4-projects@FreeBSD.ORG  Thu Mar 11 21:54:07 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 15CBC16A4D0; Thu, 11 Mar 2004 21:54:07 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E027B16A4CE
	for <perforce@freebsd.org>; Thu, 11 Mar 2004 21:54:06 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D314943D6B
	for <perforce@freebsd.org>; Thu, 11 Mar 2004 21:54:06 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2C5s6Ge061830
	for <perforce@freebsd.org>; Thu, 11 Mar 2004 21:54:06 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2C5s5oR061827
	for perforce@freebsd.org; Thu, 11 Mar 2004 21:54:05 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Thu, 11 Mar 2004 21:54:05 -0800 (PST)
Message-Id: <200403120554.i2C5s5oR061827@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 48764 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Mar 2004 05:54:07 -0000

http://perforce.freebsd.org/chv.cgi?CH=48764

Change 48764 by jmallett@jmallett_oingo on 2004/03/11 21:53:14

	The -G0 default wasn't really working, which is OK because we
	don't have !-fno-pic->-KPIC stuff netbsd/linux/... have, which
	is not OK.  But for now just put in some -G0's and if out the
	-G0 default attempt.

Affected files ...

.. //depot/projects/mips/contrib/gcc/config/mips/freebsd.h#12 edit
.. //depot/projects/mips/sys/conf/Makefile.mips#13 edit
.. //depot/projects/mips/sys/conf/kern.mk#10 edit

Differences ...

==== //depot/projects/mips/contrib/gcc/config/mips/freebsd.h#12 (text+ko) ====

@@ -64,8 +64,10 @@
 #undef LOCAL_LABEL_PREFIX
 #define LOCAL_LABEL_PREFIX ((mips_abi == ABI_32 || mips_abi == ABI_O64) \
 			    ? "$" : ".")
+#if notyet
 /* -G is incompatible with -KPIC which is the default, so only allow objects
    in the small data section if the user explicitly asks for it.  */
 
 #undef MIPS_DEFAULT_GVALUE 
 #define MIPS_DEFAULT_GVALUE 0 
+#endif

==== //depot/projects/mips/sys/conf/Makefile.mips#13 (text+ko) ====

@@ -42,6 +42,8 @@
 
 MIPSOPTS?= -mips3
 CFLAGS+= -D${PLATFORM} ${MIPSOPTS}
+# Disable the gp.
+LDFLAGS+= -G0
 
 .if defined(TEXTADDR)
 LDFLAGS+= -Ttext ${TEXTADDR}

==== //depot/projects/mips/sys/conf/kern.mk#10 (text+ko) ====

@@ -78,9 +78,10 @@
 
 #
 # For MIPS, disable ABI cals, PIC, and tell GCC to use soft floating.
+# Also disable the GP.
 #
 .if ${MACHINE_ARCH} == "mips"
-CFLAGS+=	-mno-abicalls -fno-pic -msoft-float
+CFLAGS+=	-mno-abicalls -msoft-float -fno-pic -G0
 INLINE_LIMIT?=	15000
 .endif