From patchwork Sat May 17 18:12:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 999 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx20.g.dreamhost.com (mx2.sub5.homie.mail.dreamhost.com [208.113.200.128]) by wilcox.dreamhost.com (Postfix) with ESMTP id 6E96236006F for ; Sat, 17 May 2014 11:13:06 -0700 (PDT) Received: by homiemail-mx20.g.dreamhost.com (Postfix, from userid 14307373) id 2292E41CD3695; Sat, 17 May 2014 11:13:06 -0700 (PDT) X-Original-To: glibc@patchwork.siddhesh.in Delivered-To: x14307373@homiemail-mx20.g.dreamhost.com 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 homiemail-mx20.g.dreamhost.com (Postfix) with ESMTPS id ED3F741CD3657 for ; Sat, 17 May 2014 11:13:05 -0700 (PDT) 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:message-id:to:subject:from:mime-version :content-type:content-transfer-encoding; q=dns; s=default; b=lN4 rCXuqwG6J6ueP5GNn7n9kIqvyF58Ep6IqDv2+7R6upyXgb7eVM/zBv5GrMhyAIr6 tQqDgou8TivDECvL54juAIVOMXBLiIz48YJVWr7U+mmntykjc7fw0p8DD3+sk02m /RE/i4hv9cjKjdVIM6vMWmWzDSibFI2Hu3JU/JaQ= 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:message-id:to:subject:from:mime-version :content-type:content-transfer-encoding; s=default; bh=1WhJCPaFG KUEP1JsJmVY8KLBuk4=; b=Cd++mqXxdwyo+W3mE3lZnxFma46Id6Cg1U4gPVZ0n xF6fUlEBhfMJJPxagh2QPyJFZBPwfyCPAZog+3QboYpv+r1CflDnZO0PYNqKXSVi BXl1pI9ua/LyHZUi3WamOprcR6J8rxAS3e2JRKnsexCQBONPVCn+SDKZdxwWHQoK DA= Received: (qmail 6824 invoked by alias); 17 May 2014 18:13:03 -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 6808 invoked by uid 89); 17 May 2014 18:13:02 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: shards.monkeyblade.net Date: Sat, 17 May 2014 14:12:41 -0400 (EDT) Message-Id: <20140517.141241.70265738910731684.davem@davemloft.net> To: libc-alpha@sourceware.org Subject: [COMMITTED PATCH] Fix some termios.h conformtest failures on sparc. From: David Miller Mime-Version: 1.0 X-DH-Original-To: glibc@patchwork.siddhesh.in * sysdeps/unix/sysv/linux/sparc/bits/termios.h (PAGEOUT, WRAP): Protect with __USE_GNU. (TIOCSET_TEMPT): Likewise. (TIOCM_LE, TIOCM_DTR, TIOCM_RTS, TIOCM_ST, TIOCM_SR, TIOCM_CTS, TIOCM_CAR, TIOCM_RNG, TIOCM_DSR, TIOCM_CD, TIOCM_RI): Remove as these are already provided in bits/ioctl-types.h --- ChangeLog | 9 +++++++++ sysdeps/unix/sysv/linux/sparc/bits/termios.h | 19 +++++-------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 13118b4..c16e823 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2014-05-17 David S. Miller + + * sysdeps/unix/sysv/linux/sparc/bits/termios.h (PAGEOUT, WRAP): + Protect with __USE_GNU. + (TIOCSET_TEMPT): Likewise. + (TIOCM_LE, TIOCM_DTR, TIOCM_RTS, TIOCM_ST, TIOCM_SR, TIOCM_CTS, + TIOCM_CAR, TIOCM_RNG, TIOCM_DSR, TIOCM_CD, TIOCM_RI): Remove as + these are already provided in bits/ioctl-types.h + 2014-05-16 Roland McGrath * sysdeps/unix/sysv/linux/not-cancel.h (waitpid_not_cancel): diff --git a/sysdeps/unix/sysv/linux/sparc/bits/termios.h b/sysdeps/unix/sysv/linux/sparc/bits/termios.h index 94524b3..b7a103b 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/termios.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/termios.h @@ -107,8 +107,11 @@ struct termios #define VTDLY 0x00004000 #define VT0 0x00000000 #define VT1 0x00004000 + +# if defined __USE_GNU #define PAGEOUT 0x00010000 /* SUNOS specific */ #define WRAP 0x00020000 /* SUNOS specific */ +# endif #ifdef __USE_MISC # define XTABS 0x00001800 @@ -200,22 +203,10 @@ struct termios # define EXTPROC 0x00010000 #endif -/* modem lines */ -#define TIOCM_LE 0x001 -#define TIOCM_DTR 0x002 -#define TIOCM_RTS 0x004 -#define TIOCM_ST 0x008 -#define TIOCM_SR 0x010 -#define TIOCM_CTS 0x020 -#define TIOCM_CAR 0x040 -#define TIOCM_RNG 0x080 -#define TIOCM_DSR 0x100 -#define TIOCM_CD TIOCM_CAR -#define TIOCM_RI TIOCM_RNG - +# if defined __USE_GNU /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ #define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ - +#endif /* tcflow() and TCXONC use these */ #define TCOOFF 0