Author: imp
Date: Thu Jul 17 22:42:18 2014
New Revision: 268814
URL: http://svnweb.freebsd.org/changeset/base/268814
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.
Note: Due to the funkadellic way we used to do merges, I've made a
direct commit of the relevant text to UPDATING with no merge info
being recorded for it so I could commit it at the same time as the
other files.
Modified:
stable/9/UPDATING
stable/9/sys/amd64/conf/GENERIC
stable/9/sys/conf/kern.mk
stable/9/sys/i386/conf/GENERIC
stable/9/sys/i386/conf/XEN
stable/9/sys/ia64/conf/GENERIC
stable/9/sys/sparc64/conf/GENERIC
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/conf/ (props changed)
Modified: stable/9/UPDATING
==============================================================================
--- stable/9/UPDATING Thu Jul 17 22:31:46 2014 (r268813)
+++ stable/9/UPDATING Thu Jul 17 22:42:18 2014 (r268814)
@@ -11,6 +11,13 @@ handbook:
Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before running portupgrade.
+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.
+
20140716:
9.3-RELEASE.
Modified: stable/9/sys/amd64/conf/GENERIC
==============================================================================
--- stable/9/sys/amd64/conf/GENERIC Thu Jul 17 22:31:46 2014
(r268813)
+++ stable/9/sys/amd64/conf/GENERIC Thu Jul 17 22:42:18 2014
(r268814)
@@ -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/9/sys/conf/kern.mk
==============================================================================
--- stable/9/sys/conf/kern.mk Thu Jul 17 22:31:46 2014 (r268813)
+++ stable/9/sys/conf/kern.mk Thu Jul 17 22:42:18 2014 (r268814)
@@ -151,3 +151,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/9/sys/i386/conf/GENERIC
==============================================================================
--- stable/9/sys/i386/conf/GENERIC Thu Jul 17 22:31:46 2014
(r268813)
+++ stable/9/sys/i386/conf/GENERIC Thu Jul 17 22:42:18 2014
(r268814)
@@ -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/9/sys/i386/conf/XEN
==============================================================================
--- stable/9/sys/i386/conf/XEN Thu Jul 17 22:31:46 2014 (r268813)
+++ stable/9/sys/i386/conf/XEN Thu Jul 17 22:42:18 2014 (r268814)
@@ -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 dpt drm drm2 hptmv ida malo mwl rdma xfs"
Modified: stable/9/sys/ia64/conf/GENERIC
==============================================================================
--- stable/9/sys/ia64/conf/GENERIC Thu Jul 17 22:31:46 2014
(r268813)
+++ stable/9/sys/ia64/conf/GENERIC Thu Jul 17 22:42:18 2014
(r268814)
@@ -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 CD9660 # ISO 9660 Filesystem
Modified: stable/9/sys/sparc64/conf/GENERIC
==============================================================================
--- stable/9/sys/sparc64/conf/GENERIC Thu Jul 17 22:31:46 2014
(r268813)
+++ stable/9/sys/sparc64/conf/GENERIC Thu Jul 17 22:42:18 2014
(r268814)
@@ -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.
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
