[01/35] rt: Lexicographically sort Versions file; librt-routines in Makefile

Message ID e173817d15a20155f9889fd789ea14406e2c323e.1622761828.git.fweimer@redhat.com
State Superseded
Headers show
Series
  • Linux: Move librt into libc
Related show

Commit Message

Greg Kroah-Hartman via Libc-alpha June 3, 2021, 11:14 p.m.
---
 rt/Makefile | 46 ++++++++++++++++++++++++++++++++--------------
 rt/Versions | 45 +++++++++++++++++++++++++++++++++------------
 2 files changed, 65 insertions(+), 26 deletions(-)

-- 
2.31.1

Comments

Greg Kroah-Hartman via Libc-alpha June 17, 2021, 11:05 a.m. | #1
LGTM, thanks.

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


On 03/06/2021 20:14, Florian Weimer via Libc-alpha wrote:
> ---

>  rt/Makefile | 46 ++++++++++++++++++++++++++++++++--------------

>  rt/Versions | 45 +++++++++++++++++++++++++++++++++------------

>  2 files changed, 65 insertions(+), 26 deletions(-)

> 

> diff --git a/rt/Makefile b/rt/Makefile

> index 97c9bbd9de..d19314b7dc 100644

> --- a/rt/Makefile

> +++ b/rt/Makefile

> @@ -24,20 +24,38 @@ include ../Makeconfig

>  

>  headers	:= aio.h mqueue.h bits/mqueue.h bits/mqueue2.h

>  

> -aio-routines   := aio_cancel aio_error aio_fsync aio_misc aio_read	\

> -		  aio_read64 aio_return aio_suspend aio_write		\

> -		  aio_write64 lio_listio lio_listio64 aio_sigqueue	\

> -		  aio_notify

> -timer-routines := timer_create timer_delete timer_getoverr		\

> -		  timer_gettime timer_settime

> -shm-routines   := shm_open shm_unlink

> -mq-routines    := mq_open mq_close mq_unlink mq_getattr mq_setattr	\

> -		  mq_notify mq_send mq_receive mq_timedsend		\

> -		  mq_timedreceive

> -

> -librt-routines = $(aio-routines) \

> -		 $(timer-routines) \

> -		 $(shm-routines) $(mq-routines)

> +librt-routines = \

> +  aio_cancel \

> +  aio_error \

> +  aio_fsync \

> +  aio_misc \

> +  aio_notify \

> +  aio_read \

> +  aio_read64 \

> +  aio_return \

> +  aio_sigqueue \

> +  aio_suspend \

> +  aio_write \

> +  aio_write64 \

> +  lio_listio \

> +  lio_listio64 \

> +  mq_close \

> +  mq_getattr \

> +  mq_notify \

> +  mq_open \

> +  mq_receive \

> +  mq_send \

> +  mq_setattr \

> +  mq_timedreceive \

> +  mq_timedsend \

> +  mq_unlink \

> +  shm_open \

> +  shm_unlink \

> +  timer_create \

> +  timer_delete \

> +  timer_getoverr \

> +  timer_gettime \

> +  timer_settime \

>  

>  $(librt-routines-var) = \

>  

> diff --git a/rt/Versions b/rt/Versions

> index 84d1345420..f151f85ef6 100644

> --- a/rt/Versions

> +++ b/rt/Versions

> @@ -1,22 +1,43 @@

>  librt {

>    GLIBC_2.1 {

> -    # AIO functions.

> -    aio_cancel; aio_cancel64; aio_error; aio_error64; aio_fsync; aio_fsync64;

> -    aio_init; aio_read; aio_read64; aio_return; aio_return64; aio_suspend;

> -    aio_suspend64; aio_write; aio_write64; lio_listio; lio_listio64;

> +    aio_cancel;

> +    aio_cancel64;

> +    aio_error;

> +    aio_error64;

> +    aio_fsync;

> +    aio_fsync64;

> +    aio_init;

> +    aio_read;

> +    aio_read64;

> +    aio_return;

> +    aio_return64;

> +    aio_suspend;

> +    aio_suspend64;

> +    aio_write;

> +    aio_write64;

> +    lio_listio;

> +    lio_listio64;

>    }

>    GLIBC_2.2 {

> -    # s*

> -    shm_open; shm_unlink;

> -

> -    # t*

> -    timer_create; timer_delete; timer_getoverrun; timer_gettime;

> +    shm_open;

> +    shm_unlink;

> +    timer_create;

> +    timer_delete;

> +    timer_getoverrun;

> +    timer_gettime;

>      timer_settime;

>    }

>    GLIBC_2.3.4 {

> -    # m*

> -    mq_open; mq_close; mq_unlink; mq_getattr; mq_setattr;

> -    mq_notify; mq_send; mq_receive; mq_timedsend; mq_timedreceive;

> +    mq_close;

> +    mq_getattr;

> +    mq_notify;

> +    mq_open;

> +    mq_receive;

> +    mq_send;

> +    mq_setattr;

> +    mq_timedreceive;

> +    mq_timedsend;

> +    mq_unlink;

>    }

>    GLIBC_2.7 {

>     __mq_open_2;

>

Patch

diff --git a/rt/Makefile b/rt/Makefile
index 97c9bbd9de..d19314b7dc 100644
--- a/rt/Makefile
+++ b/rt/Makefile
@@ -24,20 +24,38 @@  include ../Makeconfig
 
 headers	:= aio.h mqueue.h bits/mqueue.h bits/mqueue2.h
 
-aio-routines   := aio_cancel aio_error aio_fsync aio_misc aio_read	\
-		  aio_read64 aio_return aio_suspend aio_write		\
-		  aio_write64 lio_listio lio_listio64 aio_sigqueue	\
-		  aio_notify
-timer-routines := timer_create timer_delete timer_getoverr		\
-		  timer_gettime timer_settime
-shm-routines   := shm_open shm_unlink
-mq-routines    := mq_open mq_close mq_unlink mq_getattr mq_setattr	\
-		  mq_notify mq_send mq_receive mq_timedsend		\
-		  mq_timedreceive
-
-librt-routines = $(aio-routines) \
-		 $(timer-routines) \
-		 $(shm-routines) $(mq-routines)
+librt-routines = \
+  aio_cancel \
+  aio_error \
+  aio_fsync \
+  aio_misc \
+  aio_notify \
+  aio_read \
+  aio_read64 \
+  aio_return \
+  aio_sigqueue \
+  aio_suspend \
+  aio_write \
+  aio_write64 \
+  lio_listio \
+  lio_listio64 \
+  mq_close \
+  mq_getattr \
+  mq_notify \
+  mq_open \
+  mq_receive \
+  mq_send \
+  mq_setattr \
+  mq_timedreceive \
+  mq_timedsend \
+  mq_unlink \
+  shm_open \
+  shm_unlink \
+  timer_create \
+  timer_delete \
+  timer_getoverr \
+  timer_gettime \
+  timer_settime \
 
 $(librt-routines-var) = \
 
diff --git a/rt/Versions b/rt/Versions
index 84d1345420..f151f85ef6 100644
--- a/rt/Versions
+++ b/rt/Versions
@@ -1,22 +1,43 @@ 
 librt {
   GLIBC_2.1 {
-    # AIO functions.
-    aio_cancel; aio_cancel64; aio_error; aio_error64; aio_fsync; aio_fsync64;
-    aio_init; aio_read; aio_read64; aio_return; aio_return64; aio_suspend;
-    aio_suspend64; aio_write; aio_write64; lio_listio; lio_listio64;
+    aio_cancel;
+    aio_cancel64;
+    aio_error;
+    aio_error64;
+    aio_fsync;
+    aio_fsync64;
+    aio_init;
+    aio_read;
+    aio_read64;
+    aio_return;
+    aio_return64;
+    aio_suspend;
+    aio_suspend64;
+    aio_write;
+    aio_write64;
+    lio_listio;
+    lio_listio64;
   }
   GLIBC_2.2 {
-    # s*
-    shm_open; shm_unlink;
-
-    # t*
-    timer_create; timer_delete; timer_getoverrun; timer_gettime;
+    shm_open;
+    shm_unlink;
+    timer_create;
+    timer_delete;
+    timer_getoverrun;
+    timer_gettime;
     timer_settime;
   }
   GLIBC_2.3.4 {
-    # m*
-    mq_open; mq_close; mq_unlink; mq_getattr; mq_setattr;
-    mq_notify; mq_send; mq_receive; mq_timedsend; mq_timedreceive;
+    mq_close;
+    mq_getattr;
+    mq_notify;
+    mq_open;
+    mq_receive;
+    mq_send;
+    mq_setattr;
+    mq_timedreceive;
+    mq_timedsend;
+    mq_unlink;
   }
   GLIBC_2.7 {
    __mq_open_2;