From 99ac5e47c0d9c9747b01190c3df82b078b9a8a07 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 7 Jun 2000 16:53:48 +0000 Subject: [PATCH] Update. 2000-06-07 Andreas Jaeger * elf/Makefile: Build ldconfig only when building shared libraries. 2000-06-07 Jakub Jelinek * sysdeps/alpha/fpu/bits/mathinline.h (__fdimf): Only declare if __USE_ISOC99. (fdimf, __fdim, fdim): Likewise. --- ChangeLog | 10 ++++++++++ elf/Makefile | 2 ++ sysdeps/alpha/fpu/bits/mathinline.h | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3ddf26b..aa2df2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2000-06-07 Andreas Jaeger + + * elf/Makefile: Build ldconfig only when building shared libraries. + +2000-06-07 Jakub Jelinek + + * sysdeps/alpha/fpu/bits/mathinline.h (__fdimf): Only declare if + __USE_ISOC99. + (fdimf, __fdim, fdim): Likewise. + 2000-06-07 Ulrich Drepper * locale/findlocale.c: Add __builtin_expect in many places. diff --git a/elf/Makefile b/elf/Makefile index 2398920..72ce671 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 c0911ec..065009c 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 -- 2.7.4