From ec967c06ac7474fa58266ea309d6488ee3c53851 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 16 Nov 1995 00:44:18 +0000 Subject: [PATCH] Wed Nov 15 19:22:07 1995 Roland McGrath * sysdeps/mach/hurd/dl-sysdep.c: Include _itoa.h from stdio-common instead of stdio. (_dl_sysdep_start): If passed user entry is zero and EXEC_STACK_ARGS flag set, reset user entry to &_start. * elf/rtld.c (dl_main): Only call _dl_setup_hash if there is a DT_HASH element. * libc-symbols.h [HAVE_ELF] (symbol_set_declare): Gratuitously repeat weak decl using weak_symbol macro, in case using broken GCC (<2.8). Wed Nov 15 18:49:55 1995 Ulrich Drepper * sysdeps/i386/isnanl.c: New file. * sysdeps/i386/isinfl.c: New file. --- ChangeLog | 19 +++++++++++++++ elf/rtld.c | 5 ++-- libc-symbols.h | 6 +++-- sysdeps/i386/isinfl.c | 46 +++++++++++++++++++++++++++++++++++ sysdeps/i386/isnanl.c | 43 ++++++++++++++++++++++++++++++++ sysdeps/mach/hurd/dl-sysdep.c | 16 +++++++----- 6 files changed, 125 insertions(+), 10 deletions(-) create mode 100644 sysdeps/i386/isinfl.c create mode 100644 sysdeps/i386/isnanl.c diff --git a/ChangeLog b/ChangeLog index b0d0c19f5a..1261c47a7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +Wed Nov 15 19:22:07 1995 Roland McGrath + + * sysdeps/mach/hurd/dl-sysdep.c: Include _itoa.h from stdio-common + instead of stdio. + (_dl_sysdep_start): If passed user entry is zero and + EXEC_STACK_ARGS flag set, reset user entry to &_start. + + * elf/rtld.c (dl_main): Only call _dl_setup_hash if there is a + DT_HASH element. + + * libc-symbols.h [HAVE_ELF] (symbol_set_declare): Gratuitously + repeat weak decl using weak_symbol macro, in case using broken GCC + (<2.8). + +Wed Nov 15 18:49:55 1995 Ulrich Drepper + + * sysdeps/i386/isnanl.c: New file. + * sysdeps/i386/isinfl.c: New file. + Tue Nov 14 18:44:21 1995 Roland McGrath * malloc/free.c (free): Moved null and aligned_blocks checks diff --git a/elf/rtld.c b/elf/rtld.c index 9a822a8c66..88f0d6d804 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -226,8 +226,9 @@ of this helper program; chances are you did not intend to run this program.\n", /* Extract the contents of the dynamic section for easy access. */ elf_get_dynamic_info (l->l_ld, l->l_info); - /* Set up our cache of pointers into the hash table. */ - _dl_setup_hash (l); + if (l->l_info[DT_HASH]) + /* Set up our cache of pointers into the hash table. */ + _dl_setup_hash (l); if (l->l_info[DT_DEBUG]) /* There is a DT_DEBUG entry in the dynamic section. Fill it in diff --git a/libc-symbols.h b/libc-symbols.h index b08f06151e..c895fe4d36 100644 --- a/libc-symbols.h +++ b/libc-symbols.h @@ -235,8 +235,10 @@ extern const char _libc_intl_domainname[]; /* Declare SET for use in this module, if defined in another module. */ #define symbol_set_declare(set) \ - extern void *const __start_##set __attribute__ ((__weak__)); \ - extern void *const __stop_##set __attribute__ ((__weak__)); + extern void *const __start_##set __attribute__ ((__weak__)); \ + extern void *const __stop_##set __attribute__ ((__weak__)); \ + /* Gratuitously repeat weak decl, in case using broken GCC (<2.8). */\ + weak_symbol (__start_##set) weak_symbol (__stop_##set) /* Return a pointer (void *const *) to the first element of SET. */ #define symbol_set_first_element(set) (&__start_##set) diff --git a/sysdeps/i386/isinfl.c b/sysdeps/i386/isinfl.c new file mode 100644 index 0000000000..056d756d58 --- /dev/null +++ b/sysdeps/i386/isinfl.c @@ -0,0 +1,46 @@ +/* Check `long double' for Infinity. i386 FPU version. +Copyright (C) 1991, 1992, 1995 Free Software Foundation, Inc. +This file is part of the GNU C Library. + +The GNU C Library is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public License as +published by the Free Software Foundation; either version 2 of the +License, or (at your option) any later version. + +The GNU C Library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 675 Mass Ave, +Cambridge, MA 02139, USA. */ + +#include +#include "ieee754.h" + +#undef __isinfl +#undef isinfl + + +/* Return 0 if VALUE is finite or NaN, +1 if it + is +Infinity, -1 if it is -Infinity. */ +int +__isinfl (long double value) +{ + union ieee854_long_double u; + + u.d = value; + + /* Intel's interpretation of the IEEE 854 standard defines Inf to + have the maximum possible exponent and the MSB of the mantissa + set. No further bit of the mantissa must be set. */ + if ((u.ieee.exponent & 0x7fff) == 0x7fff && + u.ieee.mantissa0 == 0x80000000 && u.ieee.mantissa1 == 0) + return u.ieee.negative ? -1 : 1; + + return 0; +} + +weak_alias (__isinfl, isinfl); diff --git a/sysdeps/i386/isnanl.c b/sysdeps/i386/isnanl.c new file mode 100644 index 0000000000..de10c07532 --- /dev/null +++ b/sysdeps/i386/isnanl.c @@ -0,0 +1,43 @@ +/* Check `long double' for Not A Number. i386 FPU version. +Copyright (C) 1991, 1992, 1995 Free Software Foundation, Inc. +This file is part of the GNU C Library. + +The GNU C Library is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public License as +published by the Free Software Foundation; either version 2 of the +License, or (at your option) any later version. + +The GNU C Library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 675 Mass Ave, +Cambridge, MA 02139, USA. */ + +#include +#include "ieee754.h" + +#undef __isnanl +#undef isnanl + + +/* Return nonzero if VALUE is not a number. */ +int +__isnanl (long double value) +{ + union ieee854_long_double u; + + u.d = value; + + /* Intel's interpretation of the IEEE 854 standard defines NaN to + have the maximum possible exponent and the MSB and at least one + more bit of the mantissa set. */ + return ((u.ieee.exponent & 0x7fff) == 0x7fff + && ((u.ieee.mantissa0 & 0x80000000) != 0) + && ((u.ieee.mantissa0 & 0x7fffffff) != 0 || u.ieee.mantissa1 != 0)); +} + +weak_alias (__isnanl, isnanl); diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c index 10380753cd..0144958766 100644 --- a/sysdeps/mach/hurd/dl-sysdep.c +++ b/sysdeps/mach/hurd/dl-sysdep.c @@ -29,7 +29,7 @@ Cambridge, MA 02139, USA. */ #include #include "hurdstartup.h" #include -#include "../stdio/_itoa.h" +#include "../stdio-common/_itoa.h" #include #include #include @@ -104,6 +104,10 @@ _dl_sysdep_start (void **start_argptr, _dl_secure = _dl_hurd_data->flags & EXEC_SECURE; + if (_dl_hurd_data->flags & EXEC_STACK_ARGS && + _dl_hurd_data->user_entry == 0) + _dl_hurd_data->user_entry = (vm_address_t) &_start; + unfmh(); /* XXX */ if (_dl_hurd_data->user_entry == (vm_address_t) &_start) @@ -132,14 +136,14 @@ unfmh(); /* XXX */ _dl_sysdep_fatal ("Bogus library spec: ", p, "\n", NULL); *memobjname++ = '\0'; memobj = (mach_port_t) atoi (memobjname); - + /* Add a user reference on the memory object port, so we will still have one after _dl_map_object_from_fd calls our `close'. */ err = __mach_port_mod_refs (__mach_task_self (), memobj, MACH_PORT_RIGHT_SEND, +1); assert_perror (err); - + lastslash = strrchr (p, '/'); l = _dl_map_object_from_fd (lastslash ? lastslash + 1 : p, memobj, strdup (p)); @@ -278,7 +282,7 @@ open (const char *file_name, int mode, ...) dealloc_dir = 0; nloops = 0; - + while (1) { if (dealloc_dir) @@ -468,7 +472,7 @@ open (const char *file_name, int mode, ...) bad_magic: return __hurd_fail (EGRATUITOUS); } - break; + break; default: return __hurd_fail (EGRATUITOUS); @@ -574,7 +578,7 @@ weak_symbol (free) /* Avoid signal frobnication in setjmp/longjmp. */ -int __sigjmp_save (sigjmp_buf env, int savemask) +int __sigjmp_save (sigjmp_buf env, int savemask) { env[0].__mask_was_saved = savemask; return 0; } weak_symbol (__sigjmp_save)