Skip to content

Commit

Permalink
linux-user: Clean up target_signal.h header guards
Browse files Browse the repository at this point in the history
These headers all use TARGET_SIGNAL_H as header guard symbol.  Reuse
of the same guard symbol in multiple headers is okay as long as they
cannot be included together.

Since we can avoid guard symbol reuse easily, do so: use guard symbol
$target_TARGET_SIGNAL_H for linux-user/$target/target_signal.h.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>
  • Loading branch information
Markus Armbruster committed Jul 12, 2016
1 parent 55c5063 commit 9c93ae1
Show file tree
Hide file tree
Showing 18 changed files with 54 additions and 54 deletions.
6 changes: 3 additions & 3 deletions linux-user/aarch64/target_signal.h
@@ -1,5 +1,5 @@
#ifndef TARGET_SIGNAL_H
#define TARGET_SIGNAL_H
#ifndef AARCH64_TARGET_SIGNAL_H
#define AARCH64_TARGET_SIGNAL_H

#include "cpu.h"

Expand All @@ -26,4 +26,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUARMState *state)
return state->xregs[31];
}

#endif /* TARGET_SIGNAL_H */
#endif /* AARCH64_TARGET_SIGNAL_H */
6 changes: 3 additions & 3 deletions linux-user/alpha/target_signal.h
@@ -1,5 +1,5 @@
#ifndef TARGET_SIGNAL_H
#define TARGET_SIGNAL_H
#ifndef ALPHA_TARGET_SIGNAL_H
#define ALPHA_TARGET_SIGNAL_H

#include "cpu.h"

Expand Down Expand Up @@ -55,4 +55,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUAlphaState *state)
#define TARGET_GEN_SUBRNG6 -24
#define TARGET_GEN_SUBRNG7 -25

#endif /* TARGET_SIGNAL_H */
#endif /* ALPHA_TARGET_SIGNAL_H */
6 changes: 3 additions & 3 deletions linux-user/arm/target_signal.h
@@ -1,5 +1,5 @@
#ifndef TARGET_SIGNAL_H
#define TARGET_SIGNAL_H
#ifndef ARM_TARGET_SIGNAL_H
#define ARM_TARGET_SIGNAL_H

#include "cpu.h"

Expand Down Expand Up @@ -27,4 +27,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUARMState *state)
}


#endif /* TARGET_SIGNAL_H */
#endif /* ARM_TARGET_SIGNAL_H */
6 changes: 3 additions & 3 deletions linux-user/cris/target_signal.h
@@ -1,5 +1,5 @@
#ifndef TARGET_SIGNAL_H
#define TARGET_SIGNAL_H
#ifndef CRIS_TARGET_SIGNAL_H
#define CRIS_TARGET_SIGNAL_H

#include "cpu.h"

Expand Down Expand Up @@ -27,4 +27,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUCRISState *state)
}


#endif /* TARGET_SIGNAL_H */
#endif /* CRIS_TARGET_SIGNAL_H */
6 changes: 3 additions & 3 deletions linux-user/i386/target_signal.h
@@ -1,5 +1,5 @@
#ifndef TARGET_SIGNAL_H
#define TARGET_SIGNAL_H
#ifndef I386_TARGET_SIGNAL_H
#define I386_TARGET_SIGNAL_H

#include "cpu.h"

Expand All @@ -26,4 +26,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUX86State *state)
return state->regs[R_ESP];
}

#endif /* TARGET_SIGNAL_H */
#endif /* I386_TARGET_SIGNAL_H */
6 changes: 3 additions & 3 deletions linux-user/m68k/target_signal.h
@@ -1,5 +1,5 @@
#ifndef TARGET_SIGNAL_H
#define TARGET_SIGNAL_H
#ifndef M68K_TARGET_SIGNAL_H
#define M68K_TARGET_SIGNAL_H

#include "cpu.h"

Expand Down Expand Up @@ -27,4 +27,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUM68KState *state)
}


#endif /* TARGET_SIGNAL_H */
#endif /* M68K_TARGET_SIGNAL_H */
6 changes: 3 additions & 3 deletions linux-user/microblaze/target_signal.h
@@ -1,5 +1,5 @@
#ifndef TARGET_SIGNAL_H
#define TARGET_SIGNAL_H
#ifndef MICROBLAZE_TARGET_SIGNAL_H
#define MICROBLAZE_TARGET_SIGNAL_H

#include "cpu.h"

Expand Down Expand Up @@ -27,4 +27,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUMBState *state)
}


#endif /* TARGET_SIGNAL_H */
#endif /* MICROBLAZE_TARGET_SIGNAL_H */
6 changes: 3 additions & 3 deletions linux-user/mips/target_signal.h
@@ -1,5 +1,5 @@
#ifndef TARGET_SIGNAL_H
#define TARGET_SIGNAL_H
#ifndef MIPS_TARGET_SIGNAL_H
#define MIPS_TARGET_SIGNAL_H

#include "cpu.h"

Expand Down Expand Up @@ -27,4 +27,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUMIPSState *state)
}


#endif /* TARGET_SIGNAL_H */
#endif /* MIPS_TARGET_SIGNAL_H */
6 changes: 3 additions & 3 deletions linux-user/mips64/target_signal.h
@@ -1,5 +1,5 @@
#ifndef TARGET_SIGNAL_H
#define TARGET_SIGNAL_H
#ifndef MIPS64_TARGET_SIGNAL_H
#define MIPS64_TARGET_SIGNAL_H

#include "cpu.h"

Expand Down Expand Up @@ -27,4 +27,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUMIPSState *state)
}


#endif /* TARGET_SIGNAL_H */
#endif /* MIPS64_TARGET_SIGNAL_H */
6 changes: 3 additions & 3 deletions linux-user/openrisc/target_signal.h
@@ -1,5 +1,5 @@
#ifndef TARGET_SIGNAL_H
#define TARGET_SIGNAL_H
#ifndef OPENRISC_TARGET_SIGNAL_H
#define OPENRISC_TARGET_SIGNAL_H

#include "cpu.h"

Expand All @@ -24,4 +24,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUOpenRISCState *state)
}


#endif /* TARGET_SIGNAL_H */
#endif /* OPENRISC_TARGET_SIGNAL_H */
6 changes: 3 additions & 3 deletions linux-user/ppc/target_signal.h
@@ -1,5 +1,5 @@
#ifndef TARGET_SIGNAL_H
#define TARGET_SIGNAL_H
#ifndef PPC_TARGET_SIGNAL_H
#define PPC_TARGET_SIGNAL_H

#include "cpu.h"

Expand Down Expand Up @@ -27,4 +27,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUPPCState *state)
}


#endif /* TARGET_SIGNAL_H */
#endif /* PPC_TARGET_SIGNAL_H */
6 changes: 3 additions & 3 deletions linux-user/s390x/target_signal.h
@@ -1,5 +1,5 @@
#ifndef TARGET_SIGNAL_H
#define TARGET_SIGNAL_H
#ifndef S390X_TARGET_SIGNAL_H
#define S390X_TARGET_SIGNAL_H

#include "cpu.h"

Expand All @@ -24,4 +24,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUS390XState *state)
}


#endif /* TARGET_SIGNAL_H */
#endif /* S390X_TARGET_SIGNAL_H */
6 changes: 3 additions & 3 deletions linux-user/sh4/target_signal.h
@@ -1,5 +1,5 @@
#ifndef TARGET_SIGNAL_H
#define TARGET_SIGNAL_H
#ifndef SH4_TARGET_SIGNAL_H
#define SH4_TARGET_SIGNAL_H

#include "cpu.h"

Expand Down Expand Up @@ -27,4 +27,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUSH4State *state)
}


#endif /* TARGET_SIGNAL_H */
#endif /* SH4_TARGET_SIGNAL_H */
6 changes: 3 additions & 3 deletions linux-user/sparc/target_signal.h
@@ -1,5 +1,5 @@
#ifndef TARGET_SIGNAL_H
#define TARGET_SIGNAL_H
#ifndef SPARC_TARGET_SIGNAL_H
#define SPARC_TARGET_SIGNAL_H

#include "cpu.h"

Expand Down Expand Up @@ -34,4 +34,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUSPARCState *state)
}


#endif /* TARGET_SIGNAL_H */
#endif /* SPARC_TARGET_SIGNAL_H */
6 changes: 3 additions & 3 deletions linux-user/sparc64/target_signal.h
@@ -1,5 +1,5 @@
#ifndef TARGET_SIGNAL_H
#define TARGET_SIGNAL_H
#ifndef SPARC64_TARGET_SIGNAL_H
#define SPARC64_TARGET_SIGNAL_H

#include "cpu.h"

Expand Down Expand Up @@ -34,4 +34,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUSPARCState *state)
}


#endif /* TARGET_SIGNAL_H */
#endif /* SPARC64_TARGET_SIGNAL_H */
6 changes: 3 additions & 3 deletions linux-user/tilegx/target_signal.h
@@ -1,5 +1,5 @@
#ifndef TARGET_SIGNAL_H
#define TARGET_SIGNAL_H
#ifndef TILEGX_TARGET_SIGNAL_H
#define TILEGX_TARGET_SIGNAL_H

#include "cpu.h"

Expand All @@ -26,4 +26,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUTLGState *state)
}


#endif /* TARGET_SIGNAL_H */
#endif /* TILEGX_TARGET_SIGNAL_H */
6 changes: 3 additions & 3 deletions linux-user/unicore32/target_signal.h
Expand Up @@ -5,8 +5,8 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#ifndef TARGET_SIGNAL_H
#define TARGET_SIGNAL_H
#ifndef UNICORE32_TARGET_SIGNAL_H
#define UNICORE32_TARGET_SIGNAL_H

/* this struct defines a stack used during syscall handling */
typedef struct target_sigaltstack {
Expand All @@ -27,4 +27,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUUniCore32State *state)
}


#endif /* TARGET_SIGNAL_H */
#endif /* UNICORE32_TARGET_SIGNAL_H */
6 changes: 3 additions & 3 deletions linux-user/x86_64/target_signal.h
@@ -1,5 +1,5 @@
#ifndef TARGET_SIGNAL_H
#define TARGET_SIGNAL_H
#ifndef X86_64_TARGET_SIGNAL_H
#define X86_64_TARGET_SIGNAL_H

#include "cpu.h"

Expand All @@ -26,4 +26,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUX86State *state)
return state->regs[R_ESP];
}

#endif /* TARGET_SIGNAL_H */
#endif /* X86_64_TARGET_SIGNAL_H */

0 comments on commit 9c93ae1

Please sign in to comment.