diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2011-04-20 11:19:15 +0100 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2011-04-25 22:15:31 +0200 |
| commit | 7cb4db8f41d20d2c9d9c9a6830a362eebaeb42ed (patch) | |
| tree | 28ac56387a478defc329efea404ea64dd6da160e /linux-user/arm/nwfpe/fpa11.h | |
| parent | f2dd89d0c7e5d39237f43392ccaed79bda47a71e (diff) | |
linux-user/arm/nwfpe: rename REG_PC to ARM_REG_PC
The REG_PC constant used in the ARM nwfpe code is fine in the kernel
but when used in qemu can clash with a definition in the host system
include files (in particular on Ubuntu Lucid SPARC, including signal.h
will define a REG_PC). Rename the constant to avoid this issue.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'linux-user/arm/nwfpe/fpa11.h')
| -rw-r--r-- | linux-user/arm/nwfpe/fpa11.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-user/arm/nwfpe/fpa11.h b/linux-user/arm/nwfpe/fpa11.h index f17647bdb9..002b3cbb82 100644 --- a/linux-user/arm/nwfpe/fpa11.h +++ b/linux-user/arm/nwfpe/fpa11.h @@ -111,7 +111,7 @@ static inline void writeConditionCodes(unsigned int x) cpsr_write(user_registers,x,CPSR_NZCV); } -#define REG_PC 15 +#define ARM_REG_PC 15 unsigned int EmulateAll(unsigned int opcode, FPA11* qfpa, CPUARMState* qregs); |