Closer to NPTL building.

diff --git a/sysdeps/nacl/Makefile b/sysdeps/nacl/Makefile
index ade4df611fa3a436031be9c744970cf8b2108843..84ba58c11791b9313224a5ef3d7780563e1f252c 100644 (file)
--- a/sysdeps/nacl/Makefile
+++ b/sysdeps/nacl/Makefile
@@ -95,3 +95,8 @@ endif
 ifeq ($(subdir),io)
 sysdep_routines += xstatconv
 endif
+
+ifeq ($(subdir),nptl)
+# XXX temporary hack
+libpthread-routines := $(filter-out ptw-%,$(libpthread-routines))
+endif

diff --git a/sysdeps/nacl/Versions b/sysdeps/nacl/Versions
index d2d655851b57535fba7e98bfb93bde441b256b8c..60f1e92d4912713c5a022ea052fcaf0e89ca163c 100644 (file)
--- a/sysdeps/nacl/Versions
+++ b/sysdeps/nacl/Versions
@@ -8,4 +8,12 @@ libc {
   GLIBC_2.17 {
     nacl_interface_query;
   }
+
+  GLIBC_PRIVATE {
+    # These are used by libpthread.
+    __libc_write;
+    __libc_open;
+    __libc_close;
+    __libc_fork;
+  }
 }

diff --git a/sysdeps/nacl/lowlevellock-futex.h b/sysdeps/nacl/lowlevellock-futex.h
index eecbfb105259ccb92c73aba10984dcb4a796ced4..8d888a2e7220273808e96fd2e939f9630247216c 100644 (file)
--- a/sysdeps/nacl/lowlevellock-futex.h
+++ b/sysdeps/nacl/lowlevellock-futex.h
@@ -1,4 +1,4 @@
-/* Low-level locking access to futex facilities.  Stub version.
+/* Low-level locking access to futex facilities.  NaCl version.
    Copyright (C) 2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 

diff --git a/sysdeps/nacl/profil-counter.h b/sysdeps/nacl/profil-counter.h
index b1d3bb666218f81d1531e413a5f421a24ca3388c..9967fae5c3fa9910a7e8c9c144143762c4006bdd 100644 (file)
--- a/sysdeps/nacl/profil-counter.h
+++ b/sysdeps/nacl/profil-counter.h
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 
 static void
-profil_counter (int signr, int code, struct sigcontext *scp)
+__profil_counter (int signr, int code, struct sigcontext *scp)
 {
   abort ();
 }

diff --git a/sysdeps/nacl/sigaction.c b/sysdeps/nacl/sigaction.c
index 8fb9f824d0cbd5a5a08f36f6f6d38829a8369af2..898486eea56051aeda410986b5c85f6102818aad 100644 (file)
--- a/sysdeps/nacl/sigaction.c
+++ b/sysdeps/nacl/sigaction.c
@@ -1,2 +1,11 @@
+#if IS_IN (libpthread)
+
 /* This placeholder file prevents nptl/sigaction.c from being compiled.
    For NaCl, there is no need for a separate sigaction in libpthread.  */
+
+#else
+
+/* Get the standard stub.  */
+#include <signal/sigaction.c>
+
+#endif