/* Initial program startup for running under the GNU Hurd.
- Copyright (C) 1991,92,93,94,95,96,97,98 Free Software Foundation, Inc.
+ Copyright (C) 1991-2019 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.
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 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.
+ Lesser 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., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
#include <errno.h>
#include <stdlib.h>
#include <hurd.h>
#include <hurd/exec_startup.h>
#include <sysdep.h>
-#include <hurd/threadvar.h>
#include <unistd.h>
#include <elf.h>
-#include "set-hooks.h"
+#include <set-hooks.h>
#include "hurdstartup.h"
#include <argz.h>
void
-_hurd_startup (void **argptr, void (*main) (int *data))
+_hurd_startup (void **argptr, void (*main) (intptr_t *data))
{
error_t err;
mach_port_t in_bootstrap;
struct hurd_startup_data data;
char **argv, **envp;
int argc, envc;
- int *argcptr;
+ intptr_t *argcptr;
vm_address_t addr;
/* Attempt to map page zero redzoned before we receive any RPC
Hopefully either they will be on the stack as expected, or the
stack will be zeros so we don't crash. */
- argcptr = (int *) argptr;
+ argcptr = (intptr_t *) argptr;
argc = argcptr[0];
argv = (char **) &argcptr[1];
envp = &argv[argc + 1];
pointers and fill them in. We allocate the space for the
environment pointers immediately after the argv pointers because
the ELF ABI will expect it. */
- argcptr = __alloca (sizeof (int) +
- (argc + 1 + envc + 1) * sizeof (char *) +
- sizeof (struct hurd_startup_data));
+ argcptr = __alloca (sizeof (intptr_t)
+ + (argc + 1 + envc + 1) * sizeof (char *)
+ + sizeof (struct hurd_startup_data));
*argcptr = argc;
argv = (void *) (argcptr + 1);
__argz_extract (args, argslen, argv);
hurd_startup_data'. Move them. */
struct
{
- int count;
+ intptr_t count;
char *argv[argc + 1];
char *envp[envc + 1];
struct hurd_startup_data data;