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

Unified Diff: src/trusted/service_runtime/elf_util.c

Issue 2107012: Update the verifier to work with both gold and ld produced binaries. (Closed) Base URL: http://nativeclient.googlecode.com/svn/trunk/src/native_client/
Patch Set: '' Created 10 years, 7 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 | tests/barebones/nacl.scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/trusted/service_runtime/elf_util.c
===================================================================
--- src/trusted/service_runtime/elf_util.c (revision 2282)
+++ src/trusted/service_runtime/elf_util.c (working copy)
@@ -316,27 +316,27 @@
if (*max_vaddr < php->p_vaddr + php->p_memsz) {
*max_vaddr = php->p_vaddr + php->p_memsz;
}
- }
- switch (nacl_phdr_check_data[j].action) {
- case PCA_NONE:
- break;
- case PCA_TEXT_CHECK:
- if (0 == php->p_memsz) {
- return LOAD_BAD_ELF_TEXT;
- }
- *static_text_end = NACL_TRAMPOLINE_END + php->p_filesz;
- break;
- case PCA_RODATA:
- *rodata_start = php->p_vaddr;
- *rodata_end = php->p_vaddr + php->p_memsz;
- break;
- case PCA_DATA:
- *data_start = php->p_vaddr;
- *data_end = php->p_vaddr + php->p_memsz;
- break;
- case PCA_IGNORE:
- break;
+ switch (nacl_phdr_check_data[j].action) {
+ case PCA_NONE:
+ break;
+ case PCA_TEXT_CHECK:
+ if (0 == php->p_memsz) {
+ return LOAD_BAD_ELF_TEXT;
+ }
+ *static_text_end = NACL_TRAMPOLINE_END + php->p_filesz;
+ break;
+ case PCA_RODATA:
+ *rodata_start = php->p_vaddr;
+ *rodata_end = php->p_vaddr + php->p_memsz;
+ break;
+ case PCA_DATA:
+ *data_start = php->p_vaddr;
+ *data_end = php->p_vaddr + php->p_memsz;
+ break;
+ case PCA_IGNORE:
+ break;
+ }
}
goto next_seg;
}
« no previous file with comments | « no previous file | tests/barebones/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698