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

Unified Diff: ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_entry.c

Issue 10950042: PNaCl: Build a PPAPI shims library for all architectures (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review Created 8 years, 3 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: ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_entry.c
diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_entry.c b/ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_entry.c
index e143c926129adf2ef5a83f4b01e277f302d83160..1d64ee79ce400c5ad4f03740aa0f84192d14dc68 100644
--- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_entry.c
+++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_entry.c
@@ -16,6 +16,8 @@
* See nacl_startup.h for the layout at the argument pointer.
*/
void _pnacl_wrapper_start(uint32_t *info) {
+ /* The PNaCl PPAPI shims are only needed on x86-64. */
+#if defined(__x86_64__)
Elf32_auxv_t *auxv = nacl_startup_auxv(info);
Elf32_auxv_t *entry = NULL;
@@ -48,6 +50,7 @@ void _pnacl_wrapper_start(uint32_t *info) {
* seems brittle (what if the bitcode link was separated from translation).
* Thus we always wrap _start, even if there is no IRT auxv entry.
*/
+#endif
/*
* Call the user entry point function. It should not return.

Powered by Google App Engine
This is Rietveld 408576698