mirror of git://sourceware.org/git/glibc.git
* elf/Makefile (tests) [$(build-shared) = yes]:
Depend on $(test-modules). * dlfcn/Makefile: Likewise.
This commit is contained in:
parent
bba446f7e9
commit
5181d776e8
|
|
@ -1,3 +1,9 @@
|
||||||
|
2003-07-29 Roland McGrath <roland@redhat.com>
|
||||||
|
|
||||||
|
* elf/Makefile (tests) [$(build-shared) = yes]:
|
||||||
|
Depend on $(test-modules).
|
||||||
|
* dlfcn/Makefile: Likewise.
|
||||||
|
|
||||||
2003-07-28 Roland McGrath <roland@redhat.com>
|
2003-07-28 Roland McGrath <roland@redhat.com>
|
||||||
|
|
||||||
* sysdeps/generic/bits/types.h (__STD_TYPE): New macro.
|
* sysdeps/generic/bits/types.h (__STD_TYPE): New macro.
|
||||||
|
|
|
||||||
|
|
@ -69,6 +69,11 @@ test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names)))
|
||||||
$(test-modules): $(objpfx)%.so: $(objpfx)%.os $(common-objpfx)shlib.lds
|
$(test-modules): $(objpfx)%.so: $(objpfx)%.os $(common-objpfx)shlib.lds
|
||||||
$(build-module)
|
$(build-module)
|
||||||
|
|
||||||
|
ifeq ($(build-shared),yes)
|
||||||
|
# Build all the modules even when not actually running test programs.
|
||||||
|
tests: $(test-modules)
|
||||||
|
endif
|
||||||
|
|
||||||
$(objpfx)glrefmain: $(libdl)
|
$(objpfx)glrefmain: $(libdl)
|
||||||
$(objpfx)glrefmain.out: $(objpfx)glrefmain \
|
$(objpfx)glrefmain.out: $(objpfx)glrefmain \
|
||||||
$(objpfx)glreflib1.so $(objpfx)glreflib2.so
|
$(objpfx)glreflib1.so $(objpfx)glreflib2.so
|
||||||
|
|
|
||||||
20
elf/Makefile
20
elf/Makefile
|
|
@ -29,7 +29,8 @@ routines = $(dl-routines) dl-open dl-close dl-support dl-iteratephdr \
|
||||||
# profiled libraries.
|
# profiled libraries.
|
||||||
dl-routines = $(addprefix dl-,load cache lookup object reloc deps \
|
dl-routines = $(addprefix dl-,load cache lookup object reloc deps \
|
||||||
runtime error init fini debug misc \
|
runtime error init fini debug misc \
|
||||||
version profile conflict tls origin)
|
version profile conflict tls origin \
|
||||||
|
execstack)
|
||||||
all-dl-routines = $(dl-routines) $(sysdep-dl-routines)
|
all-dl-routines = $(dl-routines) $(sysdep-dl-routines)
|
||||||
# But they are absent from the shared libc, because that code is in ld.so.
|
# But they are absent from the shared libc, because that code is in ld.so.
|
||||||
elide-routines.os = $(all-dl-routines) dl-support enbl-secure \
|
elide-routines.os = $(all-dl-routines) dl-support enbl-secure \
|
||||||
|
|
@ -80,6 +81,7 @@ distribute := rtld-Rules \
|
||||||
reldep9.c reldep9mod1.c reldep9mod2.c reldep9mod3.c \
|
reldep9.c reldep9mod1.c reldep9mod2.c reldep9mod3.c \
|
||||||
tst-array1.exp tst-array2.exp tst-array4.exp \
|
tst-array1.exp tst-array2.exp tst-array4.exp \
|
||||||
tst-array2dep.c \
|
tst-array2dep.c \
|
||||||
|
tst-execstack-mod.c \
|
||||||
check-textrel.c dl-sysdep.h
|
check-textrel.c dl-sysdep.h
|
||||||
|
|
||||||
CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables
|
CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables
|
||||||
|
|
@ -148,7 +150,8 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
|
||||||
neededtest3 neededtest4 unload2 lateglobal initfirst global \
|
neededtest3 neededtest4 unload2 lateglobal initfirst global \
|
||||||
restest2 next dblload dblunload reldep5 reldep6 reldep7 reldep8 \
|
restest2 next dblload dblunload reldep5 reldep6 reldep7 reldep8 \
|
||||||
circleload1 tst-tls3 tst-tls4 tst-tls5 tst-tls6 tst-tls7 tst-tls8 \
|
circleload1 tst-tls3 tst-tls4 tst-tls5 tst-tls6 tst-tls7 tst-tls8 \
|
||||||
tst-tls10 tst-tls11 tst-tls12 tst-tls13 tst-tls14
|
tst-tls10 tst-tls11 tst-tls12 tst-tls13 tst-tls14 \
|
||||||
|
tst-execstack
|
||||||
# reldep9
|
# reldep9
|
||||||
test-srcs = tst-pathopt
|
test-srcs = tst-pathopt
|
||||||
tests-vis-yes = vismain
|
tests-vis-yes = vismain
|
||||||
|
|
@ -175,7 +178,8 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
|
||||||
circlemod1 circlemod1a circlemod2 circlemod2a \
|
circlemod1 circlemod1a circlemod2 circlemod2a \
|
||||||
circlemod3 circlemod3a \
|
circlemod3 circlemod3a \
|
||||||
reldep8mod1 reldep8mod2 reldep8mod3 \
|
reldep8mod1 reldep8mod2 reldep8mod3 \
|
||||||
reldep9mod1 reldep9mod2 reldep9mod3
|
reldep9mod1 reldep9mod2 reldep9mod3 \
|
||||||
|
tst-execstack-mod
|
||||||
ifeq (yes,$(have-initfini-array))
|
ifeq (yes,$(have-initfini-array))
|
||||||
modules-names += tst-array2dep
|
modules-names += tst-array2dep
|
||||||
endif
|
endif
|
||||||
|
|
@ -440,6 +444,11 @@ reldep9mod1.so-no-z-defs = yes
|
||||||
$(filter-out $(objpfx)filtmod1.so, $(test-modules)): $(objpfx)%.so: $(objpfx)%.os
|
$(filter-out $(objpfx)filtmod1.so, $(test-modules)): $(objpfx)%.so: $(objpfx)%.os
|
||||||
$(build-module)
|
$(build-module)
|
||||||
|
|
||||||
|
ifeq ($(build-shared),yes)
|
||||||
|
# Build all the modules even when not actually running test programs.
|
||||||
|
tests: $(test-modules)
|
||||||
|
endif
|
||||||
|
|
||||||
$(objpfx)loadtest: $(libdl)
|
$(objpfx)loadtest: $(libdl)
|
||||||
LDFLAGS-loadtest = -rdynamic
|
LDFLAGS-loadtest = -rdynamic
|
||||||
|
|
||||||
|
|
@ -643,6 +652,11 @@ $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a
|
||||||
$(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so
|
$(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
$(objpfx)tst-execstack: $(libdl)
|
||||||
|
$(objpfx)tst-execstack.out: $(objpfx)tst-execstack-mod.so
|
||||||
|
LDFLAGS-tst-execstack = -Wl,-z,noexecstack
|
||||||
|
LDFLAGS-tst-execstack-mod = -Wl,-z,execstack
|
||||||
|
|
||||||
$(objpfx)tst-array1.out: $(objpfx)tst-array1
|
$(objpfx)tst-array1.out: $(objpfx)tst-array1
|
||||||
$(elf-objpfx)$(rtld-installed-name) \
|
$(elf-objpfx)$(rtld-installed-name) \
|
||||||
--library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \
|
--library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,8 @@
|
||||||
#
|
#
|
||||||
subdir := linuxthreads
|
subdir := linuxthreads
|
||||||
|
|
||||||
|
all: # Make this the default target; it will be defined in Rules.
|
||||||
|
|
||||||
linuxthreads-version := $(shell sed -n 's/^.*$(subdir)-\([0-9.]*\).*$$/\1/p' \
|
linuxthreads-version := $(shell sed -n 's/^.*$(subdir)-\([0-9.]*\).*$$/\1/p' \
|
||||||
Banner)
|
Banner)
|
||||||
|
|
||||||
|
|
@ -130,7 +132,10 @@ test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names)))
|
||||||
$(test-modules): $(objpfx)%.so: $(objpfx)%.os $(common-objpfx)shlib.lds
|
$(test-modules): $(objpfx)%.so: $(objpfx)%.os $(common-objpfx)shlib.lds
|
||||||
$(build-module)
|
$(build-module)
|
||||||
|
|
||||||
all: # Make this the default target; it will be defined in Rules.
|
ifeq ($(build-shared),yes)
|
||||||
|
# Build all the modules even when not actually running test programs.
|
||||||
|
tests: $(test-modules)
|
||||||
|
endif
|
||||||
|
|
||||||
# What we install as libpthread.so for programs to link against is in fact a
|
# What we install as libpthread.so for programs to link against is in fact a
|
||||||
# link script. It contains references for the various libraries we need.
|
# link script. It contains references for the various libraries we need.
|
||||||
|
|
|
||||||
|
|
@ -266,6 +266,9 @@ $(test-modules): $(objpfx)%.so: $(objpfx)%.os $(common-objpfx)shlib.lds
|
||||||
$(build-module)
|
$(build-module)
|
||||||
|
|
||||||
ifeq ($(build-shared),yes)
|
ifeq ($(build-shared),yes)
|
||||||
|
# Build all the modules even when not actually running test programs.
|
||||||
|
tests: $(test-modules)
|
||||||
|
|
||||||
others: $(objpfx)libpthread_nonshared.a
|
others: $(objpfx)libpthread_nonshared.a
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue