gwj / at91sam9263 · Commits

Commit e3b9808535376bff99343c8a61726059a965198e

Authored by ths
1 parent e3878283

Build fix for PowerPC hosts, where "PPC" is a predefined macro name. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3251 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 15 additions and 15 deletions
target-ppc/translate_init.c
  View file @e3b9808
... ... @@ -3539,21 +3539,21 @@ static void init_proc_620 (CPUPPCState *env)
3539 3539  
3540 3540 /* Default PowerPC target will be PowerPC 32 */
3541 3541 #if defined (TARGET_PPC64) && 0 // XXX: TODO
3542   -#define CPU_POWERPC_PPC CPU_POWERPC_PPC64
3543   -#define POWERPC_INSNS_PPC POWERPC_INSNS_PPC64
3544   -#define POWERPC_MSRM_PPC POWERPC_MSRM_PPC64
3545   -#define POWERPC_MMU_PPC POWERPC_MMU_PPC64
3546   -#define POWERPC_EXCP_PPC POWERPC_EXCP_PPC64
3547   -#define POWERPC_INPUT_PPC POWERPC_INPUT_PPC64
3548   -#define init_proc_PPC init_proc_PPC64
  3542 +#define CPU_POWERPC_PPC CPU_POWERPC_PPC64
  3543 +#define POWERPC_INSNS_PPC_GENERIC POWERPC_INSNS_PPC64
  3544 +#define POWERPC_MSRM_PPC_GENERIC POWERPC_MSRM_PPC64
  3545 +#define POWERPC_MMU_PPC_GENERIC POWERPC_MMU_PPC64
  3546 +#define POWERPC_EXCP_PPC_GENERIC POWERPC_EXCP_PPC64
  3547 +#define POWERPC_INPUT_PPC_GENERIC POWERPC_INPUT_PPC64
  3548 +#define init_proc_PPC_GENERIC init_proc_PPC64
3549 3549 #else
3550   -#define CPU_POWERPC_PPC CPU_POWERPC_PPC32
3551   -#define POWERPC_INSNS_PPC POWERPC_INSNS_PPC32
3552   -#define POWERPC_MSRM_PPC POWERPC_MSRM_PPC32
3553   -#define POWERPC_MMU_PPC POWERPC_MMU_PPC32
3554   -#define POWERPC_EXCP_PPC POWERPC_EXCP_PPC32
3555   -#define POWERPC_INPUT_PPC POWERPC_INPUT_PPC32
3556   -#define init_proc_PPC init_proc_PPC32
  3550 +#define CPU_POWERPC_PPC CPU_POWERPC_PPC32
  3551 +#define POWERPC_INSNS_PPC_GENERIC POWERPC_INSNS_PPC32
  3552 +#define POWERPC_MSRM_PPC_GENERIC POWERPC_MSRM_PPC32
  3553 +#define POWERPC_MMU_PPC_GENERIC POWERPC_MMU_PPC32
  3554 +#define POWERPC_EXCP_PPC_GENERIC POWERPC_EXCP_PPC32
  3555 +#define POWERPC_INPUT_PPC_GENERIC POWERPC_INPUT_PPC32
  3556 +#define init_proc_PPC_GENERIC init_proc_PPC32
3557 3557 #endif
3558 3558  
3559 3559 /*****************************************************************************/
... ... @@ -4994,7 +4994,7 @@ static ppc_def_t ppc_defs[] = {
4994 4994 #endif
4995 4995 POWERPC_DEF("ppc32", CPU_POWERPC_PPC32, 0xFFFFFFFF, PPC32),
4996 4996 /* Fallback */
4997   - POWERPC_DEF("ppc", CPU_POWERPC_PPC, 0xFFFFFFFF, PPC),
  4997 + POWERPC_DEF("ppc", CPU_POWERPC_PPC, 0xFFFFFFFF, PPC_GENERIC),
4998 4998 };
4999 4999  
5000 5000 /*****************************************************************************/
... ...