diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2010-04-14 11:08:37 -0700 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2010-04-14 11:08:44 -0700 |
| commit | e035abf89fbe11a88a26372f1695c768aff7d9e1 (patch) | |
| tree | 5ea3b4a66e223ede91ad4073bab7081afbfd560e | |
| parent | 9ed510ad034f9327e7e032d2c6550bfb1f750eb9 (diff) | |
| parent | 718dcdc32bc831b2c141b020124501515afb9adc (diff) | |
Merge commit 'origin/master' into nptl
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
125 files changed, 1413 insertions, 10 deletions
@@ -309,20 +309,19 @@ endef CFLAGS-.os+=$(PICFLAG) CFLAGS-.oS+=$(PICFLAG) -DSHARED -$(top_srcdir)%.i: | pregen $(top_builddir)%.o: $(top_srcdir)%.c FORCE ; $(compile.c) -$(top_builddir)%.os: $(top_srcdir)%.c FORCE ; $(compile.c) -$(top_builddir)%.oS: $(top_srcdir)%.c FORCE ; $(compile.c) +$(top_builddir)%.os: $(top_srcdir)%.c FORCE | pregen; $(compile.c) +$(top_builddir)%.oS: $(top_srcdir)%.c FORCE | pregen; $(compile.c) $(top_builddir)%.o: $(top_srcdir)%.S FORCE ; $(compile.S) -$(top_builddir)%.os: $(top_srcdir)%.S FORCE ; $(compile.S) -$(top_builddir)%.oS: $(top_srcdir)%.S FORCE ; $(compile.S) +$(top_builddir)%.os: $(top_srcdir)%.S FORCE | pregen; $(compile.S) +$(top_builddir)%.oS: $(top_srcdir)%.S FORCE | pregen; $(compile.S) $(top_builddir)%.o: $(top_srcdir)%.s FORCE ; $(compile.S) $(top_builddir)%.os: $(top_srcdir)%.s FORCE ; $(compile.S) -$(top_builddir)%.oS: $(top_srcdir)%.s FORCE ; $(compile.S) -$(top_builddir)%.i: $(top_srcdir)%.c FORCE ; $(compile.i) -$(top_builddir)%.i: $(top_srcdir)%.S FORCE ; $(compile.i) -$(top_builddir)%.s: $(top_srcdir)%.c FORCE ; $(compile.s) -$(top_builddir)%.s: $(top_srcdir)%.S FORCE ; $(compile.s) +$(top_builddir)%.oS: $(top_srcdir)%.s FORCE | pregen; $(compile.S) +$(top_builddir)%.i: $(top_srcdir)%.c FORCE | pregen; $(compile.i) +$(top_builddir)%.i: $(top_srcdir)%.S FORCE | pregen; $(compile.i) +$(top_builddir)%.s: $(top_srcdir)%.c FORCE | pregen; $(compile.s) +$(top_builddir)%.s: $(top_srcdir)%.S FORCE | pregen; $(compile.s) $(top_builddir)%.dep: $(top_builddir)lib/interp.c: | $(sub_headers) diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index 90094ca6f..21c14acf4 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -300,6 +300,18 @@ config LDSO_CACHE_SUPPORT After updating this file, it is necessary to run 'ldconfig' to update the /etc/ld.so.cache shared library loader cache file. +config LDSO_PRELOAD_ENV_SUPPORT + bool "Enable library loader LD_PRELOAD environment" + depends on HAVE_SHARED + default y + help + Enable this to make use of LD_PRELOAD environment variable. + A whitespace-separated list of additional, user-specified, ELF shared + libraries to be loaded before all others. This can be used to + selectively override functions in other shared libraries. For + set-user-ID/set-group-ID ELF binaries, only libraries in the standard + search directories that are also set-user-ID will be loaded. + config LDSO_PRELOAD_FILE_SUPPORT |