From patchwork Tue Jul 7 10:31:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 492127 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 E862E1402BF for ; Tue, 7 Jul 2015 20:31:33 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=tKnrt9AU; 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:to:from:subject:date:message-id:mime-version :content-type; q=dns; s=default; b=Tct2VNs2L35nW/I8mtw8yhKxiLTaH SjQsOLXqsPUJkEc9J0K/+FIHKIVN03Mepsjd7RdPRtlTOJVCtr/B6Htsr92yKX9T eqbwdxZdLUgwaeH55GQPgb1DLvH9EShBasA4SL3PE37t2glxHHliApPkSutDzRUK ZpGAZO/2+2nd0A= 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:to:from:subject:date:message-id:mime-version :content-type; s=default; bh=GmLNricD0jP5fWDezQV4GlNDnvc=; b=tKn rt9AUY9cFQ6uHn+7BXkemanG2EBQVDkOnTeC+TLnIJ637yHbdfQ7r8qKShVqcsnZ aUpPbSyunIE/4iS7mbRi1ZpNLbMpLzwxintdomFjIXHtDJL3aUm6DW9MEqxutSES grT1VmhfM/3K93xAuoSgGi2XXvZQTEcUhSf3oDtA= Received: (qmail 9167 invoked by alias); 7 Jul 2015 10:31:28 -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 9157 invoked by uid 89); 7 Jul 2015 10:31:27 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL, BAYES_00, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_LOW, 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: [PATCH] S390: Fix sem.h conformance test failures. Date: Tue, 07 Jul 2015 12:31:14 +0200 Lines: 111 Message-ID: Mime-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 Hi, on s390 the following tests are failing: FAIL: conform/UNIX98/sys/sem.h/conform FAIL: conform/XOPEN2K/sys/sem.h/conform FAIL: conform/XOPEN2K8/sys/sem.h/conform FAIL: conform/XPG3/sys/sem.h/conform FAIL: conform/XPG4/sys/sem.h/conform The test out files report: ... Testing for type of member sem_otime... FAIL Member "sem_otime" does not have the correct type. Compiler message: ----------------------------------------------------------------------- conform/UNIX98/sys/sem.h/scratch/sys-sem.h-test.c:3:1: error: unknown type name ‘time_t’ extern time_t b; ^ conform/UNIX98/sys/sem.h/scratch/sys-sem.h-test.c:4:33: error: conflicting types for ‘b’ extern __typeof__ (a.sem_otime) b; ^ conform/UNIX98/sys/sem.h/scratch/sys-sem.h-test.c:3:15: note: previous declaration of ‘b’ was here extern time_t b; ^ ----------------------------------------------------------------------- ... Testing for type of member sem_ctime... FAIL Member "sem_ctime" does not have the correct type. Compiler message: ----------------------------------------------------------------------- conform/UNIX98/sys/sem.h/scratch/sys-sem.h-test.c:3:1: error: unknown type name ‘time_t’ extern time_t b; ^ conform/UNIX98/sys/sem.h/scratch/sys-sem.h-test.c:4:33: error: conflicting types for ‘b’ extern __typeof__ (a.sem_ctime) b; ^ conform/UNIX98/sys/sem.h/scratch/sys-sem.h-test.c:3:15: note: previous declaration of ‘b’ was here extern time_t b; ^ ----------------------------------------------------------------------- ... Testing for type pid_t... FAIL Type "pid_t" not available. Compiler message: ----------------------------------------------------------------------- conform/UNIX98/sys/sem.h/scratch/sys-sem.h-test.c:2:1: error: unknown type name ‘pid_t’ pid_t *a; ^ ----------------------------------------------------------------------- Testing for type time_t... FAIL Type "time_t" not available. Compiler message: ----------------------------------------------------------------------- conform/UNIX98/sys/sem.h/scratch/sys-sem.h-test.c:2:1: error: unknown type name ‘time_t’ time_t *a; ^ ----------------------------------------------------------------------- This patch changes the s390 specific sem.h and includes sys/types.h instead of bits/types.h. All other archs include sys/types.h, too. Including bits/wordsize.h is obselete, because it is already inlcuded in sys/types.h -> bits/types.h. The conformance tests are passing now on s390/s390x. Ok for commit? Bye Stefan --- 2015-07-07 Stefan Liebler * sysdeps/unix/sysv/linux/s390/bits/sem.h: Include sys/types.h instead of bits/types.h. Remove inclusion of bits/wordsize.h. diff --git a/sysdeps/unix/sysv/linux/s390/bits/sem.h b/sysdeps/unix/sysv/linux/s390/bits/sem.h index 9f8cd47..2e12eff 100644 --- a/sysdeps/unix/sysv/linux/s390/bits/sem.h +++ b/sysdeps/unix/sysv/linux/s390/bits/sem.h @@ -19,8 +19,7 @@ # error "Never include directly; use instead." #endif -#include -#include +#include /* Flags for `semop'. */ #define SEM_UNDO 0x1000 /* undo the operation on exit */