From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9610B1396D0 for ; Mon, 4 Sep 2017 20:00:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1B4E1FC048; Mon, 4 Sep 2017 20:00:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9F4571FC048 for ; Mon, 4 Sep 2017 20:00:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 05A1033D3C7 for ; Mon, 4 Sep 2017 20:00:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A1FAB8DFF for ; Mon, 4 Sep 2017 20:00:44 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1504555205.48518239b234989db6c1ea769bc17bc5d71e1890.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-base/xorg-server/files/xorg-server-1.17-ia64-fix_inx_outx.patch X-VCS-Directories: x11-base/xorg-server/files/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 48518239b234989db6c1ea769bc17bc5d71e1890 X-VCS-Branch: master Date: Mon, 4 Sep 2017 20:00:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 688d81b8-e255-4f17-8893-36736fb24caf X-Archives-Hash: 42219d1b270fab6d3b7ff0e1605856f8 commit: 48518239b234989db6c1ea769bc17bc5d71e1890 Author: Michael Mair-Keimberger gmail com> AuthorDate: Mon Sep 4 18:16:02 2017 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Sep 4 20:00:05 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48518239 x11-base/xorg-server: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/5614 .../files/xorg-server-1.17-ia64-fix_inx_outx.patch | 59 ---------------------- 1 file changed, 59 deletions(-) diff --git a/x11-base/xorg-server/files/xorg-server-1.17-ia64-fix_inx_outx.patch b/x11-base/xorg-server/files/xorg-server-1.17-ia64-fix_inx_outx.patch deleted file mode 100644 index 84485c986aa..00000000000 --- a/x11-base/xorg-server/files/xorg-server-1.17-ia64-fix_inx_outx.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h -index 1653574..fe881ee 100644 ---- a/hw/xfree86/common/compiler.h -+++ b/hw/xfree86/common/compiler.h -@@ -286,6 +286,54 @@ extern _X_EXPORT unsigned int inl(unsigned int port); - #include - #endif /* __NetBSD__ */ - -+#elif defined(linux) && defined(__ia64__) -+/* for Linux on ia64, we use the LIBC _inx/_outx routines */ -+/* note that the appropriate setup via "ioperm" needs to be done */ -+/* *before* any inx/outx is done. */ -+ -+extern _X_EXPORT void _outb(unsigned char val, unsigned long port); -+extern _X_EXPORT void _outw(unsigned short val, unsigned long port); -+extern _X_EXPORT void _outl(unsigned int val, unsigned long port); -+extern _X_EXPORT unsigned int _inb(unsigned long port); -+extern _X_EXPORT unsigned int _inw(unsigned long port); -+extern _X_EXPORT unsigned int _inl(unsigned long port); -+ -+static __inline__ void -+outb(unsigned long port, unsigned char val) -+{ -+ _outb(val, port); -+} -+ -+static __inline__ void -+outw(unsigned long port, unsigned short val) -+{ -+ _outw(val, port); -+} -+ -+static __inline__ void -+outl(unsigned long port, unsigned int val) -+{ -+ _outl(val, port); -+} -+ -+static __inline__ unsigned int -+inb(unsigned long port) -+{ -+ return _inb(port); -+} -+ -+static __inline__ unsigned int -+inw(unsigned long port) -+{ -+ return _inw(port); -+} -+ -+static __inline__ unsigned int -+inl(unsigned long port) -+{ -+ return _inl(port); -+} -+ - #elif defined(__amd64__) - - #include