diff mbox series

[3/6] nptl: Move futex-internal.c into main nptl directory

Message ID 95d86eec9a14e2453a06114a7d91d64d8be18289.1613582255.git.fweimer@redhat.com
State Committed
Commit 541e53c9ddd9ef543cc45b66c7597e63fa665414
Delegated to: Adhemerval Zanella Netto
Headers show
Series More libpthread removal preparations | expand

Commit Message

Florian Weimer Feb. 17, 2021, 5:21 p.m. UTC
---
 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%)

Comments

Adhemerval Zanella Feb. 22, 2021, 4:34 p.m. UTC | #1
LGTM, thanks.

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

On 17/02/2021 14:21, Florian Weimer via Libc-alpha wrote:
> ---
>  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 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++

Ok.

> 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

Ok.

> 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)
> 

Ok
diff mbox series

Patch

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)