aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2022-03-03 12:22:34 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2022-03-15 15:33:55 -0300
commitec919843933e4c591f5a98c80a09e43e4263c14f (patch)
tree6c180b8cf3d56121c33f2e8aea6cbb6f1d19f359
parentd5b9d42060d23fcdbc29bac36ee211bba8719893 (diff)
Remove __LDBL_REDIR macrosazanella/redir-refactor
Since they are not used anymore.
-rw-r--r--include/sys/cdefs.h20
-rw-r--r--misc/sys/cdefs.h45
2 files changed, 1 insertions, 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 1beda4fc67..090aad6fed 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.