Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2992)

Unified Diff: elf/Makefile

Issue 7715030: Fix dynamic library linking. (Closed) Base URL: http://git.chromium.org/native_client/nacl-glibc.git@master
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | nacl/dyn-link/ldscripts/elf64_nacl.xs » ('j') | nacl/dyn-link/ldscripts/elf64_nacl.xs » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: elf/Makefile
diff --git a/elf/Makefile b/elf/Makefile
index 07fc811c01aae3647c331a0cd8220480ba2a434a..fb5db6d40cbdaa249decf2c68c25600edd990552 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -308,8 +308,13 @@ $(objpfx)ld.so: $(objpfx)librtld.os $(ld-map)
$(LINK.o) -nostdlib -nostartfiles -shared $(z-now-$(bind-now)) \
pasko-google - do not use 2011/08/24 16:38:14 would be nice to leave a comment above this line:
khim 2011/08/24 17:03:07 Done.
$(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/\. = DATA_SEGMENT_END (\.);//' -e 's/} :seg_bss/}/' \
pasko-google - do not use 2011/08/24 16:38:14 please, wrap the 2-nd -e here to the next line, wo
khim 2011/08/24 17:03:07 Done.
+ -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)) \
« no previous file with comments | « no previous file | nacl/dyn-link/ldscripts/elf64_nacl.xs » ('j') | nacl/dyn-link/ldscripts/elf64_nacl.xs » ('J')

Powered by Google App Engine
This is Rietveld 408576698