summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2012-10-09 21:53:12 +0200
committerMichael Roth <mdroth@linux.vnet.ibm.com>2012-12-03 13:23:11 -0600
commit4a8e490cbc15ad3fd88180ebff016cdd56242987 (patch)
treeacaef518a3d6995c4c5914c65de6097d4883cd1b
parentede76edace43dcc940e1dfaa3f5be5fe485b7254 (diff)
downloadqemu-4a8e490cbc15ad3fd88180ebff016cdd56242987.tar.gz
target-openrisc: remove conflicting definitions from cpu.h
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 <proljc@gmail.com> Cc: qemu-stable@nongnu.org Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> (cherry picked from commit 44e04d3b945ba6f5cc87e65192081da4783f73fa) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r--target-openrisc/cpu.h18
1 files changed, 0 insertions, 18 deletions
diff --git a/target-openrisc/cpu.h b/target-openrisc/cpu.h
index de21a877d3..244788c3f2 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),