GNU C Library master sources branch roland/nacl-port/master updated. 60cd5c30c80e405b45cb66e97bb522c5bfd936dd

[roland at sourceware dot org]

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, roland/nacl-port/master has been updated
       via  60cd5c30c80e405b45cb66e97bb522c5bfd936dd (commit)
       via  9c40ef09cc239a621750f22687099bd37ba9497c (commit)
       via  761e819446606d559579dc83c355fc9ee86669fe (commit)
       via  f23de1e83fe0eef4681600c3f5ce20abb0450beb (commit)
      from  fd486ec7cc4527327c0410dc34b730435634796e (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=60cd5c30c80e405b45cb66e97bb522c5bfd936dd

commit 60cd5c30c80e405b45cb66e97bb522c5bfd936dd
Author: Roland McGrath <roland@hack.frob.com>
Date:   Thu Apr 25 15:32:37 2013 -0700

    Right mman.h bits for NaCl.

diff --git a/sysdeps/nacl/Makefile b/sysdeps/nacl/Makefile
index 4341982..01a5fe0 100644
--- a/sysdeps/nacl/Makefile
+++ b/sysdeps/nacl/Makefile
@@ -54,6 +54,17 @@ $(nacl-optional-interfaces:%=$(nacl-interface-pattern)): \
 sysdep_routines += nacl_interface_query \
 		   nacl-interfaces $(nacl-interface-routines)
 
+# The Linux bits are close enough for NaCl and we want to use the existing
+# file rather than copying it into sysdeps/nacl and letting it bit rot.
+# But we certainly don't want sysdeps/unix/sysv/linux in our sysdirs list!
+# So copy the file to the build directory.
+sysdep_headers += bits/mman-linux.h
+before-compile += $(common-objpfx)bits/mman-linux.h
+$(common-objpfx)bits/mman-linux.h: \
+  $(..)sysdeps/unix/sysv/linux/bits/mman-linux.h
+	$(make-target-directory)
+	ln -f $< $@ || cp -f $< $@
+
 # XXX temp test
 others += hello
 
diff --git a/sysdeps/nacl/bits/mman.h b/sysdeps/nacl/bits/mman.h
new file mode 100644
index 0000000..07f8929
--- /dev/null
+++ b/sysdeps/nacl/bits/mman.h
@@ -0,0 +1,24 @@
+/* Definitions for POSIX memory map interface.  NaCl version.
+   Copyright (C) 2013 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef _SYS_MMAN_H
+# error "Never use <bits/mman.h> directly; include <sys/mman.h> instead."
+#endif
+
+/* NaCl uses the Linux bits for this.  */
+#include <bits/mman-linux.h>

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=9c40ef09cc239a621750f22687099bd37ba9497c

commit 9c40ef09cc239a621750f22687099bd37ba9497c
Author: Roland McGrath <roland@hack.frob.com>
Date:   Thu Apr 25 15:32:19 2013 -0700

    gettimeofday fills in timezone

diff --git a/sysdeps/nacl/gettimeofday.c b/sysdeps/nacl/gettimeofday.c
index f15590c..59aa998 100644
--- a/sysdeps/nacl/gettimeofday.c
+++ b/sysdeps/nacl/gettimeofday.c
@@ -29,8 +29,8 @@ __gettimeofday (struct timeval *tv, struct timezone *tz)
 {
   if (__glibc_unlikely (tz != NULL))
     {
-      errno = ENOTSUP;                  /* XXX ? */
-      return -1;
+      tz->tz_minuteswest = 0;
+      tz->tz_dsttime = 0;
     }
 
   return NACL_CALL (__nacl_irt_basic.gettod (tv), 0);

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=761e819446606d559579dc83c355fc9ee86669fe

commit 761e819446606d559579dc83c355fc9ee86669fe
Author: Roland McGrath <roland@hack.frob.com>
Date:   Wed Apr 24 13:40:47 2013 -0700

    Avoid IFUNC for static library.

diff --git a/sysdeps/nacl/nacl_interface_query.c b/sysdeps/nacl/nacl_interface_query.c
index 1bbe724..a8fcc19 100644
--- a/sysdeps/nacl/nacl_interface_query.c
+++ b/sysdeps/nacl/nacl_interface_query.c
@@ -18,6 +18,8 @@
 
 #include <nacl-interfaces.h>
 
+#ifdef SHARED
+
 /* We can define this trivially using IFUNC rather than a wrapper
    because we absolutely require that we get the IRT interface query
    function pointer via AT_SYSINFO.  */
@@ -31,3 +33,16 @@ nacl_interface_query_ifunc (void)
   return &__nacl_irt_query;
 }
 asm (".type nacl_interface_query, %gnu_indirect_function");
+
+#else
+
+/* In the static library, using IFUNC is just extra overhead.  */
+
+size_t
+nacl_interface_query (const char *interface_ident,
+                      void *table, size_t tablesize)
+{
+  return __nacl_irt_query (interface_ident, table, tablesize);
+}
+
+#endif

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f23de1e83fe0eef4681600c3f5ce20abb0450beb

commit f23de1e83fe0eef4681600c3f5ce20abb0450beb
Author: Roland McGrath <roland@hack.frob.com>
Date:   Wed Apr 24 13:40:27 2013 -0700

    Fix clock_gettime to call the right IRT function.

diff --git a/sysdeps/nacl/clock_gettime.c b/sysdeps/nacl/clock_gettime.c
index 8235de2..a9d347d 100644
--- a/sysdeps/nacl/clock_gettime.c
+++ b/sysdeps/nacl/clock_gettime.c
@@ -23,6 +23,6 @@
 int
 __clock_gettime (clockid_t clock_id, struct timespec *tp)
 {
-  return NACL_CALL (__nacl_irt_clock.clock_getres (clock_id, tp), 0);
+  return NACL_CALL (__nacl_irt_clock.clock_gettime (clock_id, tp), 0);
 }
 weak_alias (__clock_gettime, clock_gettime)

-----------------------------------------------------------------------

Summary of changes:
 sysdeps/nacl/Makefile                     |   11 +++++++++++
 sysdeps/nacl/{check_fds.c => bits/mman.h} |   13 +++++++------
 sysdeps/nacl/clock_gettime.c              |    2 +-
 sysdeps/nacl/gettimeofday.c               |    4 ++--
 sysdeps/nacl/nacl_interface_query.c       |   15 +++++++++++++++
 5 files changed, 36 insertions(+), 9 deletions(-)
 copy sysdeps/nacl/{check_fds.c => bits/mman.h} (76%)


hooks/post-receive
-- 
GNU C Library master sources