From patchwork Fri Jun 13 08:01:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 1486 Received: (qmail 31695 invoked by alias); 13 Jun 2014 08:02:06 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 31679 invoked by uid 89); 13 Jun 2014 08:02:04 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: plane.gmane.org To: libc-alpha@sourceware.org From: Stefan Liebler Subject: Re: [COMMITTED PATCH] Get rid of nptl/sysdeps/pthread/ subdirectory Date: Fri, 13 Jun 2014 10:01:17 +0200 Lines: 71 Message-ID: References: <20140612210250.0A4C82C3978@topped-with-meat.com> Mime-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 In-Reply-To: <20140612210250.0A4C82C3978@topped-with-meat.com> On 06/12/2014 11:02 PM, Roland McGrath wrote: > This directory never should have existed even for the add-on. This > conflated three different kinds of things, which are now separated: > > * Things that depend only on the public pthread.h API > -> sysdeps/pthread/ > * Things that depend on NPTL implementation details > -> sysdeps/nptl/ > * Parts of the NPTL implementation itself > -> nptl/ (include/ for list.h) > > Verified on x86_64-linux-gnu and i686-linux-gnu that there are no code > changes except for libpthread.so getting some offset adjustments because > the assertion file name strings in its .rodata changed. > > I've also grepped for potentially affected #include's for other > configurations. There are two, both of which are moot after other pending > patches on the roland/nptl-ia64 and roland/nptl-microblaze branches. So > the ia64 and microblaze builds are broken now, and will be fixed by their > maintainers reviewing and approving the machine-specific patches I have > already posted. > > > Thanks, > Roland > Hi Roland, the test begin-end-check fails after this patch due to missing file: nptl/sysdeps/pthread/pthread.h. I have adjusted the Makefile variable installed-headers to the new location of the header. Tested on s390. Please retest and commit. Bye --- 2014-06-13 Stefan Liebler * Makefile (installed-header): Adjust path of pthread.h header. --- diff --git a/Makefile b/Makefile index ad18034..51ff5ca 100644 --- a/Makefile +++ b/Makefile @@ -284,7 +284,7 @@ installed-headers = argp/argp.h assert/assert.h catgets/nl_types.h \ malloc/obstack.h malloc/mcheck.h math/math.h \ math/complex.h math/fenv.h math/tgmath.h misc/sys/uio.h \ $(wildcard nis/rpcsvc/*.h) nptl_db/thread_db.h \ - nptl/sysdeps/pthread/pthread.h nptl/semaphore.h \ + sysdeps/nptl/pthread.h nptl/semaphore.h \ nss/nss.h posix/sys/utsname.h posix/sys/times.h \ posix/sys/wait.h posix/sys/types.h posix/unistd.h \ posix/glob.h posix/regex.h posix/wordexp.h posix/fnmatch.h\