From patchwork Mon Dec 3 22:08:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 203491 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B505C2C00A7 for ; Tue, 4 Dec 2012 10:44:06 +1100 (EST) Received: from localhost ([::1]:55851 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TffgC-0005NE-UN for incoming@patchwork.ozlabs.org; Mon, 03 Dec 2012 18:44:04 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50199) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfeIt-00085Q-IG for qemu-devel@nongnu.org; Mon, 03 Dec 2012 17:15:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TfeIs-00039i-Ej for qemu-devel@nongnu.org; Mon, 03 Dec 2012 17:15:55 -0500 Received: from mail-ie0-f173.google.com ([209.85.223.173]:43922) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfeIo-0002tM-Il; Mon, 03 Dec 2012 17:15:50 -0500 Received: by mail-ie0-f173.google.com with SMTP id e13so4875430iej.4 for ; Mon, 03 Dec 2012 14:15:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=HOnQVNHYGHQdfHv6o0fdgAmTEoxLgcv0oAcwaroXirM=; b=FEr3cEW/MP9EOmFMr6y5UTWmtHHk+BwrSPH8HF8S2JV+TyXgiT+QFAabYrALzgB02P ITR7GGptzcpgrl6i1nEa0rNWGl23Oc/yj+uvVDx8NCSoxdIflUzWn49wTxWh9bWBndJf sOjKhnEZRo6jtWptGYG8qki/VPUUbj2XUuturEHe5m8JVKElC8TNPKPzMyQF4MNu7+zw rV+ropMis9Zwks1aAf73SvbpRuSfuh4TAM/jp6Af/UJorsBI4ku+GqcbfjV7vy9kWaXR i/+1r5E6Di3jH9vyGuR2jHWYPrT1dAf0vbg6fda/MRdfFISvyI9EhpwLdMv8Bvqbrh3F gmPw== Received: by 10.50.196.193 with SMTP id io1mr671655igc.10.1354572950371; Mon, 03 Dec 2012 14:15:50 -0800 (PST) Received: from localhost ([32.97.110.59]) by mx.google.com with ESMTPS id i9sm8146265igl.9.2012.12.03.14.15.49 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 03 Dec 2012 14:15:49 -0800 (PST) From: Michael Roth To: qemu-stable@nongnu.org Date: Mon, 3 Dec 2012 16:08:48 -0600 Message-Id: <1354572547-21271-25-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1354572547-21271-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1354572547-21271-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.223.173 Cc: aliguori@us.ibm.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 24/43] target-openrisc: remove conflicting definitions from cpu.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Aurelien Jarno On an ARM host, the registers definitions from cpu.h clash with /usr/include/sys/ucontext.h. As there are unused, just remove them. Cc: Jia Liu Cc: qemu-stable@nongnu.org Reviewed-by: Peter Maydell Signed-off-by: Aurelien Jarno (cherry picked from commit 44e04d3b945ba6f5cc87e65192081da4783f73fa) Signed-off-by: Michael Roth --- target-openrisc/cpu.h | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/target-openrisc/cpu.h b/target-openrisc/cpu.h index de21a87..244788c 100644 --- a/target-openrisc/cpu.h +++ b/target-openrisc/cpu.h @@ -89,24 +89,6 @@ enum { /* Interrupt */ #define NR_IRQS 32 -/* Registers */ -enum { - R0 = 0, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, - R11, R12, R13, R14, R15, R16, R17, R18, R19, R20, - R21, R22, R23, R24, R25, R26, R27, R28, R29, R30, - R31 -}; - -/* Register aliases */ -enum { - R_ZERO = R0, - R_SP = R1, - R_FP = R2, - R_LR = R9, - R_RV = R11, - R_RVH = R12 -}; - /* Unit presece register */ enum { UPR_UP = (1 << 0),