]> git.ipfire.org Git - thirdparty/glibc.git/commit
Linux: Use in-tree copy of SO_ constants for !__USE_MISC [BZ #24532]
authorFlorian Weimer <fweimer@redhat.com>
Thu, 18 Jul 2019 18:19:39 +0000 (20:19 +0200)
committerFlorian Weimer <fweimer@redhat.com>
Sun, 21 Jul 2019 20:31:33 +0000 (22:31 +0200)
commit87a66e30606ab0e2e45e17eaa862e83dc6013ed6
treef7006cc5801fbbae6a353bf93746f4b649613727
parent719d81f129206d51bf168076ed1578e7414c2506
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.
ChangeLog
sysdeps/unix/sysv/linux/Makefile
sysdeps/unix/sysv/linux/alpha/bits/socket-constants.h [new file with mode: 0644]
sysdeps/unix/sysv/linux/bits/socket-constants.h [new file with mode: 0644]
sysdeps/unix/sysv/linux/bits/socket.h
sysdeps/unix/sysv/linux/hppa/bits/socket-constants.h [new file with mode: 0644]
sysdeps/unix/sysv/linux/mips/bits/socket-constants.h [new file with mode: 0644]
sysdeps/unix/sysv/linux/powerpc/bits/socket-constants.h [new file with mode: 0644]
sysdeps/unix/sysv/linux/sparc/bits/socket-constants.h [new file with mode: 0644]
sysdeps/unix/sysv/linux/tst-socket-consts.py [new file with mode: 0644]