svn commit: r283326 - stable/10/sys/sys

[Ian Lepore]

Author: ian
Date: Sat May 23 20:53:19 2015
New Revision: 283326
URL: https://svnweb.freebsd.org/changeset/base/283326

Log:
  MFC r268137, r268138:
  
    Define a "__weak" macro for declaring symbols "weak".
  
    Add support for empty data sets. Data set begin and end pointers
    should resolve to "NULL" when not present. This is done by declaring
    the data set begin and end symbols as "weak".

Modified:
  stable/10/sys/sys/cdefs.h
  stable/10/sys/sys/linker_set.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/sys/cdefs.h
==============================================================================
--- stable/10/sys/sys/cdefs.h	Sat May 23 20:29:06 2015	(r283325)
+++ stable/10/sys/sys/cdefs.h	Sat May 23 20:53:19 2015	(r283326)
@@ -213,7 +213,9 @@
 #define	__packed
 #define	__aligned(x)
 #define	__section(x)
+#define	__weak
 #else
+#define	__weak		__attribute__((__weak__))
 #if !__GNUC_PREREQ__(2, 5) && !defined(__INTEL_COMPILER)
 #define	__dead2
 #define	__pure2

Modified: stable/10/sys/sys/linker_set.h
==============================================================================
--- stable/10/sys/sys/linker_set.h	Sat May 23 20:29:06 2015	(r283325)
+++ stable/10/sys/sys/linker_set.h	Sat May 23 20:53:19 2015	(r283326)
@@ -68,9 +68,9 @@
 /*
  * Initialize before referring to a given linker set.
  */
-#define SET_DECLARE(set, ptype)						\
-	extern ptype *__CONCAT(__start_set_,set);			\
-	extern ptype *__CONCAT(__stop_set_,set)
+#define SET_DECLARE(set, ptype)					\
+	extern ptype __weak *__CONCAT(__start_set_,set);	\
+	extern ptype __weak *__CONCAT(__stop_set_,set)
 
 #define SET_BEGIN(set)							\
 	(&__CONCAT(__start_set_,set))