diff options
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/gen/isnan.c | 7 | ||||
| -rw-r--r-- | lib/libc/stdio/printf.3 | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lib/libc/gen/isnan.c b/lib/libc/gen/isnan.c index ec81362..72c2868 100644 --- a/lib/libc/gen/isnan.c +++ b/lib/libc/gen/isnan.c @@ -33,8 +33,14 @@ /* * XXX These routines belong in libm, but they must remain in libc for * binary compat until we can bump libm's major version number. + * + * Note this only applies to the dynamic versions of libm and libc, so + * for the static and profiled versions we stub out the definitions. + * Otherwise you cannot link statically to libm and libc at the same + * time, when calling both functions. */ +#ifdef PIC __weak_reference(__isnan, isnan); __weak_reference(__isnanf, isnanf); @@ -55,3 +61,4 @@ __isnanf(float f) u.f = f; return (u.bits.exp == 255 && u.bits.man != 0); } +#endif /* PIC */ diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3 index 0d9339e..05c30dc 100644 --- a/lib/libc/stdio/printf.3 +++ b/lib/libc/stdio/printf.3 @@ -267,7 +267,7 @@ number produced by a signed conversion. A .Cm + overrides a space if both are used. -.It Sq Cm ' +.It So "'" Sc (apostrophe) Decimal conversions .Cm ( d , u , or |
