From e3e23748d11f3881cb346b7d4e5d8d463fdd19e6 Mon Sep 17 00:00:00 2001 From: Olivier Houchard Date: Sat, 9 Oct 2021 01:53:03 +0200 Subject: [PATCH] MINOR: initcall: Rename __GLOBL and __GLOBL1. Rename __GLOBL and __GLOBL1 to __HA_GLOBL and __HA_GLOBL1, as the former are already defined on FreeBSD. This should be backported to 2.4, 2.3 and 2.2. (cherry picked from commit e972c0acde990de30a00f76f7f61470d3325c757) Signed-off-by: Christopher Faulet (cherry picked from commit 1e74052267a3a09a9dba8b2ba6131d4bd1d80923) Signed-off-by: Christopher Faulet --- include/haproxy/initcall.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/haproxy/initcall.h b/include/haproxy/initcall.h index eb7369b..019aae6 100644 --- a/include/haproxy/initcall.h +++ b/include/haproxy/initcall.h @@ -98,11 +98,11 @@ struct initcall { * as a pointer (args are cast to (void*)). Do not use this macro directly, * use INITCALL{0..3}() instead. */ -#define __GLOBL1(sym) __asm__(".globl " #sym) -#define __GLOBL(sym) __GLOBL1(sym) +#define __HA_GLOBL1(sym) __asm__(".globl " #sym) +#define __HA_GLOBL(sym) __HA_GLOBL1(sym) #define __DECLARE_INITCALL(stg, linenum, function, a1, a2, a3) \ - __GLOBL(__start_init_##stg ); \ - __GLOBL(__stop_init_##stg ); \ + __HA_GLOBL(__start_init_##stg ); \ + __HA_GLOBL(__stop_init_##stg ); \ static const struct initcall *__initcb_##linenum \ __attribute__((__used__,HA_SECTION(stg))) = \ (stg < STG_SIZE) ? &(const struct initcall) { \ -- 1.7.10.4