projects
/
platform
/
upstream
/
glibc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(CFLAGS-tst-align.c): Add -mpreferred-stack-boundary=4.
[platform/upstream/glibc.git]
/
hurd
/
hurdstartup.c
diff --git
a/hurd/hurdstartup.c
b/hurd/hurdstartup.c
index
090423a
..
0c607ba
100644
(file)
--- a/
hurd/hurdstartup.c
+++ b/
hurd/hurdstartup.c
@@
-1,5
+1,5
@@
/* Initial program startup for running under the GNU Hurd.
/* 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,92,93,94,95,96,97,98
,2002
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
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@
-55,7
+55,7
@@
extern void __mach_init (void);
void
void
-_hurd_startup (void **argptr, void (*main) (int *data))
+_hurd_startup (void **argptr, void (*main) (int
ptr_t
*data))
{
error_t err;
mach_port_t in_bootstrap;
{
error_t err;
mach_port_t in_bootstrap;
@@
-64,7
+64,7
@@
_hurd_startup (void **argptr, void (*main) (int *data))
struct hurd_startup_data data;
char **argv, **envp;
int argc, envc;
struct hurd_startup_data data;
char **argv, **envp;
int argc, envc;
- int *argcptr;
+ int
ptr_t
*argcptr;
vm_address_t addr;
/* Attempt to map page zero redzoned before we receive any RPC
vm_address_t addr;
/* Attempt to map page zero redzoned before we receive any RPC
@@
-107,7
+107,7
@@
_hurd_startup (void **argptr, void (*main) (int *data))
Hopefully either they will be on the stack as expected, or the
stack will be zeros so we don't crash. */
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 = (int
ptr_t
*) argptr;
argc = argcptr[0];
argv = (char **) &argcptr[1];
envp = &argv[argc + 1];
argc = argcptr[0];
argv = (char **) &argcptr[1];
envp = &argv[argc + 1];
@@
-129,7
+129,7
@@
_hurd_startup (void **argptr, void (*main) (int *data))
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. */
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) +
+ argcptr = __alloca (sizeof (int
ptr_t
) +
(argc + 1 + envc + 1) * sizeof (char *) +
sizeof (struct hurd_startup_data));
*argcptr = argc;
(argc + 1 + envc + 1) * sizeof (char *) +
sizeof (struct hurd_startup_data));
*argcptr = argc;
@@
-163,7
+163,7
@@
_hurd_startup (void **argptr, void (*main) (int *data))
hurd_startup_data'. Move them. */
struct
{
hurd_startup_data'. Move them. */
struct
{
- int count;
+ int
ptr_t
count;
char *argv[argc + 1];
char *envp[envc + 1];
struct hurd_startup_data data;
char *argv[argc + 1];
char *envp[envc + 1];
struct hurd_startup_data data;