about summary refs log tree commit diff
path: root/nptl/pthread_attr_setstacksize.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-05-11 19:32:43 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-05-11 19:33:20 +0200
commit870218fb30a83c071b53b036d1eb33df7e30397e (patch)
tree41fd5c55d08374dd044b248a8b394fb7a5d97369 /nptl/pthread_attr_setstacksize.c
parent736c57c96cd1fd79905cf0f224ca6e3864eb71b4 (diff)
downloadglibc-870218fb30a83c071b53b036d1eb33df7e30397e.tar.gz
glibc-870218fb30a83c071b53b036d1eb33df7e30397e.tar.xz
glibc-870218fb30a83c071b53b036d1eb33df7e30397e.zip
nptl: Move pthread_attr_setstacksize into libc
The symbol was moved using scripts/move-symbol-to-libc.py.

It is necessary to arrange for a
__libpthread_version_placeholder@GLIBC_2.6 on some of the powerpc
targets.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl/pthread_attr_setstacksize.c')
-rw-r--r--nptl/pthread_attr_setstacksize.c25
1 files changed, 16 insertions, 9 deletions
diff --git a/nptl/pthread_attr_setstacksize.c b/nptl/pthread_attr_setstacksize.c
index 1433cecf94..2dbd981c7f 100644
--- a/nptl/pthread_attr_setstacksize.c
+++ b/nptl/pthread_attr_setstacksize.c
@@ -19,6 +19,7 @@
 #include <errno.h>
 #include <limits.h>
 #include "pthreadP.h"
+#include <shlib-compat.h>
 
 #ifndef NEW_VERNUM
 # define NEW_VERNUM GLIBC_2_3_3
@@ -41,15 +42,22 @@ __pthread_attr_setstacksize (pthread_attr_t *attr, size_t stacksize)
 
   return 0;
 }
+versioned_symbol (libc, __pthread_attr_setstacksize,
+		  pthread_attr_setstacksize, GLIBC_2_34);
+
 
 #if PTHREAD_STACK_MIN == 16384
-strong_alias (__pthread_attr_setstacksize, pthread_attr_setstacksize)
-#else
-# include <shlib-compat.h>
-versioned_symbol (libpthread, __pthread_attr_setstacksize,
-		  pthread_attr_setstacksize, NEW_VERNUM);
+# if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_34)
+compat_symbol (libpthread, __pthread_attr_setstacksize,
+	       pthread_attr_setstacksize, GLIBC_2_1);
+# endif
+#else /* PTHREAD_STACK_MIN != 16384 */
+# if OTHER_SHLIB_COMPAT (libpthread, NEW_VERNUM, GLIBC_2_34)
+compat_symbol (libpthread, __pthread_attr_setstacksize,
+	       pthread_attr_setstacksize, NEW_VERNUM);
+# endif
 
-# if SHLIB_COMPAT(libpthread, GLIBC_2_1, NEW_VERNUM)
+# if OTHER_SHLIB_COMPAT(libpthread, GLIBC_2_1, NEW_VERNUM)
 
 int
 __old_pthread_attr_setstacksize (pthread_attr_t *attr, size_t stacksize)
@@ -73,6 +81,5 @@ __old_pthread_attr_setstacksize (pthread_attr_t *attr, size_t stacksize)
 
 compat_symbol (libpthread, __old_pthread_attr_setstacksize,
 	       pthread_attr_setstacksize, GLIBC_2_1);
-# endif
-
-#endif
+# endif /* OTHER_SHLIB_COMPAT */
+#endif /* PTHREAD_STACK_MIN != 16384 */