Author: hselasky
Date: Tue Jun 23 22:40:22 2015
New Revision: 284743
URL: https://svnweb.freebsd.org/changeset/base/284743
Log:
Rename __weak to __weak_symbol to avoid language conflict with objective-C.
PR: 200972 (exp-run)
Suggested by: theraven@
MFC after: 3 days
Modified:
head/sys/sys/cdefs.h
head/sys/sys/linker_set.h
Modified: head/sys/sys/cdefs.h
==============================================================================
--- head/sys/sys/cdefs.h Tue Jun 23 22:31:04 2015 (r284742)
+++ head/sys/sys/cdefs.h Tue Jun 23 22:40:22 2015 (r284743)
@@ -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: head/sys/sys/linker_set.h
==============================================================================
--- head/sys/sys/linker_set.h Tue Jun 23 22:31:04 2015 (r284742)
+++ head/sys/sys/linker_set.h Tue Jun 23 22:40:22 2015 (r284743)
@@ -80,8 +80,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))
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
