Fix dynamic library linking.

elf/Makefile

 # Copyright (C) 1995-2007, 2008 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 Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
 
 # The GNU C Library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 287 matching lines @@
 $(objpfx)librtld.os: $(objpfx)dl-allobjs.os $(objpfx)rtld-libc.a
         $(LINK.o) -nostdlib -nostartfiles -r -o $@ '-Wl,-(' $^ -lgcc '-Wl,-)' \
                   -Wl,-Map,$@.map
 
 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)
         @rm -f $@.lds
+        # NaCl loader refuses to run ld.so with more than 3 loadable segments.
+        # Remove the bss segment.
         $(LINK.o) -nostdlib -nostartfiles -shared $(z-now-$(bind-now))  \
                   $(LDFLAGS-rtld) -Wl,-z,defs -Wl,--verbose 2>&1 |      \
                   LC_ALL=C \
-                  sed -e '/^=========/,/^=========/!d;/^=========/d'    \
+                  sed -e '/^=========/,/^=========/!d;/^=========/d' \
                       -e 's/\. = 0 + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \
+                      -e 's/_end = \.; PROVIDE (end = \.);/& . = DATA_SEGMENT_END(.);/' \
+                      -e 's/seg_bss      PT_LOAD FLAGS(6) ;       \/\* read + write \*\///' \
+                      -e 's/} :seg_bss/}/' \
+                      -e 's/\. = DATA_SEGMENT_END (\.);//' \
+                      -e 's/\. = ALIGN (CONSTANT (MAXPAGESIZE));//' \
+                      -e 's/\. = ALIGN (CONSTANT (COMMONPAGESIZE));//' \
                   > $@.lds
         $(LINK.o) -nostdlib -nostartfiles -shared -o $@                 \
                   $(LDFLAGS-rtld) -Wl,-z,defs $(z-now-$(bind-now))      \
                   $(filter-out $(map-file),$^) $(load-map-file)         \
                   -Wl,-soname=$(rtld-installed-name) -T $@.lds          \
                   -Wl,-Ttext,0x20000
         rm -f $@.lds
         readelf -s $@ \
           | $(AWK) '($$7 ~ /^UND(EF)?$$/ && $$1 != "0:" && $$4 != "REGISTER") { print; p=1 } END { exit p != 0 }'
 
@@ skipping 630 matching lines @@
 
 $(objpfx)tst-leaks1: $(libdl)
 $(objpfx)tst-leaks1-mem: $(objpfx)tst-leaks1.out
         $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks1.mtrace > $@
 
 tst-leaks1-ENV = MALLOC_TRACE=$(objpfx)tst-leaks1.mtrace
 
 $(objpfx)tst-addr1: $(libdl)
 
 $(objpfx)tst-thrlock: $(libdl) $(shared-thread-library)