This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.22-140-gf971949
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 25 Aug 2015 20:40:18 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.22-140-gf971949
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via f97194930886838796546646e26a49bb5899075b (commit)
from d8725b1fba769a89ce2c902a2091d01faa946b66 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f97194930886838796546646e26a49bb5899075b
commit f97194930886838796546646e26a49bb5899075b
Author: Roland McGrath <roland@hack.frob.com>
Date: Tue Aug 25 13:37:07 2015 -0700
NaCl: Call __nacl_main in preference to main.
diff --git a/ChangeLog b/ChangeLog
index a6b03f9..d642fb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 a4b6dd3..8e8bc1a 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),
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
sysdeps/nacl/start.c | 6 +++++-
2 files changed, 10 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources