rt: Lexicographically sort Versions file; librt-routines in Makefile

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

diff --git a/rt/Makefile b/rt/Makefile
index 797f2da51e8b96911621b4ef385239862c295bc7..b0d887202d8e0e2bff6a6e3fd8dc99c220f4b936 100644 (file)
--- 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 84d1345420dc4dc486ad41040b23fae2b0274b03..f151f85ef6351cd278ebc87a9a961038322e8134 100644 (file)
--- 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;