From 0324daa0055227fdb157b8491d4e5bbe9d9d579a Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 21 Sep 1995 06:24:21 +0000 Subject: Thu Sep 21 00:03:53 1995 Roland McGrath * sysdeps/stub/sys/sem_buf.h (union semun): New type. * sysdeps/mach/hurd/i386/init-first.c (init1) [PIC]: Call __libc_global_ctors. * sysdeps/i386/init-first.c: Rewritten. * sysdeps/unix/sysv/linux/i386/init-first.S: File removed. * sysdeps/unix/sysv/linux/i386/init-first.c: New file. * sysdeps/unix/sysv/linux/i386/fpu_control.h: Fix name in decl of ___fpu_control. * Makerules (build-shlib): New canned sequence, broken out of lib%.so rule. Link in $^ instead of just $<. (lib%.so: lib%_pic.a): Use it. (libc.so): New target; use $(build-shlib) for cmds, but also depend on soinit.so first and sofini.so last. * elf/soinit.c: New file. * elf/sofini.c: New file. * elf/Makefile (distribute): Add soinit.c and sofini.c. (extra-objs): Add soinit.so and sofini.so. * sysvipc/sys/shm.h (shmat): Fix return type to char *. * sysdeps/stub/sys/ipc_buf.h (key_t): Type removed. * misc/syslog.c (vsyslog): Rewritten using open_memstream to dynamically allocate buffers. * Makerules (install-lib-nosubdir): Make this, rather than install-no-libc.a, depend on the installed shared libraries. --- elf/Makefile | 5 +++-- elf/sofini.c | 9 +++++++++ elf/soinit.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 elf/sofini.c create mode 100644 elf/soinit.c (limited to 'elf') diff --git a/elf/Makefile b/elf/Makefile index b0923b2b6d..0065d2ba47 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -31,12 +31,13 @@ LDFLAGS-dl.so := -e 0 # work around ld bug rtld-routines := rtld $(addprefix dl-,load lookup object reloc \ runtime sysdep error init fini) -distribute = $(rtld-routines:=.c) dynamic-link.h do-rel.h +distribute = $(rtld-routines:=.c) dynamic-link.h do-rel.h \ + soinit.c sofini.c include ../Makeconfig ifeq (yes,$(build-shared)) -extra-objs = $(rtld-routines:=.so) +extra-objs = $(rtld-routines:=.so) soinit.so sofini.so install-lib = ld.so endif diff --git a/elf/sofini.c b/elf/sofini.c new file mode 100644 index 0000000000..e44041b5ec --- /dev/null +++ b/elf/sofini.c @@ -0,0 +1,9 @@ +/* Finalizer module for ELF shared C library. This provides terminating + null pointer words in the `.ctors' and `.dtors' sections. */ + +static void (*const __CTOR_END__[1]) (void) + __attribute__ ((unused, section (".ctors"))) + = { 0 }; +static void (*const __DTOR_END__[1]) (void) + __attribute__ ((unused, section (".dtors"))) + = { 0 }; diff --git a/elf/soinit.c b/elf/soinit.c new file mode 100644 index 0000000000..0310b74b93 --- /dev/null +++ b/elf/soinit.c @@ -0,0 +1,38 @@ +/* Initializer module for building the ELF shared C library. This file and + sofini.c do the work normally done by crtbeginS.o and crtendS.o, to wrap + the `.ctors' and `.dtors' sections so the lists are terminated, and + calling those lists of functions. */ + +static void (*const __CTOR_LIST__[1]) (void) + __attribute__ ((section (".ctors"))) + = { (void (*) (void)) -1 }; +static void (*const __DTOR_LIST__[1]) (void) + __attribute__ ((section (".dtors"))) + = { (void (*) (void)) -1 }; + +static inline void +run_hooks (void (*const list[]) (void)) +{ + while (*++list) + (**list) (); +} + + +/* This function will be called from _init in init-first.c. */ +void +__libc_global_ctors (void) +{ + /* Call constructor functions. */ + run_hooks (__CTOR_LIST__); +} + + +/* This function becomes the DT_FINI termination function + for the C library. */ +void _fini (void) __attribute__ ((section (".fini"))); /* Just for kicks. */ +void +_fini (void) +{ + /* Call destructor functions. */ + run_hooks (__DTOR_LIST__); +} -- cgit 1.4.1