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

Unified Diff: ports/perl/nacl.patch

Issue 1417223003: Switch from using 'nacl_main' to 'main' entry point (Closed) Base URL: https://chromium.googlesource.com/external/naclports.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
« no previous file with comments | « ports/perl/build.sh ('k') | ports/pkg/build.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ports/perl/nacl.patch
diff --git a/ports/perl/nacl.patch b/ports/perl/nacl.patch
index 37f592df6d37df6e99030fa73fe8b5262733956b..ff1615dcc2bebad1e3c5e492562692837b907332 100644
--- a/ports/perl/nacl.patch
+++ b/ports/perl/nacl.patch
@@ -50,31 +50,6 @@ new mode 100755
microtest: microperl
- cd t && (rm -f perl; ln -s ../microperl perl) \
-diff --git a/ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm b/ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm
-old mode 100644
-new mode 100755
---- a/ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm
-+++ b/ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm
-@@ -89,11 +89,19 @@ struct perl_vars* Perl_GetVarsPrivate(void) { return my_plvarsp; }
- #ifdef NO_ENV_ARRAY_IN_MAIN
- extern char **environ;
- int
-+#ifdef __native_client__
-+nacl_main(int argc, char **argv)
-+#else
- main(int argc, char **argv)
-+#endif
- #else
- int
-+#ifdef __native_client__
-+nacl_main(int argc, char **argv, char **env)
-+#else
- main(int argc, char **argv, char **env)
- #endif
-+#endif
- {
- int exitstatus, i;
- #ifdef PERL_GLOBAL_STRUCT
diff --git a/installperl b/installperl
--- a/installperl
+++ b/installperl
@@ -99,32 +74,6 @@ diff --git a/installperl b/installperl
}
}
}
-diff --git a/lib/ExtUtils/t/Embed.t b/lib/ExtUtils/t/Embed.t
-old mode 100644
-new mode 100755
---- a/lib/ExtUtils/t/Embed.t
-+++ b/lib/ExtUtils/t/Embed.t
-@@ -168,11 +168,20 @@ struct perl_vars* Perl_GetVarsPrivate(void) { return my_plvarsp; }
- #endif
-
- #ifdef NO_ENV_ARRAY_IN_MAIN
-+#ifdef __native_client__
-+int nacl_main(int argc, char **argv) {
-+ char **env;
-+#else
- int main(int argc, char **argv) {
- char **env;
-+#endif
-+#else
-+#ifdef __native_client__
-+int nacl_main(int argc, char **argv, char **env) {
- #else
- int main(int argc, char **argv, char **env) {
- #endif
-+#endif
- PerlInterpreter *my_perl;
- #ifdef PERL_GLOBAL_STRUCT
- struct perl_vars *my_vars = init_global_struct();
diff --git a/perl.h b/perl.h
old mode 100644
new mode 100755
@@ -419,20 +368,3 @@ new mode 100755
#endif
return pid;
#else
-diff --git a/x2p/a2py.c b/x2p/a2py.c
-old mode 100644
-new mode 100755
---- a/x2p/a2py.c
-+++ b/x2p/a2py.c
-@@ -57,7 +57,11 @@ usage()
- #endif
-
- int
-+#ifdef __native_client__
-+nacl_main(int argc, const char **argv)
-+#else
- main(int argc, const char **argv)
-+#endif
- {
- STR *str;
- int i;
« no previous file with comments | « ports/perl/build.sh ('k') | ports/pkg/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698