diff options
| author | Roland McGrath <roland@hack.frob.com> | 2015-08-25 13:37:07 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2015-08-25 13:37:07 -0700 |
| commit | f97194930886838796546646e26a49bb5899075b (patch) | |
| tree | 795c9e0482b2c49c229748327b21bf71fd01b0a0 | |
| parent | d8725b1fba769a89ce2c902a2091d01faa946b66 (diff) | |
| download | glibc-f97194930886838796546646e26a49bb5899075b.tar glibc-f97194930886838796546646e26a49bb5899075b.tar.gz glibc-f97194930886838796546646e26a49bb5899075b.tar.bz2 glibc-f97194930886838796546646e26a49bb5899075b.zip | |
NaCl: Call __nacl_main in preference to main.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/nacl/start.c | 6 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2015-08-25 Roland McGrath <roland@hack.frob.com> + + * sysdeps/nacl/start.c (_start): Call __nacl_main instead of main + if the weak reference is not null. + 2015-08-25 H.J. Lu <hongjiu.lu@intel.com> * sysdeps/x86_64/strcmp.S: Remove "#if !IS_IN (libc)". diff --git a/sysdeps/nacl/start.c b/sysdeps/nacl/start.c index a4b6dd33d4..8e8bc1a05e 100644 --- a/sysdeps/nacl/start.c +++ b/sysdeps/nacl/start.c @@ -44,6 +44,10 @@ /* The application defines this, of course. */ extern int main (int argc, char **argv, char **envp); +/* But maybe it defines this too, in which case it takes precedence. */ +extern int __nacl_main (int argc, char **argv, char **envp) + __attribute__ ((weak)); + /* These are defined in libc. */ extern int __libc_csu_init (int argc, char **argv, char **envp); extern void __libc_csu_fini (void); @@ -59,7 +63,7 @@ _start (uint32_t info[]) { /* The generic code actually assumes that envp follows argv. */ - __libc_start_main (&main, + __libc_start_main (&__nacl_main ?: &main, nacl_startup_argc (info), nacl_startup_argv (info), nacl_startup_auxv (info), |