svn commit: r268813 - in stable/10: . sys/amd64/conf sys/arm/conf sys/conf sys/i386/conf sys/ia64/conf sys/sparc64/conf
Warner Losh
imp at FreeBSD.org
Thu Jul 17 22:31:48 UTC 2014
Author: imp
Date: Thu Jul 17 22:31:46 2014
New Revision: 268813
URL: http://svnweb.freebsd.org/changeset/base/268813
Log:
MFC r263749,267146:
>r267146 | imp | 2014-06-05 22:08:55 -0600 (Thu, 05 Jun 2014) | 4 lines
>Restore comments accidentally removed.
>r263749 | imp | 2014-03-25 16:08:31 -0600 (Tue, 25 Mar 2014) | 18 lines
>Rather than require a makeoptions DEBUG to get debug correct,
>add it in kern.mk, but only if we're using clang. While this
>option is supported by both clang and gcc, in the future there
>may be changes to clang which change the defaults that require
>a tweak to build our kernel such that other tools in our tree
>will work. Set a good example by forcing -gdwarf-2 only for
>clang builds, and only if the user hasn't specified another
>dwarf level already. Update UPDATING to reflect the changed
>state of affairs. This also keeps us from having to update
>all the ARM kernels to add this, and also keeps us from
>in the future having to update all the MIPS kernels and is
>one less place the user will have to know to do something
>special for clang and one less thing developers will need
>to do when moving an architecture to clang.
Modified:
stable/10/UPDATING
stable/10/sys/amd64/conf/GENERIC
stable/10/sys/arm/conf/ZEDBOARD
stable/10/sys/conf/kern.mk
stable/10/sys/i386/conf/GENERIC
stable/10/sys/i386/conf/XEN
stable/10/sys/ia64/conf/GENERIC
stable/10/sys/sparc64/conf/GENERIC
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/UPDATING
==============================================================================
--- stable/10/UPDATING Thu Jul 17 22:26:24 2014 (r268812)
+++ stable/10/UPDATING Thu Jul 17 22:31:46 2014 (r268813)
@@ -16,6 +16,13 @@ from older versions of FreeBSD, try WITH
stable/10, and then rebuild without this option. The bootstrap process from
older version of current is a bit fragile.
+20140717:
+ It is no longer necessary to include the dwarf version in your DEBUG
+ options in your kernel config file. The bug that required it to be
+ placed in the config file has bene fixed. DEBUG should now just
+ contain -g. The build system will automatically update things
+ to do the right thing.
+
20140715:
Several ABI breaking changes were merged to CTL and new iSCSI code.
All CTL and iSCSI-related tools, such as ctladm, ctld, iscsid and
Modified: stable/10/sys/amd64/conf/GENERIC
==============================================================================
--- stable/10/sys/amd64/conf/GENERIC Thu Jul 17 22:26:24 2014 (r268812)
+++ stable/10/sys/amd64/conf/GENERIC Thu Jul 17 22:31:46 2014 (r268813)
@@ -21,7 +21,7 @@
cpu HAMMER
ident GENERIC
-makeoptions DEBUG=-gdwarf-2 # Build kernel with gdb(1) debug symbols
+makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
options SCHED_ULE # ULE scheduler
Modified: stable/10/sys/arm/conf/ZEDBOARD
==============================================================================
--- stable/10/sys/arm/conf/ZEDBOARD Thu Jul 17 22:26:24 2014 (r268812)
+++ stable/10/sys/arm/conf/ZEDBOARD Thu Jul 17 22:31:46 2014 (r268813)
@@ -59,7 +59,7 @@ options VFP # vfp/neon
options SMP # Symmetric MultiProcessor Kernel
# Debugging
-makeoptions DEBUG=-g
+makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
options DDB
options KDB
# options BREAK_TO_DEBUGGER
Modified: stable/10/sys/conf/kern.mk
==============================================================================
--- stable/10/sys/conf/kern.mk Thu Jul 17 22:26:24 2014 (r268812)
+++ stable/10/sys/conf/kern.mk Thu Jul 17 22:31:46 2014 (r268813)
@@ -159,3 +159,10 @@ CFLAGS+= -ffreestanding
${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
CFLAGS+= -fstack-protector
.endif
+
+#
+# Add -gdwarf-2 when compiling -g
+#
+.if ${COMPILER_TYPE} == "clang" && ${CFLAGS:M-g} != "" && ${CFLAGS:M-gdwarf} == ""
+CFLAGS+= -gdwarf-2
+.endif
Modified: stable/10/sys/i386/conf/GENERIC
==============================================================================
--- stable/10/sys/i386/conf/GENERIC Thu Jul 17 22:26:24 2014 (r268812)
+++ stable/10/sys/i386/conf/GENERIC Thu Jul 17 22:31:46 2014 (r268813)
@@ -23,7 +23,7 @@ cpu I586_CPU
cpu I686_CPU
ident GENERIC
-makeoptions DEBUG=-gdwarf-2 # Build kernel with gdb(1) debug symbols
+makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
options SCHED_ULE # ULE scheduler
Modified: stable/10/sys/i386/conf/XEN
==============================================================================
--- stable/10/sys/i386/conf/XEN Thu Jul 17 22:26:24 2014 (r268812)
+++ stable/10/sys/i386/conf/XEN Thu Jul 17 22:31:46 2014 (r268813)
@@ -6,7 +6,7 @@
cpu I686_CPU
ident XEN
-makeoptions DEBUG=-gdwarf-2 # Build kernel with gdb(1) debug symbols
+makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
# The following modules don't build with PAE and XEN enabled.
makeoptions WITHOUT_MODULES="ctl cxgb dpt drm drm2 hptmv ida malo mwl rdma"
Modified: stable/10/sys/ia64/conf/GENERIC
==============================================================================
--- stable/10/sys/ia64/conf/GENERIC Thu Jul 17 22:26:24 2014 (r268812)
+++ stable/10/sys/ia64/conf/GENERIC Thu Jul 17 22:31:46 2014 (r268813)
@@ -23,7 +23,7 @@
cpu ITANIUM2
ident GENERIC
-makeoptions DEBUG=-g # Build kernel with debug information.
+makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
options AUDIT # Security event auditing
options CAPABILITY_MODE # Capsicum capability mode
Modified: stable/10/sys/sparc64/conf/GENERIC
==============================================================================
--- stable/10/sys/sparc64/conf/GENERIC Thu Jul 17 22:26:24 2014 (r268812)
+++ stable/10/sys/sparc64/conf/GENERIC Thu Jul 17 22:31:46 2014 (r268813)
@@ -21,7 +21,7 @@
cpu SUN4U
ident GENERIC
-makeoptions DEBUG=-gdwarf-2 # Build kernel with gdb(1) debug symbols
+makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
# Platforms supported
# At this time all platforms are supported, as-is.
More information about the svn-src-all
mailing list