diff options
| author |   guenther <guenther@openbsd.org> | 2018-03-12 04:22:56 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2018-03-12 04:22:56 +0000 |
| commit | 7ebae4715e0269461baaef01dcb3526f2b1030de (patch) | |
| tree | 892ac1e417103956bc92598c0feea7388a6ca169 | |
| parent | check valid-before option in authorized_keys (diff) | |
| download | wireguard-openbsd-7ebae4715e0269461baaef01dcb3526f2b1030de.tar.xz wireguard-openbsd-7ebae4715e0269461baaef01dcb3526f2b1030de.zip | |
Fix build of sincosl on machines where long double == double
ok deraadt@
| -rw-r--r-- | lib/libm/hidden/math.h | 2 | ||||
| -rw-r--r-- | lib/libm/hidden/namespace.h | 7 | ||||
| -rw-r--r-- | lib/libm/src/s_sincos.c | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/lib/libm/hidden/math.h b/lib/libm/hidden/math.h index 3c0c997ac0c..e26eb80b49f 100644 --- a/lib/libm/hidden/math.h +++ b/lib/libm/hidden/math.h @@ -172,7 +172,7 @@ PROTO_NORMAL(scalbnl); PROTO_DEPRECATED(significand); PROTO_DEPRECATED(significandf); PROTO_NORMAL(sin); -PROTO_DEPRECATED(sincos); +PROTO_NORMAL(sincos); PROTO_DEPRECATED(sincosf); PROTO_DEPRECATED(sincosl); PROTO_NORMAL(sinf); diff --git a/lib/libm/hidden/namespace.h b/lib/libm/hidden/namespace.h index 88bb46dfacd..92d4efd9b6c 100644 --- a/lib/libm/hidden/namespace.h +++ b/lib/libm/hidden/namespace.h @@ -1,4 +1,4 @@ -/* $OpenBSD: namespace.h,v 1.1 2016/09/12 19:47:02 guenther Exp $ */ +/* $OpenBSD: namespace.h,v 1.2 2018/03/12 04:22:56 guenther Exp $ */ #ifndef _LIBM_NAMESPACE_H_ #define _LIBM_NAMESPACE_H_ @@ -101,7 +101,8 @@ #define DEF_NONSTD(x) WEAK_IN_STATIC_ALIAS(x, HIDDEN(x)) #define MAKE_UNUSED_CLONE(dst, src) __strong_alias(dst, src) -#define LDBL_UNUSED_CLONE(x) __strong_alias(x##l, HIDDEN(x)) +#define LDBL_UNUSED_CLONE(x) __strong_alias(x##l, HIDDEN(x)) +#define LDBL_NONSTD_UNUSED_CLONE(x) WEAK_IN_STATIC_ALIAS(x##l, HIDDEN(x)) #define LDBL_CLONE(x) LDBL_UNUSED_CLONE(x); \ __dso_hidden typeof(HIDDEN(x##l)) HIDDEN(x##l) \ __attribute__((alias (HIDDEN_STRING(x)))) @@ -111,11 +112,13 @@ # define LDBL_PROTO_STD_DEPRECATED(x) typeof(x) HIDDEN(x) # define LDBL_MAYBE_CLONE(x) LDBL_CLONE(x) # define LDBL_MAYBE_UNUSED_CLONE(x) LDBL_UNUSED_CLONE(x) +# define LDBL_MAYBE_NONSTD_UNUSED_CLONE(x) LDBL_NONSTD_UNUSED_CLONE(x) #else # define LDBL_PROTO_NORMAL(x) PROTO_NORMAL(x) # define LDBL_PROTO_STD_DEPRECATED(x) PROTO_STD_DEPRECATED(x) # define LDBL_MAYBE_CLONE(x) __asm("") # define LDBL_MAYBE_UNUSED_CLONE(x) __asm("") +# define LDBL_MAYBE_NONSTD_UNUSED_CLONE(x) __asm("") #endif #endif /* _LIBM_NAMESPACE_H_ */ diff --git a/lib/libm/src/s_sincos.c b/lib/libm/src/s_sincos.c index 754205c5626..2ab1a86c1cc 100644 --- a/lib/libm/src/s_sincos.c +++ b/lib/libm/src/s_sincos.c @@ -69,4 +69,5 @@ sincos(double x, double *sn, double *cs) *sn = -*sn; } } -LDBL_MAYBE_CLONE(sincos); +DEF_NONSTD(sincos); +LDBL_MAYBE_NONSTD_UNUSED_CLONE(sincos); |