From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1804) id 80E523853572; Fri, 7 Oct 2022 08:20:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 80E523853572 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1665130853; bh=OWkztfpfq2+c2U21yFHaSnILs3T2IZR1OjD58/FjJ7M=; h=From:To:Subject:Date:From; b=nkwEKcMPiWppEFayTWPbdUcaJs8ShBl5gZGsreb92HJlWj48+oWeCYwQrl0WYENne D38gNNYB2lH1POr7YMy2jG/PjQCAe8QaUJ6rnSWUQIxAizx6mL+3jFCXHLhAJeohWF kJA9V6NkHdrxCQ3yXqVY3nwdFkjFYbkLcFayIf9A= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Dmitry Levin To: glibc-cvs@sourceware.org Subject: [glibc/release/2.32/master] : Support compat_symbol_reference for _ISOMAC X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/release/2.32/master X-Git-Oldrev: 76e807f5f1d264fdb3de4e6ee985ab3cf662f6f9 X-Git-Newrev: 7a9e8a984a32ccaf8947d116fca63ad406452bfa Message-Id: <20221007082053.80E523853572@sourceware.org> Date: Fri, 7 Oct 2022 08:20:53 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=7a9e8a984a32ccaf8947d116fca63ad406452bfa commit 7a9e8a984a32ccaf8947d116fca63ad406452bfa Author: Florian Weimer Date: Tue Mar 9 21:07:24 2021 +0100 : Support compat_symbol_reference for _ISOMAC This is helpful for testing compat symbols in cases where _ISOMAC is activated implicitly due to -DMODULE_NAME=testsuite and cannot be disabled easily. (cherry picked from commit 36f6e408845c8c539128f3fb9cb132bf1845a2c8) Diff: --- include/libc-symbols.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/include/libc-symbols.h b/include/libc-symbols.h index 60153bb50d..8ac99fec15 100644 --- a/include/libc-symbols.h +++ b/include/libc-symbols.h @@ -59,6 +59,19 @@ # define IN_MODULE (-1) #endif +/* Use symbol_version_reference to specify the version a symbol + reference should link to. Use symbol_version or + default_symbol_version for the definition of a versioned symbol. + The difference is that the latter is a no-op in non-shared + builds. */ +#ifdef __ASSEMBLER__ +# define symbol_version_reference(real, name, version) \ + .symver real, name##@##version +#else /* !__ASSEMBLER__ */ +# define symbol_version_reference(real, name, version) \ + __asm__ (".symver " #real "," #name "@" #version) +#endif + #ifndef _ISOMAC /* This is defined for the compilation of all C library code. features.h @@ -396,19 +409,6 @@ for linking") past the last element in SET. */ #define symbol_set_end_p(set, ptr) ((ptr) >= (void *const *) &__stop_##set) -/* Use symbol_version_reference to specify the version a symbol - reference should link to. Use symbol_version or - default_symbol_version for the definition of a versioned symbol. - The difference is that the latter is a no-op in non-shared - builds. */ -#ifdef __ASSEMBLER__ -# define symbol_version_reference(real, name, version) \ - .symver real, name##@##version -#else /* !__ASSEMBLER__ */ -# define symbol_version_reference(real, name, version) \ - __asm__ (".symver " #real "," #name "@" #version) -#endif - #ifdef SHARED # define symbol_version(real, name, version) \ symbol_version_reference(real, name, version)