[COMMITTED] backends: Swap sys/ptrace.h and asm/ptrace.h include order on s390.

Mark Wielaard mark@klomp.org
Mon Jul 17 22:52:00 GMT 2017


On Tue, Jul 18, 2017 at 01:24:46AM +0300, Dmitry V. Levin wrote:
> I reviewed and approved both of these commits assuming that they brought
> no regressions.  If sys/ptrace.h from glibc 2.25 could be included before
> or after linux/ptrace.h, this shouldn't have changed in glibc 2.26.
> 
> In other words, I think you've spotted a regression that I missed during
> b08a6a0dea63742313ed3d9577c1e2d83436b196 review and that has to be fixed
> in glibc before 2.26 is released.

Aha. So if you look at that patch you see that the same include pattern
that got us in trouble was removed from sysdeps/s390/fpu/fesetenv.c and
the new order is used in the newly added testcase
sysdeps/unix/sysv/linux/s390/tst-ptrace-singleblock.c.

On fedora s390x rawhide (which has a glibc 2.16 pre-release)
including asm/ptrace.h before sys/ptrace.h will cause errors:
https://kojipkgs.fedoraproject.org//work/tasks/4924/20574924/build.log

Cheers,

Mark



More information about the Elfutils-devel mailing list