public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] nptl: Move futex-internal.c into main nptl directory
@ 2021-02-22 17:31 Florian Weimer
  0 siblings, 0 replies; only message in thread
From: Florian Weimer @ 2021-02-22 17:31 UTC (permalink / raw)
  To: glibc-cvs

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=541e53c9ddd9ef543cc45b66c7597e63fa665414

commit 541e53c9ddd9ef543cc45b66c7597e63fa665414
Author: Florian Weimer <fweimer@redhat.com>
Date:   Mon Feb 22 18:30:52 2021 +0100

    nptl: Move futex-internal.c into main nptl directory
    
    Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

Diff:
---
 nptl/Makefile                           | 3 +++
 {sysdeps/nptl => nptl}/futex-internal.c | 0
 sysdeps/nptl/Makefile                   | 3 +--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nptl/Makefile b/nptl/Makefile
index 94c3873623..5a7558d943 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -97,6 +97,7 @@ libpthread-routines = \
   flockfile \
   ftrylockfile \
   funlockfile \
+  futex-internal \
   herrno \
   libpthread-compat \
   lowlevellock \
@@ -314,6 +315,8 @@ CFLAGS-fsync.c += -fexceptions -fasynchronous-unwind-tables
 
 CFLAGS-pt-system.c += -fexceptions
 
+CFLAGS-futex-internal.c += -fexceptions -fasynchronous-unwind-tables
+
 LDLIBS-tst-once5 = -lstdc++
 CFLAGS-tst-thread_local1.o = -std=gnu++11
 LDLIBS-tst-thread_local1 = -lstdc++
diff --git a/sysdeps/nptl/futex-internal.c b/nptl/futex-internal.c
similarity index 100%
rename from sysdeps/nptl/futex-internal.c
rename to nptl/futex-internal.c
diff --git a/sysdeps/nptl/Makefile b/sysdeps/nptl/Makefile
index bdba75d85f..adcced422b 100644
--- a/sysdeps/nptl/Makefile
+++ b/sysdeps/nptl/Makefile
@@ -17,8 +17,7 @@
 # <https://www.gnu.org/licenses/>.
 
 ifeq ($(subdir),nptl)
-libpthread-sysdep_routines += errno-loc futex-internal
-CFLAGS-futex-internal.c += -fexceptions -fasynchronous-unwind-tables
+libpthread-sysdep_routines += errno-loc
 endif
 
 ifeq ($(subdir),rt)


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-02-22 17:31 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-22 17:31 [glibc] nptl: Move futex-internal.c into main nptl directory Florian Weimer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).