NetBSD fix

gufe44 · web-flow · commit 2080b236904a · 2019-10-25T18:32:47.000+02:00
diff --git a/src/cdefs-compat.h b/src/cdefs-compat.h
@@ -14,21 +14,27 @@
 #ifdef __GNUC__
 #ifndef __strong_reference
 #ifdef __APPLE__
-#define __strong_reference(sym,aliassym) __weak_reference(sym,aliassym)
+#define __strong_reference(sym,aliassym) __weak_reference_compat(sym,aliassym)
 #else
 #define __strong_reference(sym,aliassym)	\
 	OLM_DLLEXPORT extern __typeof (sym) aliassym __attribute__ ((__alias__ (#sym)));
 #endif /* __APPLE__ */
 #endif /* __strong_reference */
 
 #ifdef __wasm__
-#  define __weak_reference(sym,alias) __strong_reference(sym,alias)
+#  define __weak_reference_compat(sym,alias) __strong_reference(sym,alias)
 #endif
 
-#ifndef __weak_reference
+#ifdef __weak_reference
+#ifdef __NetBSD__
+#define __weak_reference_compat(sym,alias) __weak_reference(sym)
+#else
+#define  __weak_reference_compat(sym,alias) __weak_reference(sym,alias)
+#endif
+#else
 #ifdef __ELF__
 #ifdef __STDC__
-#define	__weak_reference(sym,alias)	\
+#define	__weak_reference_compat(sym,alias)	\
 	__asm__(".weak " #alias);	\
 	__asm__(".equ "  #alias ", " #sym)
 #ifndef __warn_references
@@ -38,7 +44,7 @@
 	__asm__(".previous")
 #endif /* __warn_references */
 #else
-#define	__weak_reference(sym,alias)	\
+#define	__weak_reference_compat(sym,alias)	\
 	__asm__(".weak alias");		\
 	__asm__(".equ alias, sym")
 #ifndef __warn_references
@@ -50,17 +56,17 @@
 #endif	/* __STDC__ */
 #elif defined(__clang__) /* CLANG */
 #ifdef __STDC__
-#define __weak_reference(sym,alias)     \
+#define __weak_reference_compat(sym,alias)     \
     __asm__(".weak_reference " #alias); \
     __asm__(".set " #alias ", " #sym)
 #else
-#define __weak_reference(sym,alias)     \
+#define __weak_referenc_compate(sym,alias)     \
     __asm__(".weak_reference alias");\
     __asm__(".set alias, sym")
 #endif
 #else	/* !__ELF__ */
 #ifdef __STDC__
-#define __weak_reference(sym,alias)	\
+#define __weak_reference_compat(sym,alias)	\
 	__asm__(".stabs \"_" #alias "\",11,0,0,0");	\
 	__asm__(".stabs \"_" #sym "\",1,0,0,0")
 #ifndef __warn_references
@@ -69,7 +75,7 @@
 	__asm__(".stabs \"_" #sym "\",1,0,0,0")
 #endif /* __warn_references */
 #else
-#define __weak_reference(sym,alias)	\
+#define __weak_reference_compat(sym,alias)	\
 	__asm__(".stabs \"_/**/alias\",11,0,0,0");	\
 	__asm__(".stabs \"_/**/sym\",1,0,0,0")
 #ifndef __warn_references
diff --git a/src/e_acos.c b/src/e_acos.c
@@ -107,5 +107,5 @@ __ieee754_acos(double x)
 }
 
 #if LDBL_MANT_DIG == 53
-__weak_reference(acos, acosl);
+__weak_reference_compat(acos, acosl);
 #endif
diff --git a/src/e_asin.c b/src/e_asin.c
@@ -113,5 +113,5 @@ __ieee754_asin(double x)
 }
 
 #if LDBL_MANT_DIG == 53
-__weak_reference(asin, asinl);
+__weak_reference_compat(asin, asinl);
 #endif
diff --git a/src/e_atan2.c b/src/e_atan2.c
@@ -125,5 +125,5 @@ __ieee754_atan2(double y, double x)
 }
 
 #if LDBL_MANT_DIG == 53
-__weak_reference(atan2, atan2l);
+__weak_reference_compat(atan2, atan2l);
 #endif
diff --git a/src/e_hypot.c b/src/e_hypot.c
@@ -127,5 +127,5 @@ __ieee754_hypot(double x, double y)
 }
 
 #if LDBL_MANT_DIG == 53
-__weak_reference(hypot, hypotl);
+__weak_reference_compat(hypot, hypotl);
 #endif
diff --git a/src/e_remainder.c b/src/e_remainder.c
@@ -75,5 +75,5 @@ __ieee754_remainder(double x, double p)
 }
 
 #if LDBL_MANT_DIG == 53
-__weak_reference(remainder, remainderl);
+__weak_reference_compat(remainder, remainderl);
 #endif
diff --git a/src/e_sqrt.c b/src/e_sqrt.c
@@ -189,7 +189,7 @@ __ieee754_sqrt(double x)
 }
 
 #if (LDBL_MANT_DIG == 53)
-__weak_reference(sqrt, sqrtl);
+__weak_reference_compat(sqrt, sqrtl);
 #endif
 
 /*
diff --git a/src/s_atan.c b/src/s_atan.c
@@ -120,5 +120,5 @@ atan(double x)
 }
 
 #if LDBL_MANT_DIG == 53
-__weak_reference(atan, atanl);
+__weak_reference_compat(atan, atanl);
 #endif
diff --git a/src/s_cbrt.c b/src/s_cbrt.c
@@ -114,5 +114,5 @@ cbrt(double x)
 }
 
 #if (LDBL_MANT_DIG == 53)
-__weak_reference(cbrt, cbrtl);
+__weak_reference_compat(cbrt, cbrtl);
 #endif
diff --git a/src/s_ceil.c b/src/s_ceil.c
@@ -73,5 +73,5 @@ ceil(double x)
 }
 
 #if LDBL_MANT_DIG == 53
-__weak_reference(ceil, ceill);
+__weak_reference_compat(ceil, ceill);
 #endif
diff --git a/src/s_cos.c b/src/s_cos.c
@@ -85,5 +85,5 @@ cos(double x)
 }
 
 #if (LDBL_MANT_DIG == 53)
-__weak_reference(cos, cosl);
+__weak_reference_compat(cos, cosl);
 #endif
diff --git a/src/s_cproj.c b/src/s_cproj.c
@@ -43,5 +43,5 @@ cproj(double complex z)
 }
 
 #if LDBL_MANT_DIG == 53
-__weak_reference(cproj, cprojl);
+__weak_reference_compat(cproj, cprojl);
 #endif
diff --git a/src/s_csqrt.c b/src/s_csqrt.c
@@ -110,5 +110,5 @@ csqrt(double complex z)
 }
 
 #if LDBL_MANT_DIG == 53
-__weak_reference(csqrt, csqrtl);
+__weak_reference_compat(csqrt, csqrtl);
 #endif
diff --git a/src/s_exp2.c b/src/s_exp2.c
@@ -392,5 +392,5 @@ exp2(double x)
 }
 
 #if (LDBL_MANT_DIG == 53)
-__weak_reference(exp2, exp2l);
+__weak_reference_compat(exp2, exp2l);
 #endif
diff --git a/src/s_floor.c b/src/s_floor.c
@@ -74,5 +74,5 @@ floor(double x)
 }
 
 #if LDBL_MANT_DIG == 53
-__weak_reference(floor, floorl);
+__weak_reference_compat(floor, floorl);
 #endif
diff --git a/src/s_fma.c b/src/s_fma.c
@@ -280,5 +280,5 @@ fma(double x, double y, double z)
 }
 
 #if (LDBL_MANT_DIG == 53)
-__weak_reference(fma, fmal);
+__weak_reference_compat(fma, fmal);
 #endif
diff --git a/src/s_frexp.c b/src/s_frexp.c
@@ -52,5 +52,5 @@ frexp(double x, int *eptr)
 }
 
 #if (LDBL_MANT_DIG == 53)
-__weak_reference(frexp, frexpl);
+__weak_reference_compat(frexp, frexpl);
 #endif
diff --git a/src/s_isinf.c b/src/s_isinf.c
@@ -63,4 +63,4 @@ __isinfl(long double e)
 }
 #endif
 
-__weak_reference(__isinff, isinff);
+__weak_reference_compat(__isinff, isinff);
diff --git a/src/s_isnan.c b/src/s_isnan.c
@@ -64,4 +64,4 @@ __isnanl(long double e)
 }
 #endif
 
-__weak_reference(__isnanf, isnanf);
+__weak_reference_compat(__isnanf, isnanf);
diff --git a/src/s_logb.c b/src/s_logb.c
@@ -45,5 +45,5 @@ logb(double x)
 }
 
 #if (LDBL_MANT_DIG == 53)
-__weak_reference(logb, logbl);
+__weak_reference_compat(logb, logbl);
 #endif
diff --git a/src/s_nan.c b/src/s_nan.c
@@ -120,5 +120,5 @@ nanf(const char *s)
 }
 
 #if (LDBL_MANT_DIG == 53)
-__weak_reference(nan, nanl);
+__weak_reference_compat(nan, nanl);
 #endif
diff --git a/src/s_nextafter.c b/src/s_nextafter.c
@@ -77,7 +77,7 @@ nextafter(double x, double y)
 }
 
 #if (LDBL_MANT_DIG == 53)
-__weak_reference(nextafter, nexttoward);
-__weak_reference(nextafter, nexttowardl);
-__weak_reference(nextafter, nextafterl);
+__weak_reference_compat(nextafter, nexttoward);
+__weak_reference_compat(nextafter, nexttowardl);
+__weak_reference_compat(nextafter, nextafterl);
 #endif
diff --git a/src/s_remquo.c b/src/s_remquo.c
@@ -154,5 +154,5 @@ remquo(double x, double y, int *quo)
 }
 
 #if LDBL_MANT_DIG == 53
-__weak_reference(remquo, remquol);
+__weak_reference_compat(remquo, remquol);
 #endif
diff --git a/src/s_rint.c b/src/s_rint.c
@@ -88,5 +88,5 @@ rint(double x)
 }
 
 #if (LDBL_MANT_DIG == 53)
-__weak_reference(rint, rintl);
+__weak_reference_compat(rint, rintl);
 #endif
diff --git a/src/s_scalbn.c b/src/s_scalbn.c
@@ -59,8 +59,8 @@ scalbn (double x, int n)
 }
 
 #if (LDBL_MANT_DIG == 53)
-__weak_reference(scalbn, ldexpl);
-__weak_reference(scalbn, scalbnl);
+__weak_reference_compat(scalbn, ldexpl);
+__weak_reference_compat(scalbn, scalbnl);
 #endif
 
 __strong_reference(scalbn, ldexp);
diff --git a/src/s_sin.c b/src/s_sin.c
@@ -85,5 +85,5 @@ sin(double x)
 }
 
 #if (LDBL_MANT_DIG == 53)
-__weak_reference(sin, sinl);
+__weak_reference_compat(sin, sinl);
 #endif
diff --git a/src/s_sincos.c b/src/s_sincos.c
@@ -146,5 +146,5 @@ sincos(double x, double * s, double * c)
 }
 
 #if (LDBL_MANT_DIG == 53)
-__weak_reference(sincos, sincosl);
+__weak_reference_compat(sincos, sincosl);
 #endif
diff --git a/src/s_tan.c b/src/s_tan.c
@@ -79,5 +79,5 @@ tan(double x)
 }
 
 #if (LDBL_MANT_DIG == 53)
-__weak_reference(tan, tanl);
+__weak_reference_compat(tan, tanl);
 #endif
diff --git a/src/s_trunc.c b/src/s_trunc.c
@@ -63,5 +63,5 @@ trunc(double x)
 }
 
 #if LDBL_MANT_DIG == 53
-__weak_reference(trunc, truncl);
+__weak_reference_compat(trunc, truncl);
 #endif
diff --git a/src/w_cabs.c b/src/w_cabs.c
@@ -21,5 +21,5 @@ cabs(double complex z)
 }
 
 #if LDBL_MANT_DIG == 53
-__weak_reference(cabs, cabsl);
+__weak_reference_compat(cabs, cabsl);
 #endif

Original file line number	Diff line number	Diff line change
`@@ -107,5 +107,5 @@ __ieee754_acos(double x)`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`#if LDBL_MANT_DIG == 53`
`110`		`-__weak_reference(acos, acosl);`
	`110`	`+__weak_reference_compat(acos, acosl);`
`111`	`111`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -113,5 +113,5 @@ __ieee754_asin(double x)`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`#if LDBL_MANT_DIG == 53`
`116`		`-__weak_reference(asin, asinl);`
	`116`	`+__weak_reference_compat(asin, asinl);`
`117`	`117`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -125,5 +125,5 @@ __ieee754_atan2(double y, double x)`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`#if LDBL_MANT_DIG == 53`
`128`		`-__weak_reference(atan2, atan2l);`
	`128`	`+__weak_reference_compat(atan2, atan2l);`
`129`	`129`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -127,5 +127,5 @@ __ieee754_hypot(double x, double y)`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`#if LDBL_MANT_DIG == 53`
`130`		`-__weak_reference(hypot, hypotl);`
	`130`	`+__weak_reference_compat(hypot, hypotl);`
`131`	`131`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -75,5 +75,5 @@ __ieee754_remainder(double x, double p)`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`#if LDBL_MANT_DIG == 53`
`78`		`-__weak_reference(remainder, remainderl);`
	`78`	`+__weak_reference_compat(remainder, remainderl);`
`79`	`79`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ __ieee754_sqrt(double x)`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`#if (LDBL_MANT_DIG == 53)`
`192`		`-__weak_reference(sqrt, sqrtl);`
	`192`	`+__weak_reference_compat(sqrt, sqrtl);`
`193`	`193`	`#endif`
`194`	`194`
`195`	`195`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -120,5 +120,5 @@ atan(double x)`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`#if LDBL_MANT_DIG == 53`
`123`		`-__weak_reference(atan, atanl);`
	`123`	`+__weak_reference_compat(atan, atanl);`
`124`	`124`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -114,5 +114,5 @@ cbrt(double x)`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`#if (LDBL_MANT_DIG == 53)`
`117`		`-__weak_reference(cbrt, cbrtl);`
	`117`	`+__weak_reference_compat(cbrt, cbrtl);`
`118`	`118`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -73,5 +73,5 @@ ceil(double x)`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`#if LDBL_MANT_DIG == 53`
`76`		`-__weak_reference(ceil, ceill);`
	`76`	`+__weak_reference_compat(ceil, ceill);`
`77`	`77`	`#endif`