From patchwork Thu Jun 18 20:35:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 486489 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 29C97140326 for ; Fri, 19 Jun 2015 06:35:24 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=sourceware.org header.i=@sourceware.org header.b=EYxWqwj5; 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:date:from:to:subject:message-id:mime-version :content-type; q=dns; s=default; b=GXpVPM/mNoCOVHFgqb0uArPONXBd1 uDc5Rw/TALWSUO2NgJG/HTAqODhy6mXBfpkvGd1qghWhHBIzQzCyQOx7GTfqFMpL WqaY1BDs8pF6uVN7OahD2CjOdVCmTZ2NLuWD978aEQSkTOOObRoEx1XvQAUydgWk yyVO7wlCTxG6ig= 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:date:from:to:subject:message-id:mime-version :content-type; s=default; bh=B0cyJXVgaQ58vpvQM81Z3f1Oy/A=; b=EYx Wqwj5TmUQZSDL2ohm3BTvfVsZYCf7TQtTXIWV3ys/474p6xUbI75rhJCDLJnmHPi mfVYW3CT5BpYuCPf92gZmPJZYodB/oLXSmRcariMNqtTaFgiv+FHW8FwLqY0NK6K eZ+sEoJgnZnIWzbErkOdVGUFtYlXKmqrKM+sLe1g= Received: (qmail 8916 invoked by alias); 18 Jun 2015 20:35:19 -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 8896 invoked by uid 89); 18 Jun 2015 20:35:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Date: Thu, 18 Jun 2015 20:35:11 +0000 From: Joseph Myers To: Subject: Fix include/bits/ipc.h for header conformance tests Message-ID: User-Agent: Alpine 2.10 (DEB 1266 2009-07-14) MIME-Version: 1.0 Ten conformtest failures arise from the internal header include/bits/ipc.h failing to condition internal declarations, outside the public namespace of headers including bits/ipc.h, on [!_ISOMAC]. This patch adds the usual conditionals to that header. (Ten further failures for other headers including bits/ipc.h remain because of other conformance issues in those headers.) Tested for x86_64 and x86 (testsuite, and that installed stripped shared libraries are unchanged by the patch). 2015-06-18 Joseph Myers * include/bits/ipc.h [_ISOMAC]: Disable all header contents except #include_next. * conform/Makefile (test-xfail-XPG3/sys/msg.h/conform): Remove variable. (test-xfail-XPG3/sys/shm.h/conform): Likewise. (test-xfail-XPG4/sys/msg.h/conform): Likewise. (test-xfail-XPG4/sys/shm.h/conform): Likewise. (test-xfail-UNIX98/sys/msg.h/conform): Likewise. (test-xfail-UNIX98/sys/shm.h/conform): Likewise. (test-xfail-XOPEN2K/sys/msg.h/conform): Likewise. (test-xfail-XOPEN2K/sys/shm.h/conform): Likewise. (test-xfail-XOPEN2K8/sys/msg.h/conform): Likewise. (test-xfail-XOPEN2K8/sys/shm.h/conform): Likewise. diff --git a/conform/Makefile b/conform/Makefile index 30eaa64..4acafa3 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -179,9 +179,7 @@ test-xfail-XPG3/stdio.h/conform = yes test-xfail-XPG3/stdlib.h/conform = yes test-xfail-XPG3/string.h/conform = yes test-xfail-XPG3/sys/ipc.h/conform = yes -test-xfail-XPG3/sys/msg.h/conform = yes test-xfail-XPG3/sys/sem.h/conform = yes -test-xfail-XPG3/sys/shm.h/conform = yes test-xfail-XPG3/sys/stat.h/conform = yes test-xfail-XPG3/sys/types.h/conform = yes test-xfail-XPG3/sys/wait.h/conform = yes @@ -198,9 +196,7 @@ test-xfail-XPG4/stdio.h/conform = yes test-xfail-XPG4/stdlib.h/conform = yes test-xfail-XPG4/stropts.h/conform = yes test-xfail-XPG4/sys/ipc.h/conform = yes -test-xfail-XPG4/sys/msg.h/conform = yes test-xfail-XPG4/sys/sem.h/conform = yes -test-xfail-XPG4/sys/shm.h/conform = yes test-xfail-XPG4/sys/socket.h/conform = yes test-xfail-XPG4/sys/stat.h/conform = yes test-xfail-XPG4/sys/time.h/conform = yes @@ -221,9 +217,7 @@ test-xfail-UNIX98/stdio.h/conform = yes test-xfail-UNIX98/stdlib.h/conform = yes test-xfail-UNIX98/stropts.h/conform = yes test-xfail-UNIX98/sys/ipc.h/conform = yes -test-xfail-UNIX98/sys/msg.h/conform = yes test-xfail-UNIX98/sys/sem.h/conform = yes -test-xfail-UNIX98/sys/shm.h/conform = yes test-xfail-UNIX98/sys/socket.h/conform = yes test-xfail-UNIX98/sys/time.h/conform = yes test-xfail-UNIX98/sys/wait.h/conform = yes @@ -241,9 +235,7 @@ test-xfail-XOPEN2K/stdarg.h/conform = yes test-xfail-XOPEN2K/stdio.h/conform = yes test-xfail-XOPEN2K/stropts.h/conform = yes test-xfail-XOPEN2K/sys/ipc.h/conform = yes -test-xfail-XOPEN2K/sys/msg.h/conform = yes test-xfail-XOPEN2K/sys/sem.h/conform = yes -test-xfail-XOPEN2K/sys/shm.h/conform = yes test-xfail-XOPEN2K/sys/socket.h/conform = yes test-xfail-XOPEN2K/sys/wait.h/conform = yes test-xfail-XOPEN2K/termios.h/conform = yes @@ -265,10 +257,8 @@ test-xfail-XOPEN2K8/signal.h/conform = yes test-xfail-XOPEN2K8/stdio.h/conform = yes test-xfail-XOPEN2K8/stropts.h/conform = yes test-xfail-XOPEN2K8/sys/ipc.h/conform = yes -test-xfail-XOPEN2K8/sys/msg.h/conform = yes test-xfail-XOPEN2K8/sys/select.h/conform = yes test-xfail-XOPEN2K8/sys/sem.h/conform = yes -test-xfail-XOPEN2K8/sys/shm.h/conform = yes test-xfail-XOPEN2K8/sys/socket.h/conform = yes test-xfail-XOPEN2K8/sys/time.h/conform = yes test-xfail-XOPEN2K8/sys/wait.h/conform = yes diff --git a/include/bits/ipc.h b/include/bits/ipc.h index 481fe91..eb4a7bd 100644 --- a/include/bits/ipc.h +++ b/include/bits/ipc.h @@ -1,5 +1,6 @@ #include_next +#ifndef _ISOMAC __BEGIN_DECLS /* The actual system call: all functions are multiplexed by this. */ @@ -10,14 +11,15 @@ __END_DECLS /* The codes for the functions to use the multiplexer `__syscall_ipc'. */ -#define IPCOP_semop 1 -#define IPCOP_semget 2 -#define IPCOP_semctl 3 -#define IPCOP_msgsnd 11 -#define IPCOP_msgrcv 12 -#define IPCOP_msgget 13 -#define IPCOP_msgctl 14 -#define IPCOP_shmat 21 -#define IPCOP_shmdt 22 -#define IPCOP_shmget 23 -#define IPCOP_shmctl 24 +# define IPCOP_semop 1 +# define IPCOP_semget 2 +# define IPCOP_semctl 3 +# define IPCOP_msgsnd 11 +# define IPCOP_msgrcv 12 +# define IPCOP_msgget 13 +# define IPCOP_msgctl 14 +# define IPCOP_shmat 21 +# define IPCOP_shmdt 22 +# define IPCOP_shmget 23 +# define IPCOP_shmctl 24 +#endif