Commit ae7d54d4 authored by Andreas Färber's avatar Andreas Färber Committed by Anthony Liguori
Browse files

target-lm32/microblaze: Drop second CPU{LM32, MB}State typedef 



Commit 9b9a970a
(target-lm32/microblaze: Typedef struct CPU{MB,LM32}State)
introduced necessary typedefs for cpu_mmu_index() and mmu.h
respectively.

On some GCC versions this leads to "error: redefinition of typedef".

Drop the original typedef to hopefully fix the build.

Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent aea6ff7f

target-lm32/cpu.h

+2 −2
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ enum { 
    LM32_FLAG_IGNORE_MSB = 1,

};



typedef struct CPULM32State {

struct CPULM32State {

    /* general registers */

    uint32_t regs[32];
@@ -182,7 +182,7 @@ typedef struct CPULM32State { 
    uint8_t num_bps;

    uint8_t num_wps;



} CPULM32State;

};





CPULM32State *cpu_lm32_init(const char *cpu_model);

target-microblaze/cpu.h

+2 −2
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ typedef struct CPUMBState CPUMBState; 
#define STREAM_CONTROL   (1 << 3)

#define STREAM_NONBLOCK  (1 << 4)



typedef struct CPUMBState {

struct CPUMBState {

    uint32_t debug;

    uint32_t btaken;

    uint32_t btarget;
@@ -264,7 +264,7 @@ typedef struct CPUMBState { 
#endif



    CPU_COMMON

} CPUMBState;

};



CPUMBState *cpu_mb_init(const char *cpu_model);

int cpu_mb_exec(CPUMBState *s);