From abbbfb29dcffeb8e29035eb57589b52dbb88c8eb Mon Sep 17 00:00:00 2001 From: hselasky Date: Fri, 26 Jun 2015 21:35:36 +0000 Subject: [PATCH] MFC r284743: Rename __weak to __weak_symbol to avoid language conflict with objective-C. PR: 200972 (exp-run) Suggested by: theraven@ git-svn-id: svn://svn.freebsd.org/base/stable/10@284880 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/sys/cdefs.h | 4 ++-- sys/sys/linker_set.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index abb38e634..c96dd8966 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -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 diff --git a/sys/sys/linker_set.h b/sys/sys/linker_set.h index 4fa663d1b..e432dd855 100644 --- a/sys/sys/linker_set.h +++ b/sys/sys/linker_set.h @@ -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)) -- 2.45.0