diff options
author | arybchik <arybchik@FreeBSD.org> | 2015-06-18 15:50:42 +0000 |
---|---|---|
committer | arybchik <arybchik@FreeBSD.org> | 2015-06-18 15:50:42 +0000 |
commit | dffc07db79958fd4918ed5aa7952be401ef97be1 (patch) | |
tree | 5ea848dfcd61cdaa7ffb8d52b9a98f9f1be94581 | |
parent | 60da1828ed66b85f8f0d8c927122747ca725d307 (diff) | |
download | FreeBSD-src-dffc07db79958fd4918ed5aa7952be401ef97be1.zip FreeBSD-src-dffc07db79958fd4918ed5aa7952be401ef97be1.tar.gz |
MFC: r283679
sfxge: do not use DEBUG_FLAGS to enable extra debug checks
DEBUG_FLAGS are set to DEBUG option value when kernel is built.
For example, it is -g in GENERIC config to have debug symbols.
Also DEBUG_FLAGS are used to determine if ctfconvert should keep
debug symbols.
Since we redefined DEBUG_FLAGS, debug symbols were always missing.
ctfconvert complains about it during kernel build.
It is incorrect to append DEBUG_FLAGS, since if DEBUG has no -g (or
similar), we'll have no debug symbols and ctfconvert will complain.
If it incorrect to always have -g in our DEBUG_FLAGS, since debug
symbols presence should be controllable by kernel config.
So, just add disabled by default addition of -DDEBUG=1 to CFLAGS.
Reviewed by: imp
Sponsored by: Solarflare Communications, Inc.
-rw-r--r-- | sys/dev/sfxge/sfxge_version.h | 2 | ||||
-rw-r--r-- | sys/modules/sfxge/Makefile | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/sfxge/sfxge_version.h b/sys/dev/sfxge/sfxge_version.h index 5228fff..f5f4882 100644 --- a/sys/dev/sfxge/sfxge_version.h +++ b/sys/dev/sfxge/sfxge_version.h @@ -36,6 +36,6 @@ #ifndef _SFXGE_VERSION_H #define _SFXGE_VERSION_H -#define SFXGE_VERSION_STRING "v4.5.1.1018" +#define SFXGE_VERSION_STRING "v4.5.2.1000" #endif /* _SFXGE_DRIVER_VERSION_H */ diff --git a/sys/modules/sfxge/Makefile b/sys/modules/sfxge/Makefile index f6d5f07..a7b3c0d 100644 --- a/sys/modules/sfxge/Makefile +++ b/sys/modules/sfxge/Makefile @@ -36,7 +36,8 @@ SRCS+= hunt_nvram.c hunt_rx.c hunt_phy.c hunt_sram.c hunt_tx.c hunt_vpd.c SRCS+= hunt_filter.c SRCS+= hunt_impl.h -DEBUG_FLAGS= -DDEBUG=1 +# Extra debug checks +#CFLAGS += -DDEBUG=1 .if !defined(KERNBUILDDIR) .if ${MK_INET_SUPPORT} != "no" |