From owner-svn-src-head@freebsd.org  Mon Dec 21 20:36:03 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1EDF6A4E1AB;
 Mon, 21 Dec 2015 20:36:03 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E423E1E07;
 Mon, 21 Dec 2015 20:36:02 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBLKa2xf096853;
 Mon, 21 Dec 2015 20:36:02 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBLKa14l096849;
 Mon, 21 Dec 2015 20:36:01 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201512212036.tBLKa14l096849@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 21 Dec 2015 20:36:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r292567 - head/sys/conf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Dec 2015 20:36:03 -0000

Author: imp
Date: Mon Dec 21 20:36:01 2015
New Revision: 292567
URL: https://svnweb.freebsd.org/changeset/base/292567

Log:
  Revert this change. It broke the trampoline build. Until I'm sure
  nothing else is broken, I'm reverting.

Modified:
  head/sys/conf/Makefile.mips
  head/sys/conf/kern.mk
  head/sys/conf/kmod.mk

Modified: head/sys/conf/Makefile.mips
==============================================================================
--- head/sys/conf/Makefile.mips	Mon Dec 21 20:29:55 2015	(r292566)
+++ head/sys/conf/Makefile.mips	Mon Dec 21 20:36:01 2015	(r292567)
@@ -42,7 +42,7 @@ TRAMPLOADADDR?=0x807963c0
 # We default to the MIPS32 ISA, if none specified in the
 # kernel configuration file.
 ARCH_FLAGS?=-march=mips32
-EXTRA_FLAGS=-DKERNLOADADDR=${KERNLOADADDR}
+EXTRA_FLAGS=-fno-pic -mno-abicalls -G0 -DKERNLOADADDR=${KERNLOADADDR}
 
 HACK_EXTRA_FLAGS=-shared
 

Modified: head/sys/conf/kern.mk
==============================================================================
--- head/sys/conf/kern.mk	Mon Dec 21 20:29:55 2015	(r292566)
+++ head/sys/conf/kern.mk	Mon Dec 21 20:36:01 2015	(r292567)
@@ -160,7 +160,6 @@ CFLAGS.gcc+=	-mcall-aixdesc
 # For MIPS we also tell gcc to use floating point emulation
 #
 .if ${MACHINE_CPUARCH} == "mips"
-CFLAGS+=	-fno-pic -mno-abicalls -G0 
 CFLAGS+=	-msoft-float
 INLINE_LIMIT?=	8000
 .endif

Modified: head/sys/conf/kmod.mk
==============================================================================
--- head/sys/conf/kmod.mk	Mon Dec 21 20:29:55 2015	(r292566)
+++ head/sys/conf/kmod.mk	Mon Dec 21 20:36:01 2015	(r292567)
@@ -130,7 +130,7 @@ CFLAGS+=	-mlongcall -fno-omit-frame-poin
 .endif
 
 .if ${MACHINE_CPUARCH} == mips
-CFLAGS+=	-mlong-calls
+CFLAGS+=	-G0 -fno-pic -mno-abicalls -mlong-calls
 .endif
 
 .if defined(DEBUG) || defined(DEBUG_FLAGS)