From 541e53c9ddd9ef543cc45b66c7597e63fa665414 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 22 Feb 2021 18:30:52 +0100 Subject: [PATCH] nptl: Move futex-internal.c into main nptl directory Reviewed-by: Adhemerval Zanella --- nptl/Makefile | 3 +++ {sysdeps/nptl => nptl}/futex-internal.c | 0 sysdeps/nptl/Makefile | 3 +-- 3 files changed, 4 insertions(+), 2 deletions(-) rename {sysdeps/nptl => nptl}/futex-internal.c (100%) 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 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 bdba75d..adcced4 100644 --- a/sysdeps/nptl/Makefile +++ b/sysdeps/nptl/Makefile @@ -17,8 +17,7 @@ # . 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) -- 2.7.4