diff options
author | imp <imp@FreeBSD.org> | 2014-07-17 22:31:46 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2014-07-17 22:31:46 +0000 |
commit | 07bb5d08f32b7d5d09ea862fb77c1b20ce9b9bcd (patch) | |
tree | 544dd6176b94f67f27aedf30b8bd0348f28f95fc | |
parent | 08c695a76f98c90f35979e8662000d622d38223f (diff) | |
download | FreeBSD-src-07bb5d08f32b7d5d09ea862fb77c1b20ce9b9bcd.zip FreeBSD-src-07bb5d08f32b7d5d09ea862fb77c1b20ce9b9bcd.tar.gz |
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.
-rw-r--r-- | UPDATING | 7 | ||||
-rw-r--r-- | sys/amd64/conf/GENERIC | 2 | ||||
-rw-r--r-- | sys/arm/conf/ZEDBOARD | 2 | ||||
-rw-r--r-- | sys/conf/kern.mk | 7 | ||||
-rw-r--r-- | sys/i386/conf/GENERIC | 2 | ||||
-rw-r--r-- | sys/i386/conf/XEN | 2 | ||||
-rw-r--r-- | sys/ia64/conf/GENERIC | 2 | ||||
-rw-r--r-- | sys/sparc64/conf/GENERIC | 2 |
8 files changed, 20 insertions, 6 deletions
@@ -16,6 +16,13 @@ from older versions of FreeBSD, try WITHOUT_CLANG to bootstrap to the tip of 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 diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 264dd6e..4ac155a 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -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 diff --git a/sys/arm/conf/ZEDBOARD b/sys/arm/conf/ZEDBOARD index 99a2272..9b079af 100644 --- a/sys/arm/conf/ZEDBOARD +++ b/sys/arm/conf/ZEDBOARD @@ -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 diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index e49cf6d..7f3f394 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -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 diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 642336e..5fa8c30 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -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 diff --git a/sys/i386/conf/XEN b/sys/i386/conf/XEN index 8348d67..2fac5d6 100644 --- a/sys/i386/conf/XEN +++ b/sys/i386/conf/XEN @@ -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" diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC index fe6e6a5..fa04c8d 100644 --- a/sys/ia64/conf/GENERIC +++ b/sys/ia64/conf/GENERIC @@ -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 diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC index bbf4f01..7b6905c 100644 --- a/sys/sparc64/conf/GENERIC +++ b/sys/sparc64/conf/GENERIC @@ -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. |