GNU C Library master sources branch roland/nacl-port/master updated. 10085ef69c3712df5ac36221c95da19bc520be6e

[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  10085ef69c3712df5ac36221c95da19bc520be6e (commit)
      from  7ec05c6fe1d4ae8daa58fbbfa98547e082153803 (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=10085ef69c3712df5ac36221c95da19bc520be6e

commit 10085ef69c3712df5ac36221c95da19bc520be6e
Author: Roland McGrath <roland@hack.frob.com>
Date:   Mon May 5 13:07:59 2014 -0700

    Update for irt.h/irt_dev.h changes.

diff --git a/sysdeps/nacl/Makefile b/sysdeps/nacl/Makefile
index 5f6034a..9d8569c 100644
--- a/sysdeps/nacl/Makefile
+++ b/sysdeps/nacl/Makefile
@@ -40,7 +40,9 @@ common-generated += stamp-errnos bits/errno.h
 before-compile += $(bits-errno)
 
 nacl-irt.h = $(common-objpfx)nacl-irt.h
-$(nacl-irt.h): $(nacl)/irt.sed $(naclsrc)/untrusted/irt/irt.h
+$(nacl-irt.h): $(nacl)/irt.sed \
+	       $(naclsrc)/untrusted/irt/irt.h \
+	       $(naclsrc)/untrusted/irt/irt_dev.h
 	sed -f $^ > $@.new
 	mv -f $@.new $@
 common-generated += nacl-irt.h
diff --git a/sysdeps/nacl/irt.sed b/sysdeps/nacl/irt.sed
index ff9f642..bd71806 100644
--- a/sysdeps/nacl/irt.sed
+++ b/sysdeps/nacl/irt.sed
@@ -4,7 +4,9 @@
 # It doesn't perturb any struct CamelCaps cases, since such names will
 # be used only in NaCl-specific interfaces.
 /^struct \([a-z][a-z]*\);$/d
+/^#include "irt\.h"$/d
 /(/!b
 s/\([a-z0-9_][a-z0-9_]*\)_t\>/nacl_abi_\1_t/g
 s/struct \([a-z0-9_][a-z0-9_]*\)/nacl_abi_\1_t/g
 s/nacl_abi_\(u*int[3264]*_t\)/\1/g
+s/nacl_abi_\(nacl_irt_\)/\1/g
diff --git a/sysdeps/nacl/nacl-interfaces.h b/sysdeps/nacl/nacl-interfaces.h
index 846eb09..c7dc2c0 100644
--- a/sysdeps/nacl/nacl-interfaces.h
+++ b/sysdeps/nacl/nacl-interfaces.h
@@ -29,13 +29,11 @@
 
 /* These are the same in the IRT ABI as in the libc ABI.  */
 typedef blksize_t nacl_abi_blksize_t;
-typedef clockid_t nacl_abi_clockid_t;
 typedef dev_t nacl_abi_dev_t;
 typedef gid_t nacl_abi_gid_t;
 typedef ino_t nacl_abi_ino_t;
 typedef mode_t nacl_abi_mode_t;
 typedef nlink_t nacl_abi_nlink_t;
-typedef off_t nacl_abi_off_t;
 typedef size_t nacl_abi_size_t;
 typedef time_t nacl_abi_time_t;
 typedef uid_t nacl_abi_uid_t;
diff --git a/sysdeps/nacl/xstatconv.h b/sysdeps/nacl/xstatconv.h
index 2678594..5ea437c 100644
--- a/sysdeps/nacl/xstatconv.h
+++ b/sysdeps/nacl/xstatconv.h
@@ -20,6 +20,9 @@
 
 struct stat;
 
+/* stat.h uses nacl_abi_off_t, but irt.h defines only nacl_irt_off_t.  */
+typedef nacl_irt_off_t nacl_abi_off_t;
+
 /* We use this header to define struct nacl_abi_stat.  But we must avoid
    its excess declarations, and defining these names away is (marginally)
    cleaner than #undef'ing __native_client__.  */

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

Summary of changes:
 sysdeps/nacl/Makefile          |    4 +++-
 sysdeps/nacl/irt.sed           |    2 ++
 sysdeps/nacl/nacl-interfaces.h |    2 --
 sysdeps/nacl/xstatconv.h       |    3 +++
 4 files changed, 8 insertions(+), 3 deletions(-)


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