From: Florian Weimer <fweimer@redhat.com>
Date: Mon, 22 Feb 2021 17:30:52 +0000 (+0100)
Subject: nptl: Move futex-internal.c into main nptl directory
X-Git-Tag: glibc-2.34~918
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=541e53c9ddd9ef543cc45b66c7597e63fa665414;p=thirdparty%2Fglibc.git

nptl: Move futex-internal.c into main nptl directory

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
---

diff --git a/nptl/Makefile b/nptl/Makefile
index 94c38736231..5a7558d9430 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 bdba75d85f9..adcced422be 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)