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

Unified Diff: native_client_sdk/src/tools/lib/get_shared_deps.py

Issue 1398883004: [NaCl SDK] Fix create_nmf to include arm/glibc ELF loader (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
Index: native_client_sdk/src/tools/lib/get_shared_deps.py
diff --git a/native_client_sdk/src/tools/lib/get_shared_deps.py b/native_client_sdk/src/tools/lib/get_shared_deps.py
index ac5529ac37fa23c4a51a8c9792aab9cd8cc74f04..5a3a658f09bec8e779fd58f1608f1e4f20c8cf8c 100644
--- a/native_client_sdk/src/tools/lib/get_shared_deps.py
+++ b/native_client_sdk/src/tools/lib/get_shared_deps.py
@@ -27,7 +27,8 @@ SDK_DIR = os.path.dirname(os.path.dirname(SCRIPT_DIR))
NeededMatcher = re.compile('^ *NEEDED *([^ ]+)\n$')
FormatMatcher = re.compile('^(.+):\\s*file format (.+)\n$')
-RUNNABLE_LD = 'runnable-ld.so' # Name of the dynamic loader
+LOADER_X86 = 'runnable-ld.so' # Name of the dynamic loader
+LOADER_ARM = 'elf_loader_arm.nexe' # Name of the ARM dynamic loader
OBJDUMP_ARCH_MAP = {
# Names returned by Linux's objdump:
@@ -89,8 +90,11 @@ def _GetNeededDynamic(main_files, objdump, lib_path):
examined = set()
all_files, unexamined = GleanFromObjdump(main_files, None, objdump, lib_path)
for arch in all_files.itervalues():
- if unexamined and arch != 'arm':
- unexamined.add((RUNNABLE_LD, arch))
+ if unexamined:
+ if arch == 'arm':
+ unexamined.add((LOADER_ARM, arch))
+ else:
+ unexamined.add((LOADER_X86, arch))
while unexamined:
files_to_examine = {}
« no previous file with comments | « native_client_sdk/src/tools/create_nmf.py ('k') | native_client_sdk/src/tools/lib/tests/data/test_dynamic_arm.nexe » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698