diff options
| author | Florian Weimer <fweimer@redhat.com> | 2023-04-28 17:07:38 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2023-04-28 18:52:41 +0200 |
| commit | 0ea8174d62263c2679c95c0d215d2627e560f7aa (patch) | |
| tree | 152fa5bc26b21e44b389d7d2ef97503e98ee5c9d /gmon/gmon.c | |
| parent | f1b15d2005f5125529171db3be39026a1157c2a8 (diff) | |
| download | glibc-0ea8174d62263c2679c95c0d215d2627e560f7aa.tar.gz | |
gmon: Revert addition of tunables to preserve GLIBC_PRIVATE ABIrelease/2.34/master
Otherwise, processes are likely to crash during concurrent updates
to a new glibc version on the stable release branch.
The test gmon/tst-mcount-overflow depends on those tunables, so
it has to be removed as well.
Diffstat (limited to 'gmon/gmon.c')
| -rw-r--r-- | gmon/gmon.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/gmon/gmon.c b/gmon/gmon.c index 5e99a7351d..97be1f72ca 100644 --- a/gmon/gmon.c +++ b/gmon/gmon.c @@ -46,11 +46,6 @@ #include <libc-internal.h> #include <not-cancel.h> -#if HAVE_TUNABLES -# define TUNABLE_NAMESPACE gmon -# include <elf/dl-tunables.h> -#endif - #ifdef PIC # include <link.h> @@ -130,20 +125,9 @@ __monstartup (u_long lowpc, u_long highpc) struct gmonparam *p = &_gmonparam; long int minarcs, maxarcs; -#if HAVE_TUNABLES - /* Read minarcs/maxarcs tunables. */ - minarcs = TUNABLE_GET (minarcs, int32_t, NULL); - maxarcs = TUNABLE_GET (maxarcs, int32_t, NULL); - if (maxarcs < minarcs) - { - ERR("monstartup: maxarcs < minarcs, setting maxarcs = minarcs\n"); - maxarcs = minarcs; - } -#else /* No tunables, we use hardcoded defaults */ minarcs = MINARCS; maxarcs = MAXARCS; -#endif /* * If we are incorrectly called twice in a row (without an |