Skip to contentSkip to conversation

sparc: Fix typedef clash

PATCH In review Dr. David Alan Gilbert (git) 3 participants 3 messages Sep 14, 2017

lore
Share & tools
lore

Dr. David Alan Gilbert (git)

author
#0 lore raw

PATCH 1/1 sparc: Fix typedef clash

From: "Dr. David Alan Gilbert" <[email protected]>

Older compilers (rhel6) don't like redefinition of typedefs

Fixes 12a6c15ef31c98ecefa63e91ac36955383038384
Signed-off-by Dr. David Alan Gilbert <[email protected]>
---
 target/sparc/cpu.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
target/sparc/cpu.h +2 -2
index b45cfb4708..1598f65927 100644
@@ -240,7 +240,7 @@ typedef struct trap_state {
 #endif
 #define TARGET_INSN_START_EXTRA_WORDS 1
 
-typedef struct sparc_def_t {
+struct sparc_def_t {
     const char *name;
     target_ulong iu_version;
     uint32_t fpu_version;

@@ -254,7 +254,7 @@ typedef struct sparc_def_t {
     uint32_t features;
     uint32_t nwindows;
     uint32_t maxtl;
-} sparc_def_t;
+};
 
 #define CPU_FEATURE_FLOAT        (1 << 0)
 #define CPU_FEATURE_FLOAT128     (1 << 1)
Signature · 1 line
2.13.5
Reviewed-by on v1 1/1
#1 lore raw
Quoted 3 lines · Dr. David Alan Gilbert (git)

From: "Dr. David Alan Gilbert" <[email protected]>

Older compilers (rhel6) don't like redefinition of typedefs

Newer neither (clang-5)

fatal error: redefinition of typedef [-Wtypedef-redefinition]

d61d1b20610

Quoted 2 lines
Fixes 12a6c15ef31c98ecefa63e91ac36955383038384

you mean "missed in 12a6c15ef31c98ecefa63e91ac36955383038384"

Quoted 2 lines
Signed-off-by Dr. David Alan Gilbert <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Quoted 27 lines
---
  target/sparc/cpu.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
target/sparc/cpu.h +2 -2
index b45cfb4708..1598f65927 100644
@@ -240,7 +240,7 @@ typedef struct trap_state {
  #endif
  #define TARGET_INSN_START_EXTRA_WORDS 1
 
-typedef struct sparc_def_t {
+struct sparc_def_t {
      const char *name;
      target_ulong iu_version;
      uint32_t fpu_version;

@@ -254,7 +254,7 @@ typedef struct sparc_def_t {
      uint32_t features;
      uint32_t nwindows;
      uint32_t maxtl;
-} sparc_def_t;
+};
 
  #define CPU_FEATURE_FLOAT        (1 << 0)
  #define CPU_FEATURE_FLOAT128     (1 << 1)