summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authormelifaro <melifaro@FreeBSD.org>2014-10-06 11:29:50 +0000
committermelifaro <melifaro@FreeBSD.org>2014-10-06 11:29:50 +0000
commitbbf0fe2f55e3258afdcf4e34c9b1b3e7022313ec (patch)
tree854ad5abba35f75bf0897714c147006029a7ec67 /sys/conf
parent6d4e1e4f7b52f1c8a619c0543a842d2c32fc4b08 (diff)
parent1a9bf52407392314013176555802b13a04699792 (diff)
downloadFreeBSD-src-bbf0fe2f55e3258afdcf4e34c9b1b3e7022313ec.zip
FreeBSD-src-bbf0fe2f55e3258afdcf4e34c9b1b3e7022313ec.tar.gz
Sync to HEAD@r272609.
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/Makefile.arm3
-rw-r--r--sys/conf/NOTES1
-rw-r--r--sys/conf/options1
3 files changed, 5 insertions, 0 deletions
diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm
index 08e70f3..2727f81 100644
--- a/sys/conf/Makefile.arm
+++ b/sys/conf/Makefile.arm
@@ -42,6 +42,9 @@ STRIP_FLAGS = -S
# We don't support gcc's thump interwork stuff, so disable it
CFLAGS.gcc += -mno-thumb-interwork
+# We generally don't want fpu instructions in the kernel.
+CFLAGS.clang += -mfpu=none
+
.if !empty(DDB_ENABLED)
CFLAGS += -funwind-tables
# clang requires us to tell it to emit assembly with unwind information
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 5baa306..5cc146e 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2958,6 +2958,7 @@ options SC_RENDER_DEBUG # syscons rendering debugging
options VFS_BIO_DEBUG # VFS buffer I/O debugging
options KSTACK_MAX_PAGES=32 # Maximum pages to give the kernel stack
+options KSTACK_USAGE_PROF
# Adaptec Array Controller driver options
options AAC_DEBUG # Debugging levels:
diff --git a/sys/conf/options b/sys/conf/options
index 42113c3..8337521 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -136,6 +136,7 @@ KDTRACE_FRAME opt_kdtrace.h
KN_HASHSIZE opt_kqueue.h
KSTACK_MAX_PAGES
KSTACK_PAGES
+KSTACK_USAGE_PROF
KTRACE
KTRACE_REQUEST_POOL opt_ktrace.h
LIBICONV
OpenPOWER on IntegriCloud