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: 349950 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 AB88C1401FB for ; Sun, 18 May 2014 04:13:09 +1000 (EST) 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=PN6 ccP7Gkxrh8AgLl8i1ZsZ2U+2RxTSmL1ft9agdDJoK8IiRUW8yvvSmEoz9UkREiCM nYAQVZDF5BAE9lcbkKDJwE4BdmdP2yIVvvdFtFv4dDkgEfKekoWH8DU6Cuwtuaj7 viVh72JMQA9vGsc8z2/N1W6ZX5dsn5UiCn794vMk= 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=Q2r1jXioLoFV+L2E02T5qFzLMg7P4zWwHthB1parF /+UPLhdRV/FYHDo6UYPbSP4Upqs+31sQ1MkLT5i51+FtuRNVgOykOLvENuw0b29j hBusKqd0gdkn6XUdIJf6L5Xt2dEffJTdRdVsA7WYGgmHIqsv3xq09upnd/XE6n2J dg= 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 * 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