This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH] S390: Sync ptrace.h with kernel. [BZ #21539]
On Tue, 2017-07-18 at 10:11 -0400, Carlos O'Donell wrote:
> On 07/18/2017 09:39 AM, Dmitry V. Levin wrote:
> > 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:
> >>> 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.
>
> I have not verified that inclusion worked on both orders, if it did, then
> this is indeed a regression.
It used to work either way. We used asm/ptrace.h then sys/ptrace.h on
s390[x] in elfutils. That broke with 2.26 in fedora rawhide. So we
changed it to sys/ptrace.h then asm/ptrace.h. I verified that order
works on both old and new glibc/kernel headers (aka on RHEL7 s390[x] and
fedora rawhide s390x).
> Mark, Is this a problem for Valgrind?
It really shouldn't, but I haven't tried building valgrind on s390x
against glibc git yet. In valgrind we try to avoid including glibc and
kernel headers (valgrind comes with its own mini-libc that we statically
link into the tools and its own kernel headers for the syscall
wrappers).
Cheers,
Mark