1998-10-19 Roland McGrath <roland@baalperazim.frob.com>
* sysdeps/mach/hurd/i386/init-first.c (init1): Don't call __libc_init_secure. Instead set __libc_enable_secure here from the exec flags. (__libc_enable_secure): New variable it. * sysdeps/mach/hurd/enbl-secure.c: New file, empty placeholder module.
This commit is contained in:
parent
74f7e7c0bd
commit
98375f9cb0
|
@ -0,0 +1,24 @@
|
||||||
|
/* Define and initialize the `__libc_enable_secure' flag. Hurd version.
|
||||||
|
Copyright (C) 1998 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., 59 Temple Place - Suite 330,
|
||||||
|
Boston, MA 02111-1307, USA. */
|
||||||
|
|
||||||
|
/* There is no need for this file in the Hurd; it is just a placeholder
|
||||||
|
to prevent inclusion of the sysdeps/generic version.
|
||||||
|
In the shared library, the `__libc_enable_secure' variable is defined
|
||||||
|
by the dynamic linker in dl-sysdep.c and set there.
|
||||||
|
In the static library, it is defined in init-first.c and set there. */
|
|
@ -27,7 +27,6 @@
|
||||||
#include "hurdmalloc.h" /* XXX */
|
#include "hurdmalloc.h" /* XXX */
|
||||||
|
|
||||||
extern void __mach_init (void);
|
extern void __mach_init (void);
|
||||||
extern void __libc_init_secure (void);
|
|
||||||
extern void __libc_init (int, char **, char **);
|
extern void __libc_init (int, char **, char **);
|
||||||
extern void __getopt_clean_environment (char **);
|
extern void __getopt_clean_environment (char **);
|
||||||
extern void __libc_global_ctors (void);
|
extern void __libc_global_ctors (void);
|
||||||
|
@ -36,6 +35,7 @@ unsigned int __hurd_threadvar_max;
|
||||||
unsigned long int __hurd_threadvar_stack_offset;
|
unsigned long int __hurd_threadvar_stack_offset;
|
||||||
unsigned long int __hurd_threadvar_stack_mask;
|
unsigned long int __hurd_threadvar_stack_mask;
|
||||||
|
|
||||||
|
int __libc_enable_secure;
|
||||||
int __libc_multiple_libcs = 1;
|
int __libc_multiple_libcs = 1;
|
||||||
|
|
||||||
extern int __libc_argc;
|
extern int __libc_argc;
|
||||||
|
@ -107,7 +107,7 @@ init1 (int argc, char *arg0, ...)
|
||||||
d->intarray, d->intarraysize);
|
d->intarray, d->intarraysize);
|
||||||
|
|
||||||
#ifndef PIC
|
#ifndef PIC
|
||||||
__libc_init_secure ();
|
__libc_enable_secure = _dl_hurd_data->flags & EXEC_SECURE;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
__libc_init (argc, argv, __environ);
|
__libc_init (argc, argv, __environ);
|
||||||
|
|
Loading…
Reference in New Issue