Skip to content

Commit

Permalink
Better detect total failure of linker script generation.
Browse files Browse the repository at this point in the history
  • Loading branch information
frobtech committed Jun 11, 2011
1 parent 5615eaf commit decd4e5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 0 deletions.
3 changes: 3 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
2011-06-10 Roland McGrath <[email protected]>

* Makerules (shlib.lds): Fail if the linker script comes out empty.
* elf/Makefile ($(objpfx)ld.so): Likewise.

* Makefile ($(common-objpfx)linkobj/libc.so): Break long lines with \.
Don't list ld.so twice in dependencies.

Expand Down
1 change: 1 addition & 0 deletions Makerules
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,7 @@ $(common-objpfx)shlib.lds: $(common-objpfx)config.make $(..)Makerules
__libc_thread_subfreeres : { *(__libc_thread_subfreeres) }\
PROVIDE(__stop___libc_thread_subfreeres = .);\
/DISCARD/ : { *(.gnu.glibc-stub.*) }@'
test -s $@T
mv -f $@T $@
common-generated += shlib.lds

Expand Down
1 change: 1 addition & 0 deletions elf/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,7 @@ $(objpfx)ld.so: $(objpfx)librtld.os $(ld-map)
sed -e '/^=========/,/^=========/!d;/^=========/d' \
-e 's/\. = .* + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \
> $@.lds
test -s $@.lds
$(LINK.o) -nostdlib -nostartfiles -shared -o $@ \
$(LDFLAGS-rtld) -Wl,-z,defs $(z-now-$(bind-now)) \
$(filter-out $(map-file),$^) $(load-map-file) \
Expand Down

0 comments on commit decd4e5

Please sign in to comment.