NaCl: Update revision in DEPS, r12952 -> r12992

* Fix irt_clock.cc to compile after r12983.

This pulls in the following Native Client changes:

r12953: (mseaborn) Unsandboxed IRT: Implement getpid()
r12954: (noelallen) Fix irt_syscalls.h dependency
r12955: (dyen) Toolchains no longer download tar balls unnecessarily.
r12956: (mseaborn) PNaCl driver scripts: Remove unused USE_BOOTSTRAP field
r12957: (mseaborn) IRT interfaces: Clean up use of off_t by defining a nacl_irt_off_t type
r12958: (noelallen) Fix roll
r12959: (noelallen) Roll bionic toolchain.
r12960: (noelallen) Update to builder output
r12961: (mseaborn) PNaCl driver scripts: Fix various pyflakes warnings
r12962: (dyen) Package archives now have their own json description files.
r12963: (mseaborn) Fix #including of <irt_dev.h>, since nacl_io requires this to work
r12964: (jvoung) Test that gdb tests work with the sandboxed translator.
r12965: (mseaborn) PNaCl driver scripts: Remove use of "import *"
r12966: (mseaborn) Unsandboxed IRT: Whitelist and convert mmap() flag values
r12967: (bradnelson) Provide chrome the option of learning the debug stub port chosen by nacl.
r12968: (dyen) Toolchain Build now stores package description files for final packages.
r12969: (jvoung) PNaCl: Update LLVM revision in pnacl/COMPONENT_REVISIONS
r12971: (mseaborn) pnacl-translate: Refactor selection of arch-specific flags
r12972: (jvoung) Clean up spec2k scripts a bit.
r12973: (dyen) buildbot scripts changes should trigger all trybots.
r12974: (bradnelson) Adding environment variable on the bots to look for msvs2013.
r12976: (bradnelson) Reducing egyptian cotton thread count for win32.
r12977: (petarj) [MIPS] Make sure the function unfixed_code() ends up in the text section
r12978: (dyen) Fixed an issue where closing a cygtar file doesn't close the file handle.
r12979: (jvoung) Remove match awk.pass.cpp from known fails. Test got commented out.
r12980: (jvoung) Add single-threaded translation variants to PNaCl spec2k bots.
r12981: (jfb) PNaCl: Update LLVM revision in pnacl/COMPONENT_REVISIONS
r12982: (dyen) Uploads a package using package_version for all the toolchain builds
*r12983: (mseaborn) IRT interfaces: Clean up use of clockid_t by defining nacl_irt_clockid_t
r12984: (mseaborn) IRT interfaces: Move the dev_getpid interface into irt_dev.h for consistency
r12985: (dyen) Fixed some issues with the toolchain build regarding buildbots.
r12986: (jfb) Update TOOL_REVISIONS for PNaCl r12944->r12981
r12987: (dyen) Fixed some issues with the newlib and glibc buildbot.
r12988: (dschuff) set svn:ignore on native_client/mingw32 directory
r12989: (noelallen) Attempt to build cpu_features and desc library.
r12990: (dschuff) Disable terminfo lib in LLVM cmake build
r12991: (dyen) Buildbot scripts now use native python in win32 to avoid cygwin issues.
r12992: (bradnelson) Only provide chrome the option of learning the debug stub port on windows.

BUG=none
TEST=browser_tests and nacl_integration

Review URL: https://codereview.chromium.org/225283004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261927 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 5 deletions

diff --git a/components/nacl/loader/nonsfi/irt_clock.cc b/components/nacl/loader/nonsfi/irt_clock.cc
index 2ad0ae1..5fc537f 100644
--- a/components/nacl/loader/nonsfi/irt_clock.cc
+++ b/components/nacl/loader/nonsfi/irt_clock.cc
@@ -13,7 +13,8 @@ namespace nacl {
 namespace nonsfi {
 namespace {
 
-bool NaClAbiClockIdToClockId(int nacl_clk_id, clockid_t* host_clk_id) {
+bool NaClAbiClockIdToClockId(nacl_irt_clockid_t nacl_clk_id,
+                             clockid_t* host_clk_id) {
   switch (nacl_clk_id) {
     case NACL_ABI_CLOCK_REALTIME:
       *host_clk_id = CLOCK_REALTIME;
@@ -34,7 +35,7 @@ bool NaClAbiClockIdToClockId(int nacl_clk_id, clockid_t* host_clk_id) {
   return true;
 }
 
-int IrtClockGetRes(int clk_id, struct nacl_abi_timespec* res) {
+int IrtClockGetRes(nacl_irt_clockid_t clk_id, struct nacl_abi_timespec* res) {
   clockid_t host_clk_id;
   if (!NaClAbiClockIdToClockId(clk_id, &host_clk_id))
     return EINVAL;
@@ -49,7 +50,7 @@ int IrtClockGetRes(int clk_id, struct nacl_abi_timespec* res) {
   return 0;
 }
 
-int IrtClockGetTime(int clk_id, struct nacl_abi_timespec* tp) {
+int IrtClockGetTime(nacl_irt_clockid_t clk_id, struct nacl_abi_timespec* tp) {
   clockid_t host_clk_id;
   if (!NaClAbiClockIdToClockId(clk_id, &host_clk_id))
     return EINVAL;
@@ -66,8 +67,10 @@ int IrtClockGetTime(int clk_id, struct nacl_abi_timespec* tp) {
 
 // Cast away the distinction between host types and NaCl ABI types.
 const nacl_irt_clock kIrtClock = {
-  reinterpret_cast<int(*)(clockid_t, struct timespec*)>(IrtClockGetRes),
-  reinterpret_cast<int(*)(clockid_t, struct timespec*)>(IrtClockGetTime),
+  reinterpret_cast<int(*)(nacl_irt_clockid_t, struct timespec*)>(
+      IrtClockGetRes),
+  reinterpret_cast<int(*)(nacl_irt_clockid_t, struct timespec*)>(
+      IrtClockGetTime),
 };
 
 }  // namespace nonsfi