From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id A5BF9396D829; Fri, 13 May 2022 14:17:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A5BF9396D829 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/clang] Remove __LDBL_REDIR macros X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: 75150f632fb3d1f43dc61676334ca4515b89dd2c X-Git-Newrev: 8ef08d348b6f2db853c679f7b2151b51aaa5ef6a Message-Id: <20220513141714.A5BF9396D829@sourceware.org> Date: Fri, 13 May 2022 14:17:14 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 May 2022 14:17:14 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=8ef08d348b6f2db853c679f7b2151b51aaa5ef6a commit 8ef08d348b6f2db853c679f7b2151b51aaa5ef6a Author: Adhemerval Zanella Date: Thu Mar 3 12:22:34 2022 -0300 Remove __LDBL_REDIR macros Since they are not used anymore. Diff: --- include/sys/cdefs.h | 20 -------------------- misc/sys/cdefs.h | 45 +-------------------------------------------- 2 files changed, 1 insertion(+), 64 deletions(-) diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h index 56adb231aa..7f7aa967fa 100644 --- a/include/sys/cdefs.h +++ b/include/sys/cdefs.h @@ -20,26 +20,6 @@ extern void __chk_fail (void) __attribute__ ((__noreturn__)); libc_hidden_proto (__chk_fail) rtld_hidden_proto (__chk_fail) -/* If we are using redirects internally to support long double, - we need to tweak some macros to ensure the PLT bypass tricks - continue to work in libc. */ -#if __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI == 1 && IS_IN (libc) && defined SHARED - -# undef __LDBL_REDIR_DECL -# define __LDBL_REDIR_DECL(func) \ - extern __typeof(func) func __asm (__ASMNAME ("__GI____ieee128_" #func)); - -# undef libc_hidden_ldbl_proto -# define libc_hidden_ldbl_proto(func, attrs...) \ - extern __typeof(func) ___ieee128_ ## func; \ - libc_hidden_proto (___ieee128_ ## func, ##attrs); - -# undef __LDBL_REDIR2_DECL -# define __LDBL_REDIR2_DECL(func) \ - extern __typeof(__ ## func) __ ## func __asm (__ASMNAME ("__GI____ieee128___" #func)); - -#endif - #endif /* !defined _ISOMAC */ #endif diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h index 34652ca342..2138312344 100644 --- a/misc/sys/cdefs.h +++ b/misc/sys/cdefs.h @@ -592,6 +592,7 @@ _Static_assert (0, "IEEE 128-bits long double requires redirection on this platform"); # endif /* __REDIRECT */ # elif defined __LONG_DOUBLE_MATH_OPTIONAL && defined __NO_LONG_DOUBLE_MATH +# define __LDBL_COMPAT 1 # ifdef __REDIRECT # define __REDIRECT_LDBL(name, proto, ieee128, compat) \ __REDIRECT_LDBL1 (name, , , proto, compat) @@ -626,50 +627,6 @@ _Static_assert (0, "Compat long double requires redirection on this platform"); # define __REDIRECT_LDBL_COMPAT(name, proto) #endif -#if __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI == 1 -# ifdef __REDIRECT - -/* Alias name defined automatically. */ -# define __LDBL_REDIR(name, proto) ... unused__ldbl_redir -# define __LDBL_REDIR_DECL(name) \ - extern __typeof (name) name __asm (__ASMNAME ("__" #name "ieee128")); - -/* Alias name defined automatically, with leading underscores. */ -# define __LDBL_REDIR2_DECL(name) \ - extern __typeof (__##name) __##name \ - __asm (__ASMNAME ("__" #name "ieee128")); - -/* Alias name defined manually. */ -# define __LDBL_REDIR1(name, proto, alias) ... unused__ldbl_redir1 -# define __LDBL_REDIR1_DECL(name, alias) \ - extern __typeof (name) name __asm (__ASMNAME (#alias)); - -# define __LDBL_REDIR1_NTH(name, proto, alias) \ - __REDIRECT_NTH (name, proto, alias) -# define __REDIRECT_NTH_LDBL(name, proto, alias) \ - __LDBL_REDIR1_NTH (name, proto, __##alias##ieee128) - -# else -_Static_assert (0, "IEEE 128-bits long double requires redirection on this platform"); -# endif -#elif defined __LONG_DOUBLE_MATH_OPTIONAL && defined __NO_LONG_DOUBLE_MATH -# define __LDBL_COMPAT 1 -# ifdef __REDIRECT -# define __LDBL_REDIR1(name, proto, alias) __REDIRECT (name, proto, alias) -# define __LDBL_REDIR(name, proto) \ - __LDBL_REDIR1 (name, proto, __nldbl_##name) -# define __LDBL_REDIR1_NTH(name, proto, alias) __REDIRECT_NTH (name, proto, alias) -# define __LDBL_REDIR_NTH(name, proto) \ - __LDBL_REDIR1_NTH (name, proto, __nldbl_##name) -# define __LDBL_REDIR2_DECL(name) \ - extern __typeof (__##name) __##name __asm (__ASMNAME ("__nldbl___" #name)); -# define __LDBL_REDIR1_DECL(name, alias) \ - extern __typeof (name) name __asm (__ASMNAME (#alias)); -# define __LDBL_REDIR_DECL(name) \ - extern __typeof (name) name __asm (__ASMNAME ("__nldbl_" #name)); -# endif -#endif - /* __glibc_macro_warning (MESSAGE) issues warning MESSAGE. This is intended for use in preprocessor macros.