diff options
| author | Roland McGrath <roland@hack.frob.com> | 2013-06-13 10:26:44 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2013-06-13 10:26:44 -0700 |
| commit | f4a29fba078c48f9d4c78d06d2ed4bbdf95b3763 (patch) | |
| tree | 251e7987f875cdfb88161aa46186fb35995e8d86 | |
| parent | ad36ba2bd67398edefe31aa039090912f76bffce (diff) | |
Don't let ld.so that failed its sanity check land in place.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | elf/Makefile | 7 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2013-06-13 Roland McGrath <roland@hack.frob.com> + + * elf/Makefile ($(objpfx)ld.so): Link into a temporary file and move + it into place only when and if the sanity check passes. + 2013-06-13 Joseph Myers <joseph@codesourcery.com> * stdlib/gen-tst-strtod-round.c (round_str): Always generate diff --git a/elf/Makefile b/elf/Makefile index 6f40414cbe..3b58649de5 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -318,13 +318,16 @@ generated += librtld.map librtld.mk rtld-libc.a librtld.os.map z-now-yes = -Wl,-z,now $(objpfx)ld.so: $(objpfx)librtld.os $(ld-map) - $(LINK.o) -nostdlib -nostartfiles -shared -o $@ \ +# Link into a temporary file so that we don't touch $@ at all +# if the sanity check below fails. + $(LINK.o) -nostdlib -nostartfiles -shared -o $@.new \ $(LDFLAGS-rtld) -Wl,-z,defs $(z-now-$(bind-now)) \ $(filter-out $(map-file),$^) $(load-map-file) \ -Wl,-soname=$(rtld-installed-name) \ -Wl,-defsym=_begin=0 - $(READELF) -s $@ \ + $(READELF) -s $@.new \ | $(AWK) '($$7 ~ /^UND(|EF)$$/ && $$1 != "0:" && $$4 != "REGISTER") { print; p=1 } END { exit p != 0 }' + mv -f $@.new $@ # interp.c exists just to get this string into the libraries. CFLAGS-interp.c = -D'RUNTIME_LINKER="$(rtlddir)/$(rtld-installed-name)"' \ |