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 /sysdeps/unix/sysv/linux/Makefile | |
| parent | 35e038c1d2ccb3a75395662f9c4f28d85a61444f (diff) | |
| download | glibc-7854ebf8ed18180189c335f6f499fe9322458f0b.zip glibc-7854ebf8ed18180189c335f6f499fe9322458f0b.tar.gz glibc-7854ebf8ed18180189c335f6f499fe9322458f0b.tar.bz2 | |
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 'sysdeps/unix/sysv/linux/Makefile')
| -rw-r--r-- | sysdeps/unix/sysv/linux/Makefile | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index afcdc65..1ab6bcb 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -146,11 +146,21 @@ endif ifeq ($(subdir),socket) sysdep_headers += net/if_ppp.h net/ppp-comp.h \ net/ppp_defs.h net/if_arp.h net/route.h net/ethernet.h \ - net/if_slip.h net/if_packet.h net/if_shaper.h + net/if_slip.h net/if_packet.h net/if_shaper.h \ + bits/socket-constants.h sysdep_routines += cmsg_nxthdr CFLAGS-recvmmsg.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-sendmmsg.c = -fexceptions -fasynchronous-unwind-tables -endif + +tests-special += $(objpfx)tst-socket-consts.out +$(objpfx)tst-socket-consts.out: ../sysdeps/unix/sysv/linux/tst-socket-consts.py + PYTHONPATH=../scripts \ + $(PYTHON) ../sysdeps/unix/sysv/linux/tst-socket-consts.py \ + --cc="$(CC) $(patsubst -DMODULE_NAME=%, \ + -DMODULE_NAME=testsuite, \ + $(CPPFLAGS)) -D_ISOMAC" \ + < /dev/null > $@ 2>&1; $(evaluate-test) +endif # $(subdir) == socket ifeq ($(subdir),sunrpc) sysdep_headers += nfs/nfs.h |