summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-10-21 00:02:39 +0000
committerUlrich Drepper <drepper@redhat.com>2000-10-21 00:02:39 +0000
commitceb579a3f8b7698868817f4fb0a36742f0494b28 (patch)
tree4492e9f841a63790201e476b122d371993ba7032 /include
parent2a0dcb7c167fb9ba52a3d71634efb3059ab4df02 (diff)
Update.
2000-10-19 H.J. Lu <hjl@gnu.org> * elf/Makefile (distribute): Add neededtest.c, neededobj1.c, neededobj2.c and neededobj3.c. (tests): Add neededtest. (modules-names): Add neededobj1, neededobj2 and neededobj3. ($(objpfx)neededobj1.so): New target. ($(objpfx)neededobj2.so): Likewise. ($(objpfx)neededobj3.so): Likewise. ($(objpfx)neededtest): Likewise. ($(objpfx)neededtest.out): Likewise. * elf/neededtest.c: New. Based on the bug report from Allen Bauer <kylix_rd@hotmail.com>. * elf/neededobj1.c: Likewise. * elf/neededobj2.c: Likewise. * elf/neededobj3.c: Likewise. 2000-10-20 Ulrich Drepper <drepper@redhat.com> * elf/dl-close.c (_dl_close): Decrement reference counter for all dependencies even if the DSO does not get unloaded. * elf/dl-load.c (_dl_map_object_from_fd): Pass pointer to ELF header to elf_machine_matches_host. * sysdeps/alpha/dl-machine.h (elf_machine_matches_host): Parameter is now pointer to ELF header. * sysdeps/arm/dl-machine.h: Likewise. * sysdeps/generic/dl-machine.h: Likewise. * sysdeps/hppa/dl-machine.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. * sysdeps/ia64/dl-machine.h: Likewise. * sysdeps/m68k/dl-machine.h: Likewise. * sysdeps/mips/dl-machine.h: Likewise. * sysdeps/mips/mips64/dl-machine.h: Likewise. * sysdeps/powerpc/dl-machine.h: Likewise. * sysdeps/s390/dl-machine.h: Likewise. * sysdeps/sh/dl-machine.h: Likewise. * sysdeps/sparc/sparc32/dl-machine.h: Likewise. * sysdeps/sparc/sparc64/dl-machine.h: Likewise. Patch by Martin Schwidefsksy <schwidefsky@de.ibm.com>. 2000-10-20 Jakub Jelinek <jakub@redhat.com> * include/limits.h: Include bits/wordsize.h, use #if __WORDSIZE == 64 check instead of #ifdef __alpha__. * include/bits/xopen_lim.h (WORD_BIT, LONG_BIT): Don't count on INT_MAX, __INT_MAX__, LONG_MAX or __LONG_MAX__ being defined when this is included. * posix/wordexp-tst.sh (testout): Place output file in build directory. Patch by Joseph S. Myers <jsm28@cam.ac.uk>.
Diffstat (limited to 'include')
-rw-r--r--include/bits/xopen_lim.h51
-rw-r--r--include/limits.h6
2 files changed, 45 insertions, 12 deletions
diff --git a/include/bits/xopen_lim.h b/include/bits/xopen_lim.h
index 823c801e48..e874dba73c 100644
--- a/include/bits/xopen_lim.h
+++ b/include/bits/xopen_lim.h
@@ -92,23 +92,54 @@
/* Number of bits in a word of type `int'. */
-#if INT_MAX == 32767
-# define WORD_BIT 16
-#else
-# if INT_MAX == 2147483647
-# define WORD_BIT 32
+#ifdef INT_MAX
+# if INT_MAX == 32767
+# define WORD_BIT 16
+# else
+# if INT_MAX == 2147483647
+# define WORD_BIT 32
+# else
+/* Safe assumption. */
+# define WORD_BIT 64
+# endif
+# endif
+#elif defined __INT_MAX__
+# if __INT_MAX__ == 32767
+# define WORD_BIT 16
# else
+# if __INT_MAX__ == 2147483647
+# define WORD_BIT 32
+# else
/* Safe assumption. */
-# define WORD_BIT 64
+# define WORD_BIT 64
+# endif
# endif
+#else
+# define WORD_BIT 32
#endif
/* Number of bits in a word of type `long int'. */
-#if LONG_MAX == 2147483647
-# define LONG_BIT 32
-#else
+#ifdef LONG_MAX
+# if LONG_MAX == 2147483647
+# define LONG_BIT 32
+# else
/* Safe assumption. */
-# define LONG_BIT 64
+# define LONG_BIT 64
+# endif
+#elif defined __LONG_MAX__
+# if __LONG_MAX__ == 2147483647
+# define LONG_BIT 32
+# else
+/* Safe assumption. */
+# define LONG_BIT 64
+# endif
+#else
+# include <bits/wordsize.h>
+# if __WORDSIZE == 64
+# define LONG_BIT 64
+# else
+# define LONG_BIT 32
+# endif
#endif
#endif /* bits/xopen_lim.h */
diff --git a/include/limits.h b/include/limits.h
index d0c3d613f5..0e8eb9c6b3 100644
--- a/include/limits.h
+++ b/include/limits.h
@@ -42,6 +42,8 @@
# ifndef _LIMITS_H
# define _LIMITS_H 1
+#include <bits/wordsize.h>
+
/* We don't have #include_next.
Define ANSI <limits.h> for standard 32-bit words. */
@@ -82,7 +84,7 @@
# define UINT_MAX 4294967295U
/* Minimum and maximum values a `signed long int' can hold. */
-# ifdef __alpha__
+# if __WORDSIZE == 64
# define LONG_MAX 9223372036854775807L
# else
# define LONG_MAX 2147483647L
@@ -90,7 +92,7 @@
# define LONG_MIN (-LONG_MAX - 1L)
/* Maximum value an `unsigned long int' can hold. (Minimum is 0.) */
-# ifdef __alpha__
+# if __WORDSIZE == 64
# define ULONG_MAX 18446744073709551615UL
# else
# define ULONG_MAX 4294967295UL