From 491f3ef01bd8f71a72f64cec73fade65f4f25ccf Mon Sep 17 00:00:00 2001 From: Hans Petter Selasky Date: Tue, 23 Jun 2015 22:40:22 +0000 Subject: [PATCH] Rename __weak to __weak_symbol to avoid language conflict with objective-C. PR: 200972 (exp-run) Suggested by: theraven@ MFC after: 3 days --- 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 82cdc6ea4b4..1fb9875d827 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 5742ec62558..eaffcd14368 100644 --- a/sys/sys/linker_set.h +++ b/sys/sys/linker_set.h @@ -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))