From: Roland McGrath <roland@hack.frob.com>
Date: Mon, 5 Jan 2015 21:56:11 +0000 (-0800)
Subject: Closer to NPTL building.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa6fbce0ad56ff03d737ca7d1cd8f66a0f93e5c8;p=thirdparty%2Fglibc.git

Closer to NPTL building.
---

diff --git a/sysdeps/nacl/Makefile b/sysdeps/nacl/Makefile
index ade4df611fa..84ba58c1179 100644
--- 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 d2d655851b5..60f1e92d491 100644
--- 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 eecbfb10525..8d888a2e722 100644
--- 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 b1d3bb66621..9967fae5c3f 100644
--- 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 8fb9f824d0c..898486eea56 100644
--- 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