diff options
author | Florian Weimer <fweimer@redhat.com> | 2021-02-22 18:30:52 +0100 |
---|---|---|
committer | Florian Weimer <fweimer@redhat.com> | 2021-02-22 18:30:52 +0100 |
commit | 541e53c9ddd9ef543cc45b66c7597e63fa665414 (patch) | |
tree | 40955e1e70744d89b559dc48682ef7c5176a0ac6 | |
parent | f720ce680eb970be2166e4809963d4cd30de182a (diff) | |
download | glibc-541e53c9ddd9ef543cc45b66c7597e63fa665414.zip glibc-541e53c9ddd9ef543cc45b66c7597e63fa665414.tar.gz glibc-541e53c9ddd9ef543cc45b66c7597e63fa665414.tar.bz2 |
nptl: Move futex-internal.c into main nptl directory
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
-rw-r--r-- | nptl/Makefile | 3 | ||||
-rw-r--r-- | nptl/futex-internal.c (renamed from sysdeps/nptl/futex-internal.c) | 0 | ||||
-rw-r--r-- | sysdeps/nptl/Makefile | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 94c3873..5a7558d 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 index 89b4ba7..89b4ba7 100644 --- a/sysdeps/nptl/futex-internal.c +++ b/nptl/futex-internal.c diff --git a/sysdeps/nptl/Makefile b/sysdeps/nptl/Makefile index bdba75d..adcced4 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) |