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

Side by Side 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, 1 month 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 unified diff | Download patch
« no previous file with comments | « ports/perl/build.sh ('k') | ports/pkg/build.sh » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 diff --git a/Makefile.micro b/Makefile.micro 1 diff --git a/Makefile.micro b/Makefile.micro
2 old mode 100644 2 old mode 100644
3 new mode 100755 3 new mode 100755
4 --- a/Makefile.micro 4 --- a/Makefile.micro
5 +++ b/Makefile.micro 5 +++ b/Makefile.micro
6 @@ -1,11 +1,14 @@ 6 @@ -1,11 +1,14 @@
7 LD = $(CC) 7 LD = $(CC)
8 CCFLAGS = -c 8 CCFLAGS = -c
9 +BUILD_CCFLAGS = -c 9 +BUILD_CCFLAGS = -c
10 DEFINES = -DPERL_CORE -DPERL_MICRO -DSTANDARD_C -DPERL_USE_SAFE_PUTENV \ 10 DEFINES = -DPERL_CORE -DPERL_MICRO -DSTANDARD_C -DPERL_USE_SAFE_PUTENV \
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 ugenerate_uudmap$(_O): generate_uudmap.c 43 ugenerate_uudmap$(_O): generate_uudmap.c
44 - $(CC) $(CCFLAGS) -o $@ $(CFLAGS) generate_uudmap.c 44 - $(CC) $(CCFLAGS) -o $@ $(CFLAGS) generate_uudmap.c
45 + $(BUILD_CC) $(BUILD_CCFLAGS) -o $@ $(CFLAGS) generate_uudmap.c 45 + $(BUILD_CC) $(BUILD_CCFLAGS) -o $@ $(CFLAGS) generate_uudmap.c
46 46
47 ugenerate_uudmap$(_X): ugenerate_uudmap$(_O) 47 ugenerate_uudmap$(_X): ugenerate_uudmap$(_O)
48 - $(LD) -o ugenerate_uudmap $(LDFLAGS) ugenerate_uudmap$(_O) $(LIBS) 48 - $(LD) -o ugenerate_uudmap $(LDFLAGS) ugenerate_uudmap$(_O) $(LIBS)
49 + $(BUILD_LD) -o ugenerate_uudmap $(BUILD_LDFLAGS) ugenerate_uudmap$(_O) $ (BUILD_LIBS) 49 + $(BUILD_LD) -o ugenerate_uudmap $(BUILD_LDFLAGS) ugenerate_uudmap$(_O) $ (BUILD_LIBS)
50 50
51 microtest: microperl 51 microtest: microperl
52 - cd t && (rm -f perl; ln -s ../microperl perl) \ 52 - cd t && (rm -f perl; ln -s ../microperl perl) \
53 diff --git a/ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm b/ext/ExtUtils-Minip erl/lib/ExtUtils/Miniperl.pm
54 old mode 100644
55 new mode 100755
56 --- a/ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm
57 +++ b/ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm
58 @@ -89,11 +89,19 @@ struct perl_vars* Perl_GetVarsPrivate(void) { return my_plva rsp; }
59 #ifdef NO_ENV_ARRAY_IN_MAIN
60 extern char **environ;
61 int
62 +#ifdef __native_client__
63 +nacl_main(int argc, char **argv)
64 +#else
65 main(int argc, char **argv)
66 +#endif
67 #else
68 int
69 +#ifdef __native_client__
70 +nacl_main(int argc, char **argv, char **env)
71 +#else
72 main(int argc, char **argv, char **env)
73 #endif
74 +#endif
75 {
76 int exitstatus, i;
77 #ifdef PERL_GLOBAL_STRUCT
78 diff --git a/installperl b/installperl 53 diff --git a/installperl b/installperl
79 --- a/installperl 54 --- a/installperl
80 +++ b/installperl 55 +++ b/installperl
81 @@ -383,9 +383,9 @@ foreach my $file (@corefiles) { 56 @@ -383,9 +383,9 @@ foreach my $file (@corefiles) {
82 if (copy_if_diff($file,"$installarchlib/CORE/$file")) { 57 if (copy_if_diff($file,"$installarchlib/CORE/$file")) {
83 if ($file =~ /\.(\Q$so\E|\Q$dlext\E)$/) { 58 if ($file =~ /\.(\Q$so\E|\Q$dlext\E)$/) {
84 strip("-S", "$installarchlib/CORE/$file") if $^O eq 'darwin'; 59 strip("-S", "$installarchlib/CORE/$file") if $^O eq 'darwin';
85 - chmod(0555, "$installarchlib/CORE/$file"); 60 - chmod(0555, "$installarchlib/CORE/$file");
86 + chmod(0755, "$installarchlib/CORE/$file"); 61 + chmod(0755, "$installarchlib/CORE/$file");
87 } else { 62 } else {
88 - chmod(0444, "$installarchlib/CORE/$file"); 63 - chmod(0444, "$installarchlib/CORE/$file");
89 + chmod(0644, "$installarchlib/CORE/$file"); 64 + chmod(0644, "$installarchlib/CORE/$file");
90 } 65 }
91 } 66 }
92 } 67 }
93 @@ -753,7 +753,7 @@ sub installlib { 68 @@ -753,7 +753,7 @@ sub installlib {
94 if (copy_if_diff($_, "$installlib/$name")) { 69 if (copy_if_diff($_, "$installlib/$name")) {
95 strip("-S", "$installlib/$name") 70 strip("-S", "$installlib/$name")
96 if $^O eq 'darwin' and /\.(?:so|$dlext|a)$/; 71 if $^O eq 'darwin' and /\.(?:so|$dlext|a)$/;
97 - chmod(/\.(so|$dlext)$/ ? 0555 : 0444, "$installlib/$name"); 72 - chmod(/\.(so|$dlext)$/ ? 0555 : 0444, "$installlib/$name");
98 + chmod(/\.(so|$dlext)$/ ? 0755 : 0644, "$installlib/$name"); 73 + chmod(/\.(so|$dlext)$/ ? 0755 : 0644, "$installlib/$name");
99 } 74 }
100 } 75 }
101 } 76 }
102 diff --git a/lib/ExtUtils/t/Embed.t b/lib/ExtUtils/t/Embed.t
103 old mode 100644
104 new mode 100755
105 --- a/lib/ExtUtils/t/Embed.t
106 +++ b/lib/ExtUtils/t/Embed.t
107 @@ -168,11 +168,20 @@ struct perl_vars* Perl_GetVarsPrivate(void) { return my_pl varsp; }
108 #endif
109
110 #ifdef NO_ENV_ARRAY_IN_MAIN
111 +#ifdef __native_client__
112 +int nacl_main(int argc, char **argv) {
113 + char **env;
114 +#else
115 int main(int argc, char **argv) {
116 char **env;
117 +#endif
118 +#else
119 +#ifdef __native_client__
120 +int nacl_main(int argc, char **argv, char **env) {
121 #else
122 int main(int argc, char **argv, char **env) {
123 #endif
124 +#endif
125 PerlInterpreter *my_perl;
126 #ifdef PERL_GLOBAL_STRUCT
127 struct perl_vars *my_vars = init_global_struct();
128 diff --git a/perl.h b/perl.h 77 diff --git a/perl.h b/perl.h
129 old mode 100644 78 old mode 100644
130 new mode 100755 79 new mode 100755
131 --- a/perl.h 80 --- a/perl.h
132 +++ b/perl.h 81 +++ b/perl.h
133 @@ -3561,7 +3561,7 @@ my_swap16(const U16 x) { 82 @@ -3561,7 +3561,7 @@ my_swap16(const U16 x) {
134 #endif 83 #endif
135 84
136 #ifndef __cplusplus 85 #ifndef __cplusplus
137 -#if !(defined(WIN32) || defined(UNDER_CE) || defined(SYMBIAN)) 86 -#if !(defined(WIN32) || defined(UNDER_CE) || defined(SYMBIAN))
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 + * other situations. 361 + * other situations.
413 + */ 362 + */
414 + # if defined(__native_client__) 363 + # if defined(__native_client__)
415 + pid = vfork(); 364 + pid = vfork();
416 + # else 365 + # else
417 pid = fork(); 366 pid = fork();
418 + # endif 367 + # endif
419 #endif 368 #endif
420 return pid; 369 return pid;
421 #else 370 #else
422 diff --git a/x2p/a2py.c b/x2p/a2py.c
423 old mode 100644
424 new mode 100755
425 --- a/x2p/a2py.c
426 +++ b/x2p/a2py.c
427 @@ -57,7 +57,11 @@ usage()
428 #endif
429
430 int
431 +#ifdef __native_client__
432 +nacl_main(int argc, const char **argv)
433 +#else
434 main(int argc, const char **argv)
435 +#endif
436 {
437 STR *str;
438 int i;
OLDNEW
« 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