diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | elf/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/alpha/fpu/bits/mathinline.h | 4 |
3 files changed, 16 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 3ddf26b542..aa2df2b491 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2000-06-07 Andreas Jaeger <aj@suse.de> + + * elf/Makefile: Build ldconfig only when building shared libraries. + +2000-06-07 Jakub Jelinek <jakub@redhat.com> + + * sysdeps/alpha/fpu/bits/mathinline.h (__fdimf): Only declare if + __USE_ISOC99. + (fdimf, __fdim, fdim): Likewise. + 2000-06-07 Ulrich Drepper <drepper@redhat.com> * locale/findlocale.c: Add __builtin_expect in many places. diff --git a/elf/Makefile b/elf/Makefile index 23989200ce..72ce671ee2 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -67,6 +67,7 @@ others-static = sln install-rootsbin = sln ifeq (yes,$(use-ldconfig)) +ifeq (yes,$(build-shared)) others-static += ldconfig others += ldconfig install-rootsbin += ldconfig @@ -78,6 +79,7 @@ extra-objs += $(ldconfig-modules:=.o) vpath %.c ../locale/programs endif +endif ifeq (yes,$(build-shared)) tests = loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ diff --git a/sysdeps/alpha/fpu/bits/mathinline.h b/sysdeps/alpha/fpu/bits/mathinline.h index c0911ecb71..065009c626 100644 --- a/sysdeps/alpha/fpu/bits/mathinline.h +++ b/sysdeps/alpha/fpu/bits/mathinline.h @@ -152,6 +152,8 @@ __MATH_INLINE float floorf (float __x) __THROW { return __floorf(__x); } __MATH_INLINE double floor (double __x) __THROW { return __floor(__x); } +#ifdef __USE_ISOC99 + __MATH_INLINE float __fdimf (float __x, float __y) __THROW { return __x < __y ? 0.0f : __x - __y; @@ -171,3 +173,5 @@ __MATH_INLINE double fdim (double __x, double __y) __THROW { return __x < __y ? 0.0 : __x - __y; } + +#endif |