Page MenuHomeFreeBSD
Files F140077375

D8574.id22332.diff
No OneTemporary
Actions

D8574.id22332.diff
View Options

Index: head/sys/conf/kern.pre.mk
===================================================================
--- head/sys/conf/kern.pre.mk
+++ head/sys/conf/kern.pre.mk
@@ -74,7 +74,7 @@
CFLAGS_PARAM_INLINE_UNIT_GROWTH?=100
CFLAGS_PARAM_LARGE_FUNCTION_GROWTH?=1000
.if ${MACHINE_CPUARCH} == "mips"
-CFLAGS_ARCH_PARAMS?=--param max-inline-insns-single=1000
+CFLAGS_ARCH_PARAMS?=--param max-inline-insns-single=1000 -DMACHINE_ARCH='"${MACHINE_ARCH}"'
.endif
CFLAGS.gcc+= -fno-common -fms-extensions -finline-limit=${INLINE_LIMIT}
CFLAGS.gcc+= --param inline-unit-growth=${CFLAGS_PARAM_INLINE_UNIT_GROWTH}
Index: head/sys/mips/include/param.h
===================================================================
--- head/sys/mips/include/param.h
+++ head/sys/mips/include/param.h
@@ -53,33 +53,36 @@
#define __PCI_REROUTE_INTERRUPT
-#ifndef MACHINE
-#define MACHINE "mips"
-#endif
-#ifndef MACHINE_ARCH
#if _BYTE_ORDER == _BIG_ENDIAN
-#ifdef __mips_n64
-#define MACHINE_ARCH "mips64"
-#ifndef MACHINE_ARCH32
-#define MACHINE_ARCH32 "mips"
+# define _EL_SUFFIX ""
+#else
+# define _EL_SUFFIX "el"
#endif
+
+#ifdef __mips_n64
+# define _N64_SUFFIX "64"
#elif defined(__mips_n32)
-#define MACHINE_ARCH "mipsn32"
+# define _N64_SUFFIX "n32"
#else
-#define MACHINE_ARCH "mips"
+# define _N64_SUFFIX ""
#endif
+
+#ifdef __mips_hard_float
+# define _HF_SUFFIX "hf"
#else
-#ifdef __mips_n64
-#define MACHINE_ARCH "mips64el"
-#ifndef MACHINE_ARCH32
-#define MACHINE_ARCH32 "mipsel"
+# define _HF_SUFFIX ""
#endif
-#elif defined(__mips_n32)
-#define MACHINE_ARCH "mipsn32el"
-#else
-#define MACHINE_ARCH "mipsel"
+
+#ifndef MACHINE
+# define MACHINE "mips"
#endif
+#ifndef MACHINE_ARCH
+# define MACHINE_ARCH "mips" _N64_SUFFIX _EL_SUFFIX _HF_SUFFIX
#endif
+#ifdef __mips_n64
+# ifndef MACHINE_ARCH32
+# define MACHINE_ARCH32 "mips" _EL_SUFFIX _HF_SUFFIX
+# endif
#endif
/*

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 20, 10:39 PM (11 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27101979
Default Alt Text
D8574.id22332.diff (1 KB)

Event Timeline