Author: arybchik
Date: Thu Jun 18 15:50:42 2015
New Revision: 284556
URL: https://svnweb.freebsd.org/changeset/base/284556
Log:
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.
Modified:
stable/10/sys/dev/sfxge/sfxge_version.h
stable/10/sys/modules/sfxge/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/sfxge/sfxge_version.h
==============================================================================
--- stable/10/sys/dev/sfxge/sfxge_version.h Thu Jun 18 15:46:39 2015
(r284555)
+++ stable/10/sys/dev/sfxge/sfxge_version.h Thu Jun 18 15:50:42 2015
(r284556)
@@ -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 */
Modified: stable/10/sys/modules/sfxge/Makefile
==============================================================================
--- stable/10/sys/modules/sfxge/Makefile Thu Jun 18 15:46:39 2015
(r284555)
+++ stable/10/sys/modules/sfxge/Makefile Thu Jun 18 15:50:42 2015
(r284556)
@@ -36,7 +36,8 @@ SRCS+= hunt_nvram.c hunt_rx.c hunt_phy.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"
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
