diff options
| author | Roland McGrath <roland@hack.frob.com> | 2015-01-05 13:56:11 -0800 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2015-01-05 13:56:11 -0800 |
| commit | fa6fbce0ad56ff03d737ca7d1cd8f66a0f93e5c8 (patch) | |
| tree | 8d20153283ced91b09bf92e919567889d00fbb04 | |
| parent | 9408ab781e5355193725b7afb1f3761395b96418 (diff) | |
| download | glibc-fa6fbce0ad56ff03d737ca7d1cd8f66a0f93e5c8.tar.gz glibc-fa6fbce0ad56ff03d737ca7d1cd8f66a0f93e5c8.tar.xz glibc-fa6fbce0ad56ff03d737ca7d1cd8f66a0f93e5c8.zip | |
Closer to NPTL building.
| -rw-r--r-- | sysdeps/nacl/Makefile | 5 | ||||
| -rw-r--r-- | sysdeps/nacl/Versions | 8 | ||||
| -rw-r--r-- | sysdeps/nacl/lowlevellock-futex.h | 2 | ||||
| -rw-r--r-- | sysdeps/nacl/profil-counter.h | 2 | ||||
| -rw-r--r-- | sysdeps/nacl/sigaction.c | 9 |
5 files changed, 24 insertions, 2 deletions
diff --git a/sysdeps/nacl/Makefile b/sysdeps/nacl/Makefile index ade4df611f..84ba58c117 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 d2d655851b..60f1e92d49 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 eecbfb1052..8d888a2e72 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 b1d3bb6662..9967fae5c3 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 8fb9f824d0..898486eea5 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 |