diff mbox series

[02/35] Fix librt-routines-var issues for !PTHREAD_IN_LIBC

Message ID ad0e4a8507f02f459d9a02c8f954b159df6702c3.1622761828.git.fweimer@redhat.com
State Superseded
Delegated to: Adhemerval Zanella Netto
Headers
Series Linux: Move librt into libc |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent

Commit Message

Florian Weimer June 3, 2021, 11:14 p.m. UTC 
  The variable name was incorrect, and the existing librt-routines
variable needs to be augmented (not assigned) in rt/Makefile.
---
 Makeconfig  | 2 +-
 rt/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Adhemerval Zanella Netto June 17, 2021, 11:07 a.m. UTC | #1 
On 03/06/2021 20:14, Florian Weimer via Libc-alpha wrote:
> The variable name was incorrect, and the existing librt-routines
> variable needs to be augmented (not assigned) in rt/Makefile.

LGTM, thanks.  Is this cause any build issue? I am curious why we haven't
see it before.

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

> ---
>  Makeconfig  | 2 +-
>  rt/Makefile | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Makeconfig b/Makeconfig
> index c3496452b6..6a334fa296 100644
> --- a/Makeconfig
> +++ b/Makeconfig
> @@ -1330,7 +1330,7 @@ libpthread-routines-var = routines
>  librt-routines-var = routines
>  else
>  libpthread-routines-var = libpthread-routines
> -librt-routines-var = libpthread-routines
> +librt-routines-var = librt-routines
>  endif
>  
>  # A sysdeps Makeconfig fragment may set libc-reentrant to yes.
> diff --git a/rt/Makefile b/rt/Makefile
> index d19314b7dc..baec51b40a 100644
> --- a/rt/Makefile
> +++ b/rt/Makefile
> @@ -57,7 +57,7 @@ librt-routines = \
>    timer_gettime \
>    timer_settime \
>  
> -$(librt-routines-var) = \
> +$(librt-routines-var) += \
>  
>  tests := tst-shm tst-timer tst-timer2 \
>  	 tst-aio tst-aio64 tst-aio2 tst-aio3 tst-aio4 tst-aio5 tst-aio6 \
>
Florian Weimer June 17, 2021, 12:19 p.m. UTC | #2 
* Adhemerval Zanella:

> On 03/06/2021 20:14, Florian Weimer via Libc-alpha wrote:
>> The variable name was incorrect, and the existing librt-routines
>> variable needs to be augmented (not assigned) in rt/Makefile.
>
> LGTM, thanks.  Is this cause any build issue? I am curious why we haven't
> see it before.

It's relevant to the subsequent changes.  librt-routines-var wasn't
really used before.

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

Thanks,
Florian
diff mbox series

Patch

diff --git a/Makeconfig b/Makeconfig
index c3496452b6..6a334fa296 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -1330,7 +1330,7 @@  libpthread-routines-var = routines
 librt-routines-var = routines
 else
 libpthread-routines-var = libpthread-routines
-librt-routines-var = libpthread-routines
+librt-routines-var = librt-routines
 endif
 
 # A sysdeps Makeconfig fragment may set libc-reentrant to yes.
diff --git a/rt/Makefile b/rt/Makefile
index d19314b7dc..baec51b40a 100644
--- a/rt/Makefile
+++ b/rt/Makefile
@@ -57,7 +57,7 @@  librt-routines = \
   timer_gettime \
   timer_settime \
 
-$(librt-routines-var) = \
+$(librt-routines-var) += \
 
 tests := tst-shm tst-timer tst-timer2 \
 	 tst-aio tst-aio64 tst-aio2 tst-aio3 tst-aio4 tst-aio5 tst-aio6 \