From 557fab43bd3cf75f87ba7efb65c9f4884e261a6c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 23 Feb 2002 08:47:54 +0000 Subject: Update. 2002-02-23 Ulrich Drepper * csu/set-init.c: Moved to... * sysdeps/mach/hurd/set-init.c: ...here. New file. * csu/Makefile: Don't compile set-init. * sysdeps/mach/hurd/Makefile: Compile set-init for subdir csu. * sysdeps/mach/hurd/i386/init-first.c: Call __init_misc in addition to __libc_init. * sysdeps/mach/hurd/mips/init-first.c: Likewise. * sysdeps/mach/hurd/powerpc/init-first.c: Likewise. * sysdeps/unix/sysv/linux/init-first.c: Call __init_misc instead of __libc_init. * misc/init-misc.c: Always export __init_misc. Don't define hooks for __libc_subinit. --- sysdeps/mach/hurd/Makefile | 1 + sysdeps/mach/hurd/i386/init-first.c | 2 ++ sysdeps/mach/hurd/mips/init-first.c | 4 +++- sysdeps/mach/hurd/powerpc/init-first.c | 4 +++- sysdeps/mach/hurd/set-init.c | 23 +++++++++++++++++++++++ sysdeps/unix/sysv/linux/init-first.c | 4 ++-- 6 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 sysdeps/mach/hurd/set-init.c (limited to 'sysdeps') diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile index f34a577c49..e12874f055 100644 --- a/sysdeps/mach/hurd/Makefile +++ b/sysdeps/mach/hurd/Makefile @@ -186,6 +186,7 @@ endif ifeq ($(subdir),csu) +sysdep_routines += set-init extra-objs += static-start.o # We need special startup code for statically linked binaries. diff --git a/sysdeps/mach/hurd/i386/init-first.c b/sysdeps/mach/hurd/i386/init-first.c index e16a5cdfd9..f8149da4a2 100644 --- a/sysdeps/mach/hurd/i386/init-first.c +++ b/sysdeps/mach/hurd/i386/init-first.c @@ -29,6 +29,7 @@ extern void __mach_init (void); extern void __libc_init (int, char **, char **); +extern void __init_misc (int, char **, char **); #ifdef USE_NONOPTION_FLAGS extern void __getopt_clean_environment (char **); #endif @@ -64,6 +65,7 @@ posixland_init (int argc, char **argv, char **envp) __libc_argv = argv; __environ = envp; + __init_misc (argc, argv, envp); __libc_init (argc, argv, envp); #ifdef USE_NONOPTION_FLAGS diff --git a/sysdeps/mach/hurd/mips/init-first.c b/sysdeps/mach/hurd/mips/init-first.c index d0ab593404..525f510cc1 100644 --- a/sysdeps/mach/hurd/mips/init-first.c +++ b/sysdeps/mach/hurd/mips/init-first.c @@ -1,5 +1,5 @@ /* Initialization code run first thing by the ELF startup code. For Mips/Hurd. - Copyright (C) 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1996,1997,1998,2000,2001,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 @@ -27,6 +27,7 @@ extern void __mach_init (void); extern void __libc_init (int, char **, char **); +extern void __init_misc (int, char **, char **); #ifdef USE_NONOPTION_FLAGS extern void __getopt_clean_environment (char **); #endif @@ -106,6 +107,7 @@ init1 (int argc, char *arg0, ...) d->portarray, d->portarraysize, d->intarray, d->intarraysize); + __init_misc (argc, argv, __environ); __libc_init (argc, argv, __environ); #ifdef USE_NONOPTION_FLAGS diff --git a/sysdeps/mach/hurd/powerpc/init-first.c b/sysdeps/mach/hurd/powerpc/init-first.c index 25f5c53716..c9ad66096b 100644 --- a/sysdeps/mach/hurd/powerpc/init-first.c +++ b/sysdeps/mach/hurd/powerpc/init-first.c @@ -1,5 +1,5 @@ /* Initialization code run first thing by the ELF startup code. PowerPC/Hurd. - Copyright (C) 1995,96,97,98,99,2000,01 Free Software Foundation, Inc. + Copyright (C) 1995-2001, 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 @@ -29,6 +29,7 @@ extern void __mach_init (void); extern void __libc_init (int, char **, char **); +extern void __init_misc (int, char **, char **); #ifdef USE_NONOPTION_FLAGS extern void __getopt_clean_environment (char **); #endif @@ -69,6 +70,7 @@ posixland_init (int argc, char **argv, char **envp) __libc_argv = argv; __environ = envp; + __init_misc (argc, argv, envp); __libc_init (argc, argv, envp); #ifdef USE_NONOPTION_FLAGS diff --git a/sysdeps/mach/hurd/set-init.c b/sysdeps/mach/hurd/set-init.c new file mode 100644 index 0000000000..f89a4697ac --- /dev/null +++ b/sysdeps/mach/hurd/set-init.c @@ -0,0 +1,23 @@ +/* Copyright (C) 1991, 1992, 1994, 1995, 1997 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 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#include + +DEFINE_HOOK_RUNNER (__libc_subinit, __libc_init, + (int argc, char **argv, char **envp), (argc, argv, envp)) diff --git a/sysdeps/unix/sysv/linux/init-first.c b/sysdeps/unix/sysv/linux/init-first.c index bffb0fa642..1fb04bbda1 100644 --- a/sysdeps/unix/sysv/linux/init-first.c +++ b/sysdeps/unix/sysv/linux/init-first.c @@ -33,7 +33,7 @@ # include "dl-osinfo.h" #endif -extern void __libc_init (int, char **, char **); +extern void __init_misc (int, char **, char **); /* The function is called from assembly stubs the compiler can't see. */ static void init (int, char **, char **) __attribute__ ((unused)); @@ -89,7 +89,7 @@ init (int argc, char **argv, char **envp) __libc_init_secure (); #endif - __libc_init (argc, argv, envp); + __init_misc (argc, argv, envp); #ifdef USE_NONOPTION_FLAGS /* This is a hack to make the special getopt in GNU libc working. */ -- cgit v1.2.3