diff options
| author | Guy-Fleury Iteriteka <gfleury@disroot.org> | 2023-07-16 10:44:09 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-08-24 01:57:11 +0200 |
| commit | 62cf5d2bb3c74aac2f452a77ae0c29c0cc8dde8a (patch) | |
| tree | 9f711d8c3aedc5022f2bcef42e1cc0caa0e6596f | |
| parent | 79de1a0ca28af8f000688dbd51addad78bd804b1 (diff) | |
| download | glibc-62cf5d2bb3c74aac2f452a77ae0c29c0cc8dde8a.tar.gz glibc-62cf5d2bb3c74aac2f452a77ae0c29c0cc8dde8a.tar.xz glibc-62cf5d2bb3c74aac2f452a77ae0c29c0cc8dde8a.zip | |
htl: move pthread_attr_getinheritsched into libc
Signed-off-by: Guy-Fleury Iteriteka <gfleury@disroot.org> Message-Id: <20230716084414.107245-6-gfleury@disroot.org>
| -rw-r--r-- | htl/Makefile | 4 | ||||
| -rw-r--r-- | htl/Versions | 2 | ||||
| -rw-r--r-- | htl/forward.c | 2 | ||||
| -rw-r--r-- | htl/pt-initialize.c | 1 | ||||
| -rw-r--r-- | sysdeps/htl/pthread-functions.h | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/libpthread.abilist | 1 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/x86_64/libpthread.abilist | 1 |
7 files changed, 3 insertions, 10 deletions
diff --git a/htl/Makefile b/htl/Makefile index 9e43e571b7..7d705835de 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -25,7 +25,7 @@ SYSDEPS := lockfile LCLHDRS := libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate \ - pt-attr-getguardsize pt-attr-getinheritsched \ + pt-attr-getguardsize \ pt-attr-getschedpolicy pt-attr-getscope \ pt-attr-getstack pt-attr-getstackaddr pt-attr-getstacksize \ pt-attr-init pt-attr-setdetachstate pt-attr-setguardsize \ @@ -165,7 +165,7 @@ headers := \ distribute := routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-nthreads pt-pthread_self pt-self pt-equal \ - pt-getschedparam pt-setschedparam pt-attr-getschedparam + pt-getschedparam pt-setschedparam pt-attr-getschedparam pt-attr-getinheritsched shared-only-routines = forward extra-libs := libpthread diff --git a/htl/Versions b/htl/Versions index b61fc3f5de..cd1ab1597c 100644 --- a/htl/Versions +++ b/htl/Versions @@ -67,7 +67,7 @@ libpthread { pthread_atfork; pthread_attr_destroy; pthread_attr_getdetachstate; - pthread_attr_getguardsize; pthread_attr_getinheritsched; + pthread_attr_getguardsize; pthread_attr_getschedpolicy; pthread_attr_getscope; pthread_attr_getstack; pthread_attr_getstackaddr; pthread_attr_getstacksize; pthread_attr_init; pthread_attr_setdetachstate; diff --git a/htl/forward.c b/htl/forward.c index 63b5f52275..38b2fcc996 100644 --- a/htl/forward.c +++ b/htl/forward.c @@ -63,8 +63,6 @@ FORWARD (pthread_attr_getdetachstate, FORWARD (pthread_attr_setdetachstate, (pthread_attr_t *attr, int detachstate), (attr, detachstate), 0) -FORWARD (pthread_attr_getinheritsched, - (const pthread_attr_t *attr, int *inherit), (attr, inherit), 0) FORWARD (pthread_attr_setinheritsched, (pthread_attr_t *attr, int inherit), (attr, inherit), 0) diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c index 427b3124e6..a036aed894 100644 --- a/htl/pt-initialize.c +++ b/htl/pt-initialize.c @@ -31,7 +31,6 @@ static const struct pthread_functions pthread_functions = { .ptr_pthread_attr_init = __pthread_attr_init, .ptr_pthread_attr_getdetachstate = __pthread_attr_getdetachstate, .ptr_pthread_attr_setdetachstate = __pthread_attr_setdetachstate, - .ptr_pthread_attr_getinheritsched = __pthread_attr_getinheritsched, .ptr_pthread_attr_setinheritsched = __pthread_attr_setinheritsched, .ptr_pthread_attr_setschedparam = __pthread_attr_setschedparam, .ptr_pthread_attr_getschedpolicy = __pthread_attr_getschedpolicy, diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h index d1cd7a48fa..621b97cf05 100644 --- a/sysdeps/htl/pthread-functions.h +++ b/sysdeps/htl/pthread-functions.h @@ -25,7 +25,6 @@ int __pthread_attr_destroy (pthread_attr_t *); int __pthread_attr_init (pthread_attr_t *); int __pthread_attr_getdetachstate (const pthread_attr_t *, int *); int __pthread_attr_setdetachstate (pthread_attr_t *, int); -int __pthread_attr_getinheritsched (const pthread_attr_t *, int *); int __pthread_attr_setinheritsched (pthread_attr_t *, int); int __pthread_attr_setschedparam (pthread_attr_t *, const struct sched_param *); @@ -74,7 +73,6 @@ struct pthread_functions int (*ptr_pthread_attr_init) (pthread_attr_t *); int (*ptr_pthread_attr_getdetachstate) (const pthread_attr_t *, int *); int (*ptr_pthread_attr_setdetachstate) (pthread_attr_t *, int); - int (*ptr_pthread_attr_getinheritsched) (const pthread_attr_t *, int *); int (*ptr_pthread_attr_setinheritsched) (pthread_attr_t *, int); int (*ptr_pthread_attr_setschedparam) (pthread_attr_t *, const struct sched_param *); diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index 61fa56d08c..d542029ac4 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -25,7 +25,6 @@ GLIBC_2.12 pthread_atfork F GLIBC_2.12 pthread_attr_destroy F GLIBC_2.12 pthread_attr_getdetachstate F GLIBC_2.12 pthread_attr_getguardsize F -GLIBC_2.12 pthread_attr_getinheritsched F GLIBC_2.12 pthread_attr_getschedpolicy F GLIBC_2.12 pthread_attr_getscope F GLIBC_2.12 pthread_attr_getstack F diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index b7ad05e906..88e3b2de14 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -42,7 +42,6 @@ GLIBC_2.38 mtx_unlock F GLIBC_2.38 pthread_attr_destroy F GLIBC_2.38 pthread_attr_getdetachstate F GLIBC_2.38 pthread_attr_getguardsize F -GLIBC_2.38 pthread_attr_getinheritsched F GLIBC_2.38 pthread_attr_getschedpolicy F GLIBC_2.38 pthread_attr_getscope F GLIBC_2.38 pthread_attr_getstack F |