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

[Hans Petter Selasky]

Author: hselasky
Date: Fri Jun 26 21:35:36 2015
New Revision: 284880
URL: https://svnweb.freebsd.org/changeset/base/284880

Log:
  MFC r284743:
  Rename __weak to __weak_symbol to avoid language conflict with objective-C.
  
  PR:		200972 (exp-run)
  Suggested by:	theraven@

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	Fri Jun 26 19:55:01 2015	(r284879)
+++ stable/10/sys/sys/cdefs.h	Fri Jun 26 21:35:36 2015	(r284880)
@@ -213,9 +213,9 @@
 #define	__packed
 #define	__aligned(x)
 #define	__section(x)
-#define	__weak
+#define	__weak_symbol
 #else
-#define	__weak		__attribute__((__weak__))
+#define	__weak_symbol	__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	Fri Jun 26 19:55:01 2015	(r284879)
+++ stable/10/sys/sys/linker_set.h	Fri Jun 26 21:35:36 2015	(r284880)
@@ -69,8 +69,8 @@
  * Initialize before referring to a given linker set.
  */
 #define SET_DECLARE(set, ptype)					\
-	extern ptype __weak *__CONCAT(__start_set_,set);	\
-	extern ptype __weak *__CONCAT(__stop_set_,set)
+	extern ptype __weak_symbol *__CONCAT(__start_set_,set);	\
+	extern ptype __weak_symbol *__CONCAT(__stop_set_,set)
 
 #define SET_BEGIN(set)							\
 	(&__CONCAT(__start_set_,set))