From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 48) id 89F2138358BA; Wed, 14 Dec 2022 07:53:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 89F2138358BA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1671004391; bh=bPFW77Il/t77MtOeSNSQBicdxQZV2Fa1vRN4SyOzWvE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ZFVyUwQOo6PKL00laEbjwW0AheWS6KxV2oTt2fe5x0Cdzm09b/8DNcS7rFtvHhhKv 31I8oVj/hi1KmHWgKiCHWQlMAIiez59Q7AeJp5oMZL/WvVRAtVf2S9a1r67+ZBc1aR zL1bmBFL2yrBZ4l3fm+PiUAQpeL1YnJqloKWomVA= From: "glaubitz at physik dot fu-berlin.de" To: glibc-bugs@sourceware.org Subject: [Bug libc/29899] Fix for bz#20305 broke glibc on alpha-linux-gnu Date: Wed, 14 Dec 2022 07:53:10 +0000 X-Bugzilla-Reason: CC X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: glibc X-Bugzilla-Component: libc X-Bugzilla-Version: 2.34 X-Bugzilla-Keywords: X-Bugzilla-Severity: normal X-Bugzilla-Who: glaubitz at physik dot fu-berlin.de X-Bugzilla-Status: WAITING X-Bugzilla-Resolution: X-Bugzilla-Priority: P2 X-Bugzilla-Assigned-To: unassigned at sourceware dot org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: http://sourceware.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 List-Id: https://sourceware.org/bugzilla/show_bug.cgi?id=3D29899 --- Comment #5 from John Paul Adrian Glaubitz --- This is the minimum change directly on top the commit that fixes the problem for me: diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c index bd5066fe3b..bc45a6e9d3 100644 --- a/elf/dl-sysdep.c +++ b/elf/dl-sysdep.c @@ -115,10 +115,10 @@ _dl_sysdep_start (void **start_argptr, user_entry =3D (ElfW(Addr)) ENTRY_POINT; GLRO(dl_platform) =3D NULL; /* Default to nothing known about the platfo= rm.=20 */ - /* NB: Default to a constant CONSTANT_MINSIGSTKSZ. */ - _Static_assert (__builtin_constant_p (CONSTANT_MINSIGSTKSZ), - "CONSTANT_MINSIGSTKSZ is constant"); - GLRO(dl_minsigstacksize) =3D CONSTANT_MINSIGSTKSZ; + /* /\* NB: Default to a constant CONSTANT_MINSIGSTKSZ. *\/ */ + /* _Static_assert (__builtin_constant_p (CONSTANT_MINSIGSTKSZ), */ + /* "CONSTANT_MINSIGSTKSZ is constant"); */ + /* GLRO(dl_minsigstacksize) =3D CONSTANT_MINSIGSTKSZ; */ for (av =3D GLRO(dl_auxv); av->a_type !=3D AT_NULL; set_seen (av++)) switch (av->a_type) @@ -184,9 +184,9 @@ _dl_sysdep_start (void **start_argptr, case AT_RANDOM: _dl_random =3D (void *) av->a_un.a_val; break; - case AT_MINSIGSTKSZ: - GLRO(dl_minsigstacksize) =3D av->a_un.a_val; - break; + /* case AT_MINSIGSTKSZ: */ + /* GLRO(dl_minsigstacksize) =3D av->a_un.a_val; */ + /* break; */ DL_PLATFORM_AUXV } diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 9720a4e446..9ead714718 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -536,8 +536,8 @@ struct rtld_global_ro /* Cached value of `getpagesize ()'. */ EXTERN size_t _dl_pagesize; - /* Cached value of `sysconf (_SC_MINSIGSTKSZ)'. */ - EXTERN size_t _dl_minsigstacksize; + /* /\* Cached value of `sysconf (_SC_MINSIGSTKSZ)'. *\/ */ + /* EXTERN size_t _dl_minsigstacksize; */ /* Do we read from ld.so.cache? */ EXTERN int _dl_inhibit_cache; diff --git a/sysdeps/unix/sysv/linux/sysconf.c b/sysdeps/unix/sysv/linux/sysconf.c index 366fcef01e..5a5c89f80e 100644 --- a/sysdeps/unix/sysv/linux/sysconf.c +++ b/sysdeps/unix/sysv/linux/sysconf.c @@ -77,12 +77,12 @@ __sysconf (int name) } break; - case _SC_MINSIGSTKSZ: - assert (GLRO(dl_minsigstacksize) !=3D 0); - return GLRO(dl_minsigstacksize); + /* case _SC_MINSIGSTKSZ: */ + /* assert (GLRO(dl_minsigstacksize) !=3D 0); */ + /* return GLRO(dl_minsigstacksize); */ - case _SC_SIGSTKSZ: - return sysconf_sigstksz (); + /* case _SC_SIGSTKSZ: */ + /* return sysconf_sigstksz (); */ default: break; So, my suspicion is that adding the variable _dl_minsigstacksize to struct rtld_global_ro {} breaks the ABI on Alpha. --=20 You are receiving this mail because: You are on the CC list for the bug.=