* elf/Makefile: Add rules to build and run initfirst test.
	* elf/initfirst.c: New file.
	* elf/firstobj.c: New file.
This commit is contained in:
Ulrich Drepper 2001-02-02 06:54:15 +00:00
parent 5d9167133c
commit b71e7ce864
9 changed files with 233 additions and 5 deletions

View File

@ -1,5 +1,9 @@
2001-02-01 Ulrich Drepper <drepper@redhat.com> 2001-02-01 Ulrich Drepper <drepper@redhat.com>
* elf/Makefile: Add rules to build and run initfirst test.
* elf/initfirst.c: New file.
* elf/firstobj.c: New file.
* Makerules (build-shlib): Add $(extra-B-$(@F:lib%.so=%).so). * Makerules (build-shlib): Add $(extra-B-$(@F:lib%.so=%).so).
* configure.in: Test for -z initfirst linker option. * configure.in: Test for -z initfirst linker option.
* config.make.in: Add have-z-initfirst. * config.make.in: Add have-z-initfirst.

View File

@ -1,4 +1,4 @@
# Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc. # Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
# This file is part of the GNU C Library. # This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or # The GNU C Library is free software; you can redistribute it and/or
@ -101,7 +101,7 @@ tests = loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
constload1 order $(tests-vis-$(have-protected)) noload filter unload \ constload1 order $(tests-vis-$(have-protected)) noload filter unload \
reldep reldep2 reldep3 next $(tests-nodelete-$(have-z-nodelete)) \ reldep reldep2 reldep3 next $(tests-nodelete-$(have-z-nodelete)) \
$(tests-nodlopen-$(have-z-nodlopen)) neededtest neededtest2 \ $(tests-nodlopen-$(have-z-nodlopen)) neededtest neededtest2 \
neededtest3 neededtest4 unload2 lateglobal neededtest3 neededtest4 unload2 lateglobal initfirst
test-srcs = tst-pathopt test-srcs = tst-pathopt
tests-vis-yes = vismain tests-vis-yes = vismain
tests-nodelete-yes = nodelete tests-nodelete-yes = nodelete
@ -114,7 +114,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
$(modules-nodlopen-$(have-z-nodlopen)) filtmod1 filtmod2 \ $(modules-nodlopen-$(have-z-nodlopen)) filtmod1 filtmod2 \
reldepmod1 reldepmod2 reldepmod3 reldepmod4 nextmod1 nextmod2 \ reldepmod1 reldepmod2 reldepmod3 reldepmod4 nextmod1 nextmod2 \
neededobj1 neededobj2 neededobj3 neededobj4 \ neededobj1 neededobj2 neededobj3 neededobj4 \
neededobj5 neededobj6 \ neededobj5 neededobj6 firstobj \
unload2mod unload2dep ltglobmod1 ltglobmod2 pathoptobj unload2mod unload2dep ltglobmod1 ltglobmod2 pathoptobj
modules-vis-yes = vismod1 vismod2 vismod3 modules-vis-yes = vismod1 vismod2 vismod3
modules-nodelete-yes = nodelmod1 nodelmod2 nodelmod3 nodelmod4 modules-nodelete-yes = nodelmod1 nodelmod2 nodelmod3 nodelmod4
@ -268,6 +268,7 @@ $(objpfx)neededobj4.so: $(objpfx)neededobj1.so $(objpfx)neededobj2.so \
$(objpfx)neededobj6.so: $(objpfx)neededobj5.so $(objpfx)neededobj6.so: $(objpfx)neededobj5.so
$(objpfx)unload2mod.so: $(objpfx)unload2dep.so $(objpfx)unload2mod.so: $(objpfx)unload2dep.so
$(objpfx)ltglobmod2.so: $(libdl) $(objpfx)ltglobmod2.so: $(libdl)
$(objpfx)firstobj.so: $(shared-thread-library)
# filtmod1.so has a special rule # filtmod1.so has a special rule
$(filter-out $(objpfx)filtmod1.so, $(test-modules)): $(objpfx)%.so: $(objpfx)%.os $(filter-out $(objpfx)filtmod1.so, $(test-modules)): $(objpfx)%.so: $(objpfx)%.os
@ -388,3 +389,6 @@ $(objpfx)tst-pathopt: $(libdl)
$(objpfx)tst-pathopt.out: tst-pathopt.sh $(objpfx)tst-pathopt \ $(objpfx)tst-pathopt.out: tst-pathopt.sh $(objpfx)tst-pathopt \
$(objpfx)pathoptobj.so $(objpfx)pathoptobj.so
$(SHELL) -e $< $(common-objpfx) $(SHELL) -e $< $(common-objpfx)
$(objpfx)initfirst: $(libdl)
$(objpfx)initfirst.out: $(objpfx)firstobj.so

8
elf/firstobj.c Normal file
View File

@ -0,0 +1,8 @@
#include <errno.h>
int
foo (void)
{
errno = 0;
return 0;
}

22
elf/initfirst.c Normal file
View File

@ -0,0 +1,22 @@
#include <dlfcn.h>
#include <stdio.h>
int
main (void)
{
void *h = dlopen ("firstobj.so", RTLD_LAZY);
void *f;
if (! h)
{
printf ("cannot find firstobj.so: %s\n", dlerror ());
return 1;
}
f = dlsym (h, "foo");
if (! f)
{
printf ("cannot find symbol foo: %s\n", dlerror ());
return 2;
}
((void (*) (void)) f) ();
return 0;
}

View File

@ -1,3 +1,12 @@
2001-02-01 Ulrich Drepper <drepper@redhat.com>
* Makefile: Add rules to build crti.o and make it being used in
building libpthread.so.
* sysdeps/i386/Makefile: New file.
* sysdeps/pthread/pt-initfini.c: New file.
* pthread.c: Cleanups.
2001-01-28 Andreas Jaeger <aj@suse.de> 2001-01-28 Andreas Jaeger <aj@suse.de>
* oldsemaphore.c (__old_sem_init): Adjust for last change. * oldsemaphore.c (__old_sem_init): Adjust for last change.

View File

@ -38,12 +38,20 @@ libpthread-routines := attr cancel condvar join manager mutex ptfork \
oldsemaphore events getcpuclockid pspinlock barrier oldsemaphore events getcpuclockid pspinlock barrier
nodelete-yes = -Wl,--enable-new-dtags,-z,nodelete nodelete-yes = -Wl,--enable-new-dtags,-z,nodelete
LDFLAGS-pthread.so = $(nodelete-$(have-z-nodelete)) initfirst-yes = -Wl,--enable-new-dtags,-z,initfirst
LDFLAGS-pthread.so = $(nodelete-$(have-z-nodelete)) \
$(initfirst-$(have-z-initfirst))
vpath %.c Examples vpath %.c Examples
include ../Makeconfig include ../Makeconfig
ifeq ($(build-shared),yes)
before-compile := $(objpfx)crti.o
CFLAGS-pt-initfini.s = -g0 -fPIC -fno-inline-functions
endif
librt-tests = ex10 ex11 librt-tests = ex10 ex11
tests = ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 $(librt-tests) ex12 ex13 joinrace \ tests = ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 $(librt-tests) ex12 ex13 joinrace \
tststack $(tests-nodelete-$(have-z-nodelete)) ecmutex ex14 ex15 ex16 tststack $(tests-nodelete-$(have-z-nodelete)) ecmutex ex14 ex15 ex16
@ -54,6 +62,8 @@ endif
include ../Rules include ../Rules
extra-B-pthread.so = -B$(common-objpfx)linuxthreads/
znodelete-yes = -DHAVE_Z_NODELETE znodelete-yes = -DHAVE_Z_NODELETE
CFLAGS-mutex.c += -D__NO_WEAK_PTHREAD_ALIASES CFLAGS-mutex.c += -D__NO_WEAK_PTHREAD_ALIASES
CFLAGS-specific.c += -D__NO_WEAK_PTHREAD_ALIASES CFLAGS-specific.c += -D__NO_WEAK_PTHREAD_ALIASES
@ -80,3 +90,27 @@ ifeq ($(build-bounded),yes)
$(tests:%=$(objpfx)%-bp): $(objpfx)libpthread_b.a $(tests:%=$(objpfx)%-bp): $(objpfx)libpthread_b.a
$(librt-tests:%=$(objpfx)%-bp): $(common-objpfx)rt/librt_b.a $(librt-tests:%=$(objpfx)%-bp): $(common-objpfx)rt/librt_b.a
endif endif
ifeq ($(build-shared),yes)
vpath pt-initfini.c $(full_config_sysdirs)
$(objpfx)pt-initfini.s: pt-initfini.c
$(compile.c) -S $(CFLAGS-pt-initfini.s) -finhibit-size-directive \
$(patsubst -f%,-fno-%,$(exceptions)) -o $@
# We only have one kind of startup code files. Static binaries and
# shared libraries are build using the PIC version.
$(objpfx)crti.S: $(objpfx)pt-initfini.s
sed -n -e '1,/@HEADER_ENDS/p' \
-e '/@_.*_PROLOG_BEGINS/,/@_.*_PROLOG_ENDS/p' \
-e '/@TRAILER_BEGINS/,$$p' $< > $@
$(objpfx)defs.h: $(objpfx)pt-initfini.s
sed -n -e '/@TESTS_BEGIN/,/@TESTS_END/p' $< | \
$(AWK) -f ../csu/defs.awk > $@
$(objpfx)crti.o: $(objpfx)crti.S $(objpfx)defs.h
$(compile.S) -g0 $(ASFLAGS-.os) -o $@
generated += crti.S defs.h pt-initfini.s
endif

View File

@ -352,7 +352,7 @@ is_smp_system (void)
sizeof (sysctl_args) / sizeof (sysctl_args[0]), sizeof (sysctl_args) / sizeof (sysctl_args[0]),
buf, &reslen, NULL, 0) < 0) buf, &reslen, NULL, 0) < 0)
{ {
/*This was not successful. Now try reading the /proc filesystem. */ /* This was not successful. Now try reading the /proc filesystem. */
int fd = __open ("/proc/sys/kernel/version", O_RDONLY); int fd = __open ("/proc/sys/kernel/version", O_RDONLY);
if (__builtin_expect (fd, 0) == -1 if (__builtin_expect (fd, 0) == -1
|| (reslen = __read (fd, buf, sizeof (buf))) <= 0) || (reslen = __read (fd, buf, sizeof (buf))) <= 0)
@ -375,7 +375,9 @@ is_smp_system (void)
static void pthread_initialize(void) __attribute__((constructor)); static void pthread_initialize(void) __attribute__((constructor));
#ifndef HAVE_Z_NODELETE
extern void *__dso_handle __attribute__ ((weak)); extern void *__dso_handle __attribute__ ((weak));
#endif
/* Do some minimal initialization which has to be done during the /* Do some minimal initialization which has to be done during the

View File

@ -0,0 +1,5 @@
ifeq ($(subdir),linuxthreads)
# On i686 we must avoid generating the trampoline functions generated
# to get the GOT pointer.
CFLAGS-pt-initfini.s += -march=i386 -mcpu=i386
endif

View File

@ -0,0 +1,140 @@
/* Special .init and .fini section support. Linuxthread version.
Copyright (C) 1995, 1996, 1997, 2000, 2001 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.
In addition to the permissions in the GNU Library General Public
License, the Free Software Foundation gives you unlimited
permission to link the compiled version of this file with other
programs, and to distribute those programs without any restriction
coming from the use of this file. (The Library General Public
License restrictions do apply in other respects; for example, they
cover modification of the file, and distribution when not linked
into another program.)
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, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
/* This file is compiled into assembly code which is then munged by a sed
script into two files: crti.s and crtn.s.
* crti.s puts a function prologue at the beginning of the
.init and .fini sections and defines global symbols for
those addresses, so they can be called as functions.
* crtn.s puts the corresponding function epilogues
in the .init and .fini sections. */
#include <stdlib.h>
/* We use embedded asm for .section unconditionally, as this makes it
easier to insert the necessary directives into crtn.S. */
#define SECTION(x) asm (".section " x )
/* Embed an #include to pull in the alignment and .end directives. */
asm ("\n#include \"defs.h\"");
/* The initial common code ends here. */
asm ("\n/*@HEADER_ENDS*/");
/* To determine whether we need .end and .align: */
asm ("\n/*@TESTS_BEGIN*/");
extern void dummy (void (*foo) (void));
void
dummy (void (*foo) (void))
{
if (foo)
(*foo) ();
}
asm ("\n/*@TESTS_END*/");
/* The beginning of _init: */
asm ("\n/*@_init_PROLOG_BEGINS*/");
static void
call_initialize_minimal (void)
{
__pthread_initialize_minimal ();
}
static void
call_gmon_start(void)
{
extern void __gmon_start__ (void) __attribute__ ((weak)); /*weak_extern (__gmon_start__);*/
void (*gmon_start) (void) = __gmon_start__;
if (gmon_start)
gmon_start ();
}
SECTION (".init");
extern void _init (void);
void
_init (void)
{
/* The very first thing we must do is to set up the registers. */
call_initialize_minimal ();
/* We cannot use the normal constructor mechanism in gcrt1.o because it
appears before crtbegin.o in the link, so the header elt of .ctors
would come after the elt for __gmon_start__. One approach is for
gcrt1.o to reference a symbol which would be defined by some library
module which has a constructor; but then user code's constructors
would come first, and not be profiled. */
call_gmon_start ();
asm ("ALIGN");
asm("END_INIT");
/* Now the epilog. */
asm ("\n/*@_init_PROLOG_ENDS*/");
asm ("\n/*@_init_EPILOG_BEGINS*/");
SECTION(".init");
}
asm ("END_INIT");
/* End of the _init epilog, beginning of the _fini prolog. */
asm ("\n/*@_init_EPILOG_ENDS*/");
asm ("\n/*@_fini_PROLOG_BEGINS*/");
SECTION (".fini");
extern void _fini (void);
void
_fini (void)
{
/* End of the _fini prolog. */
asm ("ALIGN");
asm ("END_FINI");
asm ("\n/*@_fini_PROLOG_ENDS*/");
{
/* Let GCC know that _fini is not a leaf function by having a dummy
function call here. We arrange for this call to be omitted from
either crt file. */
extern void i_am_not_a_leaf (void);
i_am_not_a_leaf ();
}
/* Beginning of the _fini epilog. */
asm ("\n/*@_fini_EPILOG_BEGINS*/");
SECTION (".fini");
}
asm ("END_FINI");
/* End of the _fini epilog. Any further generated assembly (e.g. .ident)
is shared between both crt files. */
asm ("\n/*@_fini_EPILOG_ENDS*/");
asm ("\n/*@TRAILER_BEGINS*/");
/* End of file. */