svn commit: r283679 - in head/sys: dev/sfxge modules/sfxge

[Andrew Rybchenko]

Author: arybchik
Date: Fri May 29 05:44:56 2015
New Revision: 283679
URL: https://svnweb.freebsd.org/changeset/base/283679

Log:
  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.
  MFC after:      2 days
  Differential Revision: https://reviews.freebsd.org/D2666

Modified:
  head/sys/dev/sfxge/sfxge_version.h
  head/sys/modules/sfxge/Makefile

Modified: head/sys/dev/sfxge/sfxge_version.h
==============================================================================
--- head/sys/dev/sfxge/sfxge_version.h	Fri May 29 05:28:24 2015	(r283678)
+++ head/sys/dev/sfxge/sfxge_version.h	Fri May 29 05:44:56 2015	(r283679)
@@ -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: head/sys/modules/sfxge/Makefile
==============================================================================
--- head/sys/modules/sfxge/Makefile	Fri May 29 05:28:24 2015	(r283678)
+++ head/sys/modules/sfxge/Makefile	Fri May 29 05:44:56 2015	(r283679)
@@ -34,6 +34,7 @@ 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
 
 .include <bsd.kmod.mk>