Update for irt.h/irt_dev.h changes.

diff --git a/sysdeps/nacl/Makefile b/sysdeps/nacl/Makefile
index 5f6034ad013afa73930f40df58bef982039081d8..9d8569c881f001e9b36162e4750d40bfb86eadd1 100644 (file)
--- 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 ff9f642eec7d3b91933cff4c0df082f88b78ab4a..bd71806bf79cb637ab37c64a5f0b9fe03c4fb9ef 100644 (file)
--- 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 846eb0967035534e0f881e6ca64ee277f53c5b57..c7dc2c0194e741357b2c1960acca711fd1aae0a5 100644 (file)
--- 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 26785940744cd785f6e8376b61e853dc75e9af9e..5ea437cfe650b3a9f2cb0a660fb81061148a5aee 100644 (file)
--- 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__.  */