summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2015-12-19 19:20:48 +0000
committerimp <imp@FreeBSD.org>2015-12-19 19:20:48 +0000
commit69774947bfffd5e16d26b60a82d880aa659abbf2 (patch)
treeee594e524b8e1d5fdb6c764283b566c2caa803bc
parent3e19ac3badb2568b652a55ad83a2d1d351f23c3d (diff)
downloadFreeBSD-src-69774947bfffd5e16d26b60a82d880aa659abbf2.zip
FreeBSD-src-69774947bfffd5e16d26b60a82d880aa659abbf2.tar.gz
Move some MIPS specific flags to be more congruent with other
architectures.
-rw-r--r--sys/conf/Makefile.mips2
-rw-r--r--sys/conf/kern.mk1
-rw-r--r--sys/conf/kmod.mk2
3 files changed, 3 insertions, 2 deletions
diff --git a/sys/conf/Makefile.mips b/sys/conf/Makefile.mips
index 09eca75..30f7d1e 100644
--- a/sys/conf/Makefile.mips
+++ b/sys/conf/Makefile.mips
@@ -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=-fno-pic -mno-abicalls -G0 -DKERNLOADADDR=${KERNLOADADDR}
+EXTRA_FLAGS=-DKERNLOADADDR=${KERNLOADADDR}
HACK_EXTRA_FLAGS=-shared
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index 56ddbda..0a8161d 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -160,6 +160,7 @@ 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
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 50000c5..2b7fab2 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -130,7 +130,7 @@ CFLAGS+= -mlongcall -fno-omit-frame-pointer
.endif
.if ${MACHINE_CPUARCH} == mips
-CFLAGS+= -G0 -fno-pic -mno-abicalls -mlong-calls
+CFLAGS+= -mlong-calls
.endif
.if defined(DEBUG) || defined(DEBUG_FLAGS)
OpenPOWER on IntegriCloud