From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 46106 invoked by alias); 18 Jul 2017 14:40:05 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 46078 invoked by uid 89); 18 Jul 2017 14:40:04 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.9 required=5.0 tests=BAYES_00,KAM_LAZY_DOMAIN_SECURITY autolearn=no version=3.3.2 spammy= X-HELO: gnu.wildebeest.org Message-ID: <1500388801.14595.393.camel@klomp.org> Subject: Re: [PATCH] S390: Sync ptrace.h with kernel. [BZ #21539] From: Mark Wielaard To: Carlos O'Donell Cc: libc-alpha@sourceware.org Date: Tue, 18 Jul 2017 14:40:00 -0000 In-Reply-To: <1500388111.14595.388.camel@klomp.org> References: <20170613200522.GA14306@altlinux.org> <20170718102039.GA20971@altlinux.org> <25569a51-e43c-9697-78e3-c319c9048763@redhat.com> <20170718133950.GA23830@altlinux.org> <1500388111.14595.388.camel@klomp.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 X-SW-Source: 2017-07/txt/msg00649.txt.bz2 On Tue, 2017-07-18 at 16:28 +0200, Mark Wielaard wrote: > 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: > > >>=20=20 > > >> 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. > > >=20 > > > No, there was no conflict between asm/ptrace.h and sys/ptrace.h on s3= 90 > > > in glibc-2.25, and we should avoid introducing new conflicts. > >=20=20 > > I have not verified that inclusion worked on both orders, if it did, th= en > > this is indeed a regression. >=20 > 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). One more note. This really is only an issue for s390x since asm/ptrace.h provides ptrace_area which is needed to use PTRACE_PEEKUSR_AREA. On other architectures you only need sys/ptrace.h so it doesn't really matter whether you can include them both. See also the glibc testcase sysdeps/unix/sysv/linux/s390/tst-ptrace-singleblock.c which also needs to include both. Cheers, Mark