On Tue, Jul 18, 2017 at 09:31:49AM -0400, Carlos O'Donell wrote: > On 07/18/2017 06:20 AM, Dmitry V. Levin wrote: > > Mark Wielaard has spotted [1] a regression that I missed during review. > > After this change, this test case fails to compile with the following > > diagnostics: > > > > $ gcc -c -xc -o/dev/null - <<'EOF' > > #include > > #include > > EOF > > This is a linux/glibc header coordination issue. Not really, this is a new issue since glibc-2.25. > https://sourceware.org/glibc/wiki/Synchronizing_Headers This project doesn't appear to be alive, unfortunately. > > The following change fixes this and similar compilation issues that arise > > when sys/ptrace.h is included after linux/ptrace.h: > > This is a known conflict, and needs to be fixed properly using libc-compat.h > on the kernel side and the appropriate defines on the glibc side. No, there was no conflict between asm/ptrace.h and sys/ptrace.h on s390 in glibc-2.25, and we should avoid introducing new conflicts. -- ldv