diff options
| author | Florian Weimer <fweimer@redhat.com> | 2019-07-24 10:59:34 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2019-07-24 10:59:34 +0200 |
| commit | 7854ebf8ed18180189c335f6f499fe9322458f0b (patch) | |
| tree | d60e166b1843c7cd1de0d0959f94c8fcaaadd7d0 /ChangeLog | |
| parent | 35e038c1d2ccb3a75395662f9c4f28d85a61444f (diff) | |
| download | glibc-7854ebf8ed18180189c335f6f499fe9322458f0b.tar.gz glibc-7854ebf8ed18180189c335f6f499fe9322458f0b.tar.xz glibc-7854ebf8ed18180189c335f6f499fe9322458f0b.zip | |
Linux: Use in-tree copy of SO_ constants for !__USE_MISC [BZ #24532]
The kernel changes for a 64-bit time_t on 32-bit architectures resulted in <asm/socket.h> indirectly including <linux/posix_types.h>. The latter is not namespace-clean for the POSIX version of <sys/socket.h>. This issue has persisted across several Linux releases, so this commit creates our own copy of the SO_* definitions for !__USE_MISC mode. The new test socket/tst-socket-consts ensures that the copy is consistent with the kernel definitions (which vary across architectures). The test is tricky to get right because CPPFLAGS includes include/libc-symbols.h, which in turn defines _GNU_SOURCE unconditionally. Tested with build-many-glibcs.py. I verified that a discrepancy in the definitions actually results in a failure of the socket/tst-socket-consts test.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 78c3c61d2e..b1d344d3eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,25 @@ +2019-07-24 Florian Weimer <fweimer@redhat.com> + + [BZ #24532] + Linux: Use in-tree copy of SO_ constants for !__USE_MISC. + * sysdeps/unix/sysv/linux/Makefile [$(subdir) == socket] + (sysdep_headers): Add bits/socket-constants.h. + (tests-special): Add tst-socket-consts.out. + (tst-socket-consts.out): New target. + * sysdeps/unix/sysv/linux/bits/socket.h: Remove macro tracking + around <asm/unistd.h>. + [__USE_MISC]: Include <bits/types/time_t.h> before <asm/socket.h>. + [!__USE_MISC]: Include <sys/socket-constants.h> instead of + <asm/socket.h>. + * sysdeps/unix/sysv/linux/bits/tst-socket-consts.py: New file. + * sysdeps/unix/sysv/linux/bits/socket-constants.h: Likewise. + * sysdeps/unix/sysv/linux/alpha/bits/socket-constants.h: Likewise. + * sysdeps/unix/sysv/linux/hppa/bits/socket-constants.h: Likewise. + * sysdeps/unix/sysv/linux/mips/bits/socket-constants.h: Likewise. + * sysdeps/unix/sysv/linux/powerpc/bits/socket-constants.h: + Likewise. + * sysdeps/unix/sysv/linux/sparc/bits/socket-constants.h: Likewise. + 2019-07-23 Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com> [BZ #24794] |