aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog20
-rw-r--r--elf/Makefile4
-rw-r--r--elf/ldconfig.c9
-rw-r--r--math/bits/cmathcalls.h6
-rw-r--r--sysdeps/generic/dl-cache.h2
-rw-r--r--wctype/wctype.h8
6 files changed, 37 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index af77b4c018..ed01f55832 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2000-07-12 Andreas Jaeger <aj@suse.de>
+
+ * elf/Makefile (SYSCONF-FLAGS): Added to pass sysconfdir to
+ compiler.
+ (CFLAGS-cache.c): Added, uses SYSCONF-FLAGS.
+ (CFLAGS-dl-cache.c): Likewise.
+ (CFLAGS-ldconfig.c): Added, passes directory locations.
+
+ * sysdeps/generic/dl-cache.h (LD_SO_CACHE): Use SYSCONFDIR to
+ locate cache.
+ * elf/ldconfig.c (LD_SO_CONF): Likewise.
+ (main): Use configured LIBDIR and SLIBDIR.
+
+2000-07-11 Jakub Jelinek <jakub@redhat.com>
+
+ * math/bits/cmathcalls.h (cimag): Add __THROW.
+ (creal, conj): Likewise.
+ * wctype/wctype.h (_ISwbit): Avoid warnings about shifting left
+ by negative value.
+
2000-07-12 H.J. Lu <hjl@gnu.org>
* resolv/Versions (libresolv): Add __res_hostalias to GLIBC_2.2
diff --git a/elf/Makefile b/elf/Makefile
index 6361f252b1..5fbddd587b 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -215,6 +215,10 @@ $(objpfx)ldd: ldd.bash.in $(common-objpfx)soversions.mk \
$(objpfx)sprof: $(libdl)
$(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o)
+SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"'
+CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' -D'SLIBDIR="$(slibdir)"'
+CFLAGS-dl-cache.c = $(SYSCONF-FLAGS)
+CFLAGS-cache.c = $(SYSCONF-FLAGS)
test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names))))
generated += $(addsuffix .so,$(strip $(modules-names)))
diff --git a/elf/ldconfig.c b/elf/ldconfig.c
index 4ee9763c79..99fe8a93d2 100644
--- a/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@ -41,7 +41,7 @@
#include "dl-procinfo.h"
#ifndef LD_SO_CONF
-# define LD_SO_CONF "/etc/ld.so.conf"
+# define LD_SO_CONF SYSCONFDIR "/ld.so.conf"
#endif
/* Get libc version number. */
@@ -152,7 +152,7 @@ static int
is_hwcap (const char *name)
{
int hwcap_idx = _dl_string_hwcap (name);
-
+
if (hwcap_idx != -1 && ((1 << hwcap_idx) & HWCAP_IMPORTANT))
return 1;
return 0;
@@ -802,8 +802,9 @@ main (int argc, char **argv)
if (!opt_only_cline)
{
/* Always add the standard search paths. */
- add_dir ("/lib");
- add_dir ("/usr/lib");
+ add_dir (SLIBDIR);
+ if (strcmp (SLIBDIR, LIBDIR))
+ add_dir (LIBDIR);
parse_conf (config_file);
}
diff --git a/math/bits/cmathcalls.h b/math/bits/cmathcalls.h
index f063042b09..57a2582d70 100644
--- a/math/bits/cmathcalls.h
+++ b/math/bits/cmathcalls.h
@@ -135,21 +135,21 @@ __MATHDECL (_Mdouble_,creal, (_Mdouble_complex_ __z));
/* Imaginary part of Z. */
extern __inline _Mdouble_
-__MATH_PRECNAME(cimag) (_Mdouble_complex_ __z)
+__MATH_PRECNAME(cimag) (_Mdouble_complex_ __z) __THROW
{
return __imag__ __z;
}
/* Real part of Z. */
extern __inline _Mdouble_
-__MATH_PRECNAME(creal) (_Mdouble_complex_ __z)
+__MATH_PRECNAME(creal) (_Mdouble_complex_ __z) __THROW
{
return __real__ __z;
}
/* Complex conjugate of Z. */
extern __inline _Mdouble_complex_
-__MATH_PRECNAME(conj) (_Mdouble_complex_ __z)
+__MATH_PRECNAME(conj) (_Mdouble_complex_ __z) __THROW
{
return ~__z;
}
diff --git a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h
index 197638b09d..fdf38785e1 100644
--- a/sysdeps/generic/dl-cache.h
+++ b/sysdeps/generic/dl-cache.h
@@ -27,7 +27,7 @@
#endif
#ifndef LD_SO_CACHE
-# define LD_SO_CACHE "/etc/ld.so.cache"
+# define LD_SO_CACHE SYSCONFDIR "/ld.so.cache"
#endif
#define CACHEMAGIC "ld.so-1.7.0"
diff --git a/wctype/wctype.h b/wctype/wctype.h
index 8bcbaf987b..2812bd8286 100644
--- a/wctype/wctype.h
+++ b/wctype/wctype.h
@@ -70,10 +70,10 @@ typedef unsigned long int wctype_t;
# define _ISwbit(bit) (1 << (bit))
# else /* __BYTE_ORDER == __LITTLE_ENDIAN */
# define _ISwbit(bit) \
- ((bit) < 8 ? (int) (1UL << ((bit) + 24)) \
- : ((bit) < 16 ? (int) (1UL << ((bit) + 8)) \
- : ((bit) < 24 ? (int) (1UL << ((bit) - 8 )) \
- : (int) (1UL << ((bit) - 24 )))))
+ ((bit) < 8 ? (int) ((1UL << (bit)) << 24) \
+ : ((bit) < 16 ? (int) ((1UL << (bit)) << 8) \
+ : ((bit) < 24 ? (int) ((1UL << (bit)) >> 8) \
+ : (int) ((1UL << (bit)) >> 24))))
# endif
enum