svn commit: r292567 - head/sys/conf

[Warner Losh]

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)