From 38e53a33795a88f305f30f63b7f9548e446ba2ab Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roger=20Pau=20Monn=C3=A9?= Date: Tue, 31 Jul 2018 10:23:37 +0200 Subject: [PATCH] xen/compiler: introduce a define for weak symbols MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit And replace the open-coded versions already in tree. No functional change. Signed-off-by: Roger Pau Monné Reivewed-by: Andrew Cooper Reviewed-by: Ross Lagerwall --- xen/include/xen/compiler.h | 2 ++ xen/include/xen/livepatch_payload.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/include/xen/compiler.h b/xen/include/xen/compiler.h index a7e05681c9..ff6c0f5cdd 100644 --- a/xen/include/xen/compiler.h +++ b/xen/include/xen/compiler.h @@ -18,6 +18,8 @@ #define __packed __attribute__((__packed__)) +#define __weak __attribute__((__weak__)) + #if (!defined(__clang__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 5)) #define unreachable() do {} while (1) #else diff --git a/xen/include/xen/livepatch_payload.h b/xen/include/xen/livepatch_payload.h index 8f38cc2c60..4a1a96d054 100644 --- a/xen/include/xen/livepatch_payload.h +++ b/xen/include/xen/livepatch_payload.h @@ -24,7 +24,7 @@ typedef void livepatch_unloadcall_t(void); * executed in series by the livepatch infrastructure at patch load time. */ #define LIVEPATCH_LOAD_HOOK(_fn) \ - livepatch_loadcall_t *__attribute__((weak)) \ + livepatch_loadcall_t *__weak \ const livepatch_load_data_##_fn __section(".livepatch.hooks.load") = _fn; /* @@ -33,7 +33,7 @@ typedef void livepatch_unloadcall_t(void); * Same as LOAD hook with s/load/unload/ */ #define LIVEPATCH_UNLOAD_HOOK(_fn) \ - livepatch_unloadcall_t *__attribute__((weak)) \ + livepatch_unloadcall_t *__weak \ const livepatch_unload_data_##_fn __section(".livepatch.hooks.unload") = _fn; #endif /* __XEN_LIVEPATCH_PAYLOAD_H__ */ -- 2.30.2