From patchwork Thu Jun 1 15:06:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zack Weinberg X-Patchwork-Id: 769779 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wdrKh06lKz9s8J for ; Fri, 2 Jun 2017 01:07:03 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="xTUY+SVA"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-transfer-encoding; q=dns; s=default; b=C6Im92NQ88ntuEwb BAwb4c7vi7xJeU4sghDEOmgerz12prYx/GAZLr4sxNyNPbjk8IT/U4s6szRpLf2E skODwps8hAujSSztFpePHV44k56HfpneDbX1MdXpz+HNWEhV5RqZcLkQ+RRfXlQ3 hZ+JTj7/Pdn/SifToAbi4sCwQrw= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=default; bh=z2aFjNzl++rfP9zOpI1AoG tajQU=; b=xTUY+SVAE5ziH9pRsMqcomUKnPm4wYTku2mzHchsLCGjXBlALs9GVY 32XizlOtiYkylqUgwnbOa5gJ5Tu2LE9aReeDGY0Zg6orTY3ev/L1MkMU6NgQDrek UHEcsRWh+6WTuu6Mis6FNNrWuk58Aex54nvssT4XYFDDuHCt5sA+I= Received: (qmail 39716 invoked by alias); 1 Jun 2017 15:06:52 -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 39652 invoked by uid 89); 1 Jun 2017 15:06:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RP_MATCHES_RCVD, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy=HContent-Transfer-Encoding:8bit X-HELO: mailbackend.panix.com From: Zack Weinberg To: libc-alpha@sourceware.org Subject: [PATCH COMMITTED] Add shim header for bits/syscall.h. Date: Thu, 1 Jun 2017 11:06:51 -0400 Message-Id: <20170601150651.20430-1-zackw@panix.com> MIME-Version: 1.0 On Linux-based configurations, bits/syscall.h is a generated file. To avoid build-ordering problems, the Linux sys/syscall.h only includes bits/syscall.h if _LIBC is not defined. After the _ISOMAC-testsuite changes, this means any test case that includes sys/syscall.h tries to pull in bits/syscall.h. This would be fine, because it'll definitely have been generated by the time we start compiling tests, except that the generated /misc/bits/syscall.h is not visible in the include path, because nothing needed it till now. So we either get the bits/syscall.h from the host system, or the build fails. The fix is simple: add a shim header for bits/syscall.h. I put it in sysdeps/unix/sysv/linux/include instead of the top-level include/ because bits/syscall.h doesn't exist at all on other configurations as far as I can tell. This is known to affect nptl/tst-cond2[45]. Thanks to John David Anglin for noticing the problem. [BZ #21514] * sysdeps/unix/sysv/linux/include/bits/syscall.h: New shim header pointing to the generated file in /misc/bits/syscall.h. --- ChangeLog | 6 ++++++ sysdeps/unix/sysv/linux/include/bits/syscall.h | 3 +++ 2 files changed, 9 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/include/bits/syscall.h diff --git a/ChangeLog b/ChangeLog index d56331a06d..5c54da8a12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-06-01 Zack Weinberg + + [BZ #21514] + * sysdeps/unix/sysv/linux/include/bits/syscall.h: New shim header + pointing to the generated file in /misc/bits/syscall.h. + 2017-06-01 Joseph Myers [BZ #21457] diff --git a/sysdeps/unix/sysv/linux/include/bits/syscall.h b/sysdeps/unix/sysv/linux/include/bits/syscall.h new file mode 100644 index 0000000000..3e60262486 --- /dev/null +++ b/sysdeps/unix/sysv/linux/include/bits/syscall.h @@ -0,0 +1,3 @@ +/* The real bits/syscall.h is generated during the build, in + $(objdir)/misc/bits. */ +#include