nptl: Move pthread_attr_getaffinity_np into libc

The symbol was moved using scripts/move-symbol-to-libc.py.

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

64 files changed, 93 insertions, 50 deletions

diff --git a/nptl/Makefile b/nptl/Makefile
index f81b2f64df..d55f8c6b00 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -61,6 +61,7 @@ routines = \
   pthread_attr_copy \
   pthread_attr_destroy \
   pthread_attr_extension \
+  pthread_attr_getaffinity \
   pthread_attr_getdetachstate \
   pthread_attr_getinheritsched \
   pthread_attr_getschedparam \
@@ -192,7 +193,6 @@ libpthread-routines = \
   libpthread-compat \
   nptl-init \
   pt-interp \
-  pthread_attr_getaffinity \
   pthread_attr_getguardsize \
   pthread_attr_getstack \
   pthread_attr_getstackaddr \
diff --git a/nptl/Versions b/nptl/Versions
index 8c3e825083..d36c2b12ea 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -144,6 +144,7 @@ libc {
   GLIBC_2.3.3 {
     __pthread_cleanup_routine;
     __pthread_unwind_next;
+    pthread_attr_getaffinity_np;
     pthread_attr_setaffinity_np;
     pthread_barrierattr_getpshared;
     pthread_condattr_getclock;
@@ -153,6 +154,7 @@ libc {
     pthread_tryjoin_np;
   }
   GLIBC_2.3.4 {
+    pthread_attr_getaffinity_np;
     pthread_attr_setaffinity_np;
   }
   GLIBC_2.4 {
@@ -237,6 +239,7 @@ libc {
     mtx_timedlock;
     mtx_trylock;
     mtx_unlock;
+    pthread_attr_getaffinity_np;
     pthread_barrier_destroy;
     pthread_barrier_init;
     pthread_barrier_wait;
@@ -430,12 +433,10 @@ libpthread {
     __pthread_register_cancel_defer;
     __pthread_unregister_cancel;
     __pthread_unregister_cancel_restore;
-    pthread_attr_getaffinity_np;
     pthread_setaffinity_np;
   }
 
   GLIBC_2.3.4 {
-    pthread_attr_getaffinity_np;
     pthread_getaffinity_np;
     pthread_setaffinity_np;
     pthread_setschedprio;
diff --git a/nptl/pthread_attr_getaffinity.c b/nptl/pthread_attr_getaffinity.c
index 68403ebc25..0b1ca4cef3 100644
--- a/nptl/pthread_attr_getaffinity.c
+++ b/nptl/pthread_attr_getaffinity.c
@@ -57,10 +57,14 @@ __pthread_attr_getaffinity_new (const pthread_attr_t *attr, size_t cpusetsize,
   return 0;
 }
 versioned_symbol (libpthread, __pthread_attr_getaffinity_new,
-		  pthread_attr_getaffinity_np, GLIBC_2_3_4);
+		  pthread_attr_getaffinity_np, GLIBC_2_34);
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_3_4, GLIBC_2_34)
+compat_symbol (libpthread, __pthread_attr_getaffinity_new,
+	       pthread_attr_getaffinity_np, GLIBC_2_3_4);
+#endif
 
 
-#if SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_3_4)
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_3_4)
 int
 __pthread_attr_getaffinity_old (const pthread_attr_t *attr, cpu_set_t *cpuset)
 {
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index 2d06bfef34..d58913efca 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -1443,6 +1443,7 @@ GLIBC_2.17 pselect F
 GLIBC_2.17 psiginfo F
 GLIBC_2.17 psignal F
 GLIBC_2.17 pthread_attr_destroy F
+GLIBC_2.17 pthread_attr_getaffinity_np F
 GLIBC_2.17 pthread_attr_getdetachstate F
 GLIBC_2.17 pthread_attr_getinheritsched F
 GLIBC_2.17 pthread_attr_getschedparam F
@@ -2320,6 +2321,7 @@ GLIBC_2.34 mtx_lock F
 GLIBC_2.34 mtx_timedlock F
 GLIBC_2.34 mtx_trylock F
 GLIBC_2.34 mtx_unlock F
+GLIBC_2.34 pthread_attr_getaffinity_np F
 GLIBC_2.34 pthread_barrier_destroy F
 GLIBC_2.34 pthread_barrier_init F
 GLIBC_2.34 pthread_barrier_wait F
diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
index 2b21af13ad..bdfd3a52d5 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
@@ -3,7 +3,6 @@ GLIBC_2.17 __pthread_register_cancel F
 GLIBC_2.17 __pthread_register_cancel_defer F
 GLIBC_2.17 __pthread_unregister_cancel F
 GLIBC_2.17 __pthread_unregister_cancel_restore F
-GLIBC_2.17 pthread_attr_getaffinity_np F
 GLIBC_2.17 pthread_attr_getguardsize F
 GLIBC_2.17 pthread_attr_getstack F
 GLIBC_2.17 pthread_attr_getstackaddr F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index 8f1c1368ad..78a0b961ea 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -2281,6 +2281,7 @@ GLIBC_2.3.3 inet6_option_next F
 GLIBC_2.3.3 inet6_option_space F
 GLIBC_2.3.3 nftw F
 GLIBC_2.3.3 nftw64 F
+GLIBC_2.3.3 pthread_attr_getaffinity_np F
 GLIBC_2.3.3 pthread_attr_setaffinity_np F
 GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
@@ -2334,6 +2335,7 @@ GLIBC_2.3.4 __vsprintf_chk F
 GLIBC_2.3.4 __xpg_strerror_r F
 GLIBC_2.3.4 getipv4sourcefilter F
 GLIBC_2.3.4 getsourcefilter F
+GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_attr_setaffinity_np F
 GLIBC_2.3.4 pthread_getaffinity_np F
 GLIBC_2.3.4 regexec F
@@ -2407,6 +2409,7 @@ GLIBC_2.34 mtx_lock F
 GLIBC_2.34 mtx_timedlock F
 GLIBC_2.34 mtx_trylock F
 GLIBC_2.34 mtx_unlock F
+GLIBC_2.34 pthread_attr_getaffinity_np F
 GLIBC_2.34 pthread_barrier_destroy F
 GLIBC_2.34 pthread_barrier_init F
 GLIBC_2.34 pthread_barrier_wait F
diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
index 56ac3b7e71..2bd86d6130 100644
--- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
@@ -27,11 +27,9 @@ GLIBC_2.3.3 __pthread_register_cancel F
 GLIBC_2.3.3 __pthread_register_cancel_defer F
 GLIBC_2.3.3 __pthread_unregister_cancel F
 GLIBC_2.3.3 __pthread_unregister_cancel_restore F
-GLIBC_2.3.3 pthread_attr_getaffinity_np F
 GLIBC_2.3.3 pthread_attr_setstack F
 GLIBC_2.3.3 pthread_attr_setstacksize F
 GLIBC_2.3.3 pthread_setaffinity_np F
-GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 pthread_setschedprio F
 GLIBC_2.30 __libpthread_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/s