summaryrefslogtreecommitdiff
path: root/sysdeps/mach/hurd/dl-sysdep.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-11-16 00:44:18 +0000
committerRoland McGrath <roland@gnu.org>1995-11-16 00:44:18 +0000
commitec967c06ac7474fa58266ea309d6488ee3c53851 (patch)
treedcea408ef904d340938ac85866816b4c024319d8 /sysdeps/mach/hurd/dl-sysdep.c
parent2ede96c9362f1950ef309f4fb9662aea60fe9777 (diff)
Wed Nov 15 19:22:07 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* 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 <drepper@ipd.info.uni-karlsruhe.de> * sysdeps/i386/isnanl.c: New file. * sysdeps/i386/isinfl.c: New file.
Diffstat (limited to 'sysdeps/mach/hurd/dl-sysdep.c')
-rw-r--r--sysdeps/mach/hurd/dl-sysdep.c16
1 files changed, 10 insertions, 6 deletions
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 <mach/mig_support.h>
#include "hurdstartup.h"
#include <mach/host_info.h>
-#include "../stdio/_itoa.h"
+#include "../stdio-common/_itoa.h"
#include <hurd/auth.h>
#include <hurd/term.h>
#include <stdarg.h>
@@ -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)