|
 |
f375e62 |
From 1a51e9b66a61238e56668d647a74a6ceeeeaa727 Mon Sep 17 00:00:00 2001
|
|
|
f375e62 |
From: Aurelien Jarno <aurelien@aurel32.net>
|
|
|
f375e62 |
Date: Tue, 9 Oct 2012 21:53:12 +0200
|
|
|
f375e62 |
Subject: [PATCH] target-openrisc: remove conflicting definitions from cpu.h
|
|
|
f375e62 |
|
|
|
f375e62 |
On an ARM host, the registers definitions from cpu.h clash
|
|
|
f375e62 |
with /usr/include/sys/ucontext.h. As there are unused, just remove
|
|
|
f375e62 |
them.
|
|
|
f375e62 |
|
|
|
f375e62 |
Cc: Jia Liu <proljc@gmail.com>
|
|
|
f375e62 |
Cc: qemu-stable@nongnu.org
|
|
|
f375e62 |
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
|
|
|
f375e62 |
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
|
|
|
f375e62 |
(cherry picked from commit 44e04d3b945ba6f5cc87e65192081da4783f73fa)
|
|
|
f375e62 |
|
|
|
f375e62 |
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
f375e62 |
---
|
|
|
f375e62 |
target-openrisc/cpu.h | 18 ------------------
|
|
|
f375e62 |
1 file changed, 18 deletions(-)
|
|
|
f375e62 |
|
|
|
f375e62 |
diff --git a/target-openrisc/cpu.h b/target-openrisc/cpu.h
|
|
|
f375e62 |
index de21a87..244788c 100644
|
|
|
f375e62 |
--- a/target-openrisc/cpu.h
|
|
|
f375e62 |
+++ b/target-openrisc/cpu.h
|
|
|
f375e62 |
@@ -89,24 +89,6 @@ enum {
|
|
|
f375e62 |
/* Interrupt */
|
|
|
f375e62 |
#define NR_IRQS 32
|
|
|
f375e62 |
|
|
|
f375e62 |
-/* Registers */
|
|
|
f375e62 |
-enum {
|
|
|
f375e62 |
- R0 = 0, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10,
|
|
|
f375e62 |
- R11, R12, R13, R14, R15, R16, R17, R18, R19, R20,
|
|
|
f375e62 |
- R21, R22, R23, R24, R25, R26, R27, R28, R29, R30,
|
|
|
f375e62 |
- R31
|
|
|
f375e62 |
-};
|
|
|
f375e62 |
-
|
|
|
f375e62 |
-/* Register aliases */
|
|
|
f375e62 |
-enum {
|
|
|
f375e62 |
- R_ZERO = R0,
|
|
|
f375e62 |
- R_SP = R1,
|
|
|
f375e62 |
- R_FP = R2,
|
|
|
f375e62 |
- R_LR = R9,
|
|
|
f375e62 |
- R_RV = R11,
|
|
|
f375e62 |
- R_RVH = R12
|
|
|
f375e62 |
-};
|
|
|
f375e62 |
-
|
|
|
f375e62 |
/* Unit presece register */
|
|
|
f375e62 |
enum {
|
|
|
f375e62 |
UPR_UP = (1 << 0),
|