From a9c94277f07d19d3eb14f199c3e93491aa3eae0e Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 22 Jun 2016 19:11:19 +0200 Subject: Use #include "..." for our own headers, <...> for others Tracked down with an ugly, brittle and probably buggy Perl script. Also move includes converted to <...> up so they get included before ours where that's obviously okay. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Tested-by: Eric Blake Reviewed-by: Richard Henderson --- linux-user/arm/nwfpe/fpa11.h | 3 +-- linux-user/flatload.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'linux-user') diff --git a/linux-user/arm/nwfpe/fpa11.h b/linux-user/arm/nwfpe/fpa11.h index 0b07284..7f6f654 100644 --- a/linux-user/arm/nwfpe/fpa11.h +++ b/linux-user/arm/nwfpe/fpa11.h @@ -21,8 +21,7 @@ #ifndef __FPA11_H__ #define __FPA11_H__ - -#include +#include "cpu.h" #define GET_FPA11() (qemufpa) diff --git a/linux-user/flatload.c b/linux-user/flatload.c index 48ad1c5..42d1079 100644 --- a/linux-user/flatload.c +++ b/linux-user/flatload.c @@ -37,7 +37,7 @@ #include "qemu.h" #include "flat.h" -#include +#include "target_flat.h" //#define DEBUG -- cgit v1.1 From 3622634bc665244c2fd4382301cfadcef1a9e934 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 29 Jun 2016 10:47:26 +0200 Subject: linux-user: Clean up target_syscall.h header guards Some of them use guard symbol TARGET_SYSCALL_H, but we also have CRIS_SYSCALL_H, MICROBLAZE_SYSCALLS_H, TILEGX_SYSCALLS_H and __UC32_SYSCALL_H__. They all upset scripts/clean-header-guards.pl. Reuse of the same guard symbol TARGET_SYSCALL_H in multiple headers is okay as long as they cannot be included together. The script can't tell, so it warns. The script dislikes the other guard symbols, too. They don't match their file name (they should, to make guard collisions less likely), and __UC32_SYSCALL_H__ is a reserved identifier. Clean them all up: use guard symbol $target_TARGET_SYSCALL_H for linux-user/$target/target_sycall.h. Signed-off-by: Markus Armbruster Reviewed-by: Richard Henderson --- linux-user/aarch64/target_syscall.h | 6 +++--- linux-user/alpha/target_syscall.h | 6 +++--- linux-user/arm/target_syscall.h | 6 +++--- linux-user/cris/target_syscall.h | 4 ++-- linux-user/i386/target_syscall.h | 6 +++--- linux-user/m68k/target_syscall.h | 6 +++--- linux-user/microblaze/target_syscall.h | 4 ++-- linux-user/mips/target_syscall.h | 6 +++--- linux-user/mips64/target_syscall.h | 6 +++--- linux-user/openrisc/target_syscall.h | 6 +++--- linux-user/ppc/target_syscall.h | 6 +++--- linux-user/s390x/target_syscall.h | 6 +++--- linux-user/sh4/target_syscall.h | 6 +++--- linux-user/sparc/target_syscall.h | 6 +++--- linux-user/sparc64/target_syscall.h | 6 +++--- linux-user/tilegx/target_syscall.h | 4 ++-- linux-user/unicore32/target_syscall.h | 8 +++++--- linux-user/x86_64/target_syscall.h | 6 +++--- 18 files changed, 53 insertions(+), 51 deletions(-) (limited to 'linux-user') diff --git a/linux-user/aarch64/target_syscall.h b/linux-user/aarch64/target_syscall.h index f458018..1b62953 100644 --- a/linux-user/aarch64/target_syscall.h +++ b/linux-user/aarch64/target_syscall.h @@ -1,5 +1,5 @@ -#ifndef TARGET_SYSCALL_H -#define TARGET_SYSCALL_H +#ifndef AARCH64_TARGET_SYSCALL_H +#define AARCH64_TARGET_SYSCALL_H struct target_pt_regs { uint64_t regs[31]; @@ -15,4 +15,4 @@ struct target_pt_regs { #define TARGET_MLOCKALL_MCL_CURRENT 1 #define TARGET_MLOCKALL_MCL_FUTURE 2 -#endif /* TARGET_SYSCALL_H */ +#endif /* AARCH64_TARGET_SYSCALL_H */ diff --git a/linux-user/alpha/target_syscall.h b/linux-user/alpha/target_syscall.h index 3db4b16..b580fc5 100644 --- a/linux-user/alpha/target_syscall.h +++ b/linux-user/alpha/target_syscall.h @@ -1,5 +1,5 @@ -#ifndef TARGET_SYSCALL_H -#define TARGET_SYSCALL_H +#ifndef ALPHA_TARGET_SYSCALL_H +#define ALPHA_TARGET_SYSCALL_H /* default linux values for the selectors */ #define __USER_DS (1) @@ -259,4 +259,4 @@ struct target_pt_regs { #define TARGET_MLOCKALL_MCL_CURRENT 0x2000 #define TARGET_MLOCKALL_MCL_FUTURE 0x4000 -#endif /* TARGET_SYSCALL_H */ +#endif /* ALPHA_TARGET_SYSCALL_H */ diff --git a/linux-user/arm/target_syscall.h b/linux-user/arm/target_syscall.h index 11077b7..cd021ff 100644 --- a/linux-user/arm/target_syscall.h +++ b/linux-user/arm/target_syscall.h @@ -1,5 +1,5 @@ -#ifndef TARGET_SYSCALL_H -#define TARGET_SYSCALL_H +#ifndef ARM_TARGET_SYSCALL_H +#define ARM_TARGET_SYSCALL_H /* this struct defines the way the registers are stored on the stack during a system call. */ @@ -33,4 +33,4 @@ struct target_pt_regs { #define TARGET_MLOCKALL_MCL_CURRENT 1 #define TARGET_MLOCKALL_MCL_FUTURE 2 -#endif /* TARGET_SYSCALL_H */ +#endif /* ARM_TARGET_SYSCALL_H */ diff --git a/linux-user/cris/target_syscall.h b/linux-user/cris/target_syscall.h index 2957b0d..29d6900 100644 --- a/linux-user/cris/target_syscall.h +++ b/linux-user/cris/target_syscall.h @@ -1,5 +1,5 @@ -#ifndef CRIS_SYSCALL_H -#define CRIS_SYSCALL_H 1 +#ifndef CRIS_TARGET_SYSCALL_H +#define CRIS_TARGET_SYSCALL_H #define UNAME_MACHINE "cris" #define UNAME_MINIMUM_RELEASE "2.6.32" diff --git a/linux-user/i386/target_syscall.h b/linux-user/i386/target_syscall.h index 0ac84dc..b4e895f 100644 --- a/linux-user/i386/target_syscall.h +++ b/linux-user/i386/target_syscall.h @@ -1,5 +1,5 @@ -#ifndef TARGET_SYSCALL_H -#define TARGET_SYSCALL_H +#ifndef I386_TARGET_SYSCALL_H +#define I386_TARGET_SYSCALL_H /* default linux values for the selectors */ #define __USER_CS (0x23) @@ -154,4 +154,4 @@ struct target_vm86plus_struct { #define TARGET_MLOCKALL_MCL_CURRENT 1 #define TARGET_MLOCKALL_MCL_FUTURE 2 -#endif /* TARGET_SYSCALL_H */ +#endif /* I386_TARGET_SYSCALL_H */ diff --git a/linux-user/m68k/target_syscall.h b/linux-user/m68k/target_syscall.h index 97a4cc0..db2be4f 100644 --- a/linux-user/m68k/target_syscall.h +++ b/linux-user/m68k/target_syscall.h @@ -1,5 +1,5 @@ -#ifndef TARGET_SYSCALL_H -#define TARGET_SYSCALL_H +#ifndef M68K_TARGET_SYSCALL_H +#define M68K_TARGET_SYSCALL_H /* this struct defines the way the registers are stored on the stack during a system call. */ @@ -26,4 +26,4 @@ struct target_pt_regs { void do_m68k_simcall(CPUM68KState *, int); -#endif /* TARGET_SYSCALL_H */ +#endif /* M68K_TARGET_SYSCALL_H */ diff --git a/linux-user/microblaze/target_syscall.h b/linux-user/microblaze/target_syscall.h index 3c1ed27..0b6980c 100644 --- a/linux-user/microblaze/target_syscall.h +++ b/linux-user/microblaze/target_syscall.h @@ -1,5 +1,5 @@ -#ifndef MICROBLAZE_SYSCALLS_H -#define MICROBLAZE_SYSCALLS_H 1 +#ifndef MICROBLAZE_TARGET_SYSCALL_H +#define MICROBLAZE_TARGET_SYSCALL_H #define UNAME_MACHINE "microblaze" #define UNAME_MINIMUM_RELEASE "2.6.32" diff --git a/linux-user/mips/target_syscall.h b/linux-user/mips/target_syscall.h index e8e305c..2b4f390 100644 --- a/linux-user/mips/target_syscall.h +++ b/linux-user/mips/target_syscall.h @@ -1,5 +1,5 @@ -#ifndef TARGET_SYSCALL_H -#define TARGET_SYSCALL_H +#ifndef MIPS_TARGET_SYSCALL_H +#define MIPS_TARGET_SYSCALL_H /* this struct defines the way the registers are stored on the stack during a system call. */ @@ -230,4 +230,4 @@ struct target_pt_regs { #define TARGET_MLOCKALL_MCL_CURRENT 1 #define TARGET_MLOCKALL_MCL_FUTURE 2 -#endif /* TARGET_SYSCALL_H */ +#endif /* MIPS_TARGET_SYSCALL_H */ diff --git a/linux-user/mips64/target_syscall.h b/linux-user/mips64/target_syscall.h index 5789e86..8da9c1f 100644 --- a/linux-user/mips64/target_syscall.h +++ b/linux-user/mips64/target_syscall.h @@ -1,5 +1,5 @@ -#ifndef TARGET_SYSCALL_H -#define TARGET_SYSCALL_H +#ifndef MIPS64_TARGET_SYSCALL_H +#define MIPS64_TARGET_SYSCALL_H /* this struct defines the way the registers are stored on the stack during a system call. */ @@ -227,4 +227,4 @@ struct target_pt_regs { #define TARGET_MLOCKALL_MCL_CURRENT 1 #define TARGET_MLOCKALL_MCL_FUTURE 2 -#endif /* TARGET_SYSCALL_H */ +#endif /* MIPS64_TARGET_SYSCALL_H */ diff --git a/linux-user/openrisc/target_syscall.h b/linux-user/openrisc/target_syscall.h index 19aeffc..9d3380f 100644 --- a/linux-user/openrisc/target_syscall.h +++ b/linux-user/openrisc/target_syscall.h @@ -1,5 +1,5 @@ -#ifndef TARGET_SYSCALL_H -#define TARGET_SYSCALL_H +#ifndef OPENRISC_TARGET_SYSCALL_H +#define OPENRISC_TARGET_SYSCALL_H struct target_pt_regs { union { @@ -31,4 +31,4 @@ struct target_pt_regs { #define TARGET_MLOCKALL_MCL_CURRENT 1 #define TARGET_MLOCKALL_MCL_FUTURE 2 -#endif /* TARGET_SYSCALL_H */ +#endif /* OPENRISC_TARGET_SYSCALL_H */ diff --git a/linux-user/ppc/target_syscall.h b/linux-user/ppc/target_syscall.h index 7ca83c2..a8662f4 100644 --- a/linux-user/ppc/target_syscall.h +++ b/linux-user/ppc/target_syscall.h @@ -17,8 +17,8 @@ * License along with this library; if not, see . */ -#ifndef TARGET_SYSCALL_H -#define TARGET_SYSCALL_H +#ifndef PPC_TARGET_SYSCALL_H +#define PPC_TARGET_SYSCALL_H /* XXX: ABSOLUTELY BUGGY: * for now, this is quite just a cut-and-paste from i386 target... @@ -75,4 +75,4 @@ struct target_revectored_struct { #define TARGET_MLOCKALL_MCL_CURRENT 0x2000 #define TARGET_MLOCKALL_MCL_FUTURE 0x4000 -#endif /* TARGET_SYSCALL_H */ +#endif /* PPC_TARGET_SYSCALL_H */ diff --git a/linux-user/s390x/target_syscall.h b/linux-user/s390x/target_syscall.h index 02061ef..8d4f609 100644 --- a/linux-user/s390x/target_syscall.h +++ b/linux-user/s390x/target_syscall.h @@ -1,5 +1,5 @@ -#ifndef TARGET_SYSCALL_H -#define TARGET_SYSCALL_H +#ifndef S390X_TARGET_SYSCALL_H +#define S390X_TARGET_SYSCALL_H /* this typedef defines how a Program Status Word looks like */ typedef struct { @@ -31,4 +31,4 @@ struct target_pt_regs { #define TARGET_MLOCKALL_MCL_CURRENT 1 #define TARGET_MLOCKALL_MCL_FUTURE 2 -#endif /* TARGET_SYSCALL_H */ +#endif /* S390X_TARGET_SYSCALL_H */ diff --git a/linux-user/sh4/target_syscall.h b/linux-user/sh4/target_syscall.h index 9f3381b..78d5557 100644 --- a/linux-user/sh4/target_syscall.h +++ b/linux-user/sh4/target_syscall.h @@ -1,5 +1,5 @@ -#ifndef TARGET_SYSCALL_H -#define TARGET_SYSCALL_H +#ifndef SH4_TARGET_SYSCALL_H +#define SH4_TARGET_SYSCALL_H struct target_pt_regs { unsigned long regs[16]; @@ -19,4 +19,4 @@ struct target_pt_regs { #define TARGET_MLOCKALL_MCL_CURRENT 1 #define TARGET_MLOCKALL_MCL_FUTURE 2 -#endif /* TARGET_SYSCALL_H */ +#endif /* SH4_TARGET_SYSCALL_H */ diff --git a/linux-user/sparc/target_syscall.h b/linux-user/sparc/target_syscall.h index a73fa6d..326f674 100644 --- a/linux-user/sparc/target_syscall.h +++ b/linux-user/sparc/target_syscall.h @@ -1,5 +1,5 @@ -#ifndef TARGET_SYSCALL_H -#define TARGET_SYSCALL_H +#ifndef SPARC_TARGET_SYSCALL_H +#define SPARC_TARGET_SYSCALL_H struct target_pt_regs { abi_ulong psr; @@ -22,4 +22,4 @@ struct target_pt_regs { #define TARGET_MLOCKALL_MCL_CURRENT 0x2000 #define TARGET_MLOCKALL_MCL_FUTURE 0x4000 -#endif /* TARGET_SYSCALL_H */ +#endif /* SPARC_TARGET_SYSCALL_H */ diff --git a/linux-user/sparc64/target_syscall.h b/linux-user/sparc64/target_syscall.h index eb827fc..b7e3bf8 100644 --- a/linux-user/sparc64/target_syscall.h +++ b/linux-user/sparc64/target_syscall.h @@ -1,5 +1,5 @@ -#ifndef TARGET_SYSCALL_H -#define TARGET_SYSCALL_H +#ifndef SPARC64_TARGET_SYSCALL_H +#define SPARC64_TARGET_SYSCALL_H struct target_pt_regs { abi_ulong u_regs[16]; @@ -23,4 +23,4 @@ struct target_pt_regs { #define TARGET_MLOCKALL_MCL_CURRENT 0x2000 #define TARGET_MLOCKALL_MCL_FUTURE 0x4000 -#endif /* TARGET_SYSCALL_H */ +#endif /* SPARC64_TARGET_SYSCALL_H */ diff --git a/linux-user/tilegx/target_syscall.h b/linux-user/tilegx/target_syscall.h index a938d4e..d731acd 100644 --- a/linux-user/tilegx/target_syscall.h +++ b/linux-user/tilegx/target_syscall.h @@ -1,5 +1,5 @@ -#ifndef TILEGX_SYSCALLS_H -#define TILEGX_SYSCALLS_H +#ifndef TILEGX_TARGET_SYSCALL_H +#define TILEGX_TARGET_SYSCALL_H #define UNAME_MACHINE "tilegx" #define UNAME_MINIMUM_RELEASE "3.19" diff --git a/linux-user/unicore32/target_syscall.h b/linux-user/unicore32/target_syscall.h index 385a975..346b207 100644 --- a/linux-user/unicore32/target_syscall.h +++ b/linux-user/unicore32/target_syscall.h @@ -5,8 +5,10 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#ifndef __UC32_SYSCALL_H__ -#define __UC32_SYSCALL_H__ + +#ifndef UNICORE32_TARGET_SYSCALL_H +#define UNICORE32_TARGET_SYSCALL_H + struct target_pt_regs { abi_ulong uregs[34]; }; @@ -57,4 +59,4 @@ struct target_pt_regs { #define TARGET_MLOCKALL_MCL_CURRENT 1 #define TARGET_MLOCKALL_MCL_FUTURE 2 -#endif /* __UC32_SYSCALL_H__ */ +#endif /* UNICORE32_TARGET_SYSCALL_H */ diff --git a/linux-user/x86_64/target_syscall.h b/linux-user/x86_64/target_syscall.h index feecd32..983fb23 100644 --- a/linux-user/x86_64/target_syscall.h +++ b/linux-user/x86_64/target_syscall.h @@ -1,5 +1,5 @@ -#ifndef TARGET_SYSCALL_H -#define TARGET_SYSCALL_H +#ifndef X86_64_TARGET_SYSCALL_H +#define X86_64_TARGET_SYSCALL_H #define __USER_CS (0x33) #define __USER_DS (0x2B) @@ -104,4 +104,4 @@ struct target_msqid64_ds { #define TARGET_MLOCKALL_MCL_CURRENT 1 #define TARGET_MLOCKALL_MCL_FUTURE 2 -#endif /* TARGET_SYSCALL_H */ +#endif /* X86_64_TARGET_SYSCALL_H */ -- cgit v1.1 From 55c5063c61e030c533b4bca8ef2a2ad26f1bc73a Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 29 Jun 2016 16:05:18 +0200 Subject: linux-user: Clean up target_cpu.h header guards These headers all use TARGET_CPU_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_CPU_H for linux-user/$target/target_cpu.h. Signed-off-by: Markus Armbruster Reviewed-by: Richard Henderson --- linux-user/aarch64/target_cpu.h | 4 ++-- linux-user/alpha/target_cpu.h | 4 ++-- linux-user/arm/target_cpu.h | 4 ++-- linux-user/cris/target_cpu.h | 4 ++-- linux-user/i386/target_cpu.h | 6 +++--- linux-user/m68k/target_cpu.h | 4 ++-- linux-user/microblaze/target_cpu.h | 4 ++-- linux-user/mips/target_cpu.h | 4 ++-- linux-user/openrisc/target_cpu.h | 4 ++-- linux-user/ppc/target_cpu.h | 4 ++-- linux-user/s390x/target_cpu.h | 4 ++-- linux-user/sh4/target_cpu.h | 4 ++-- linux-user/sparc/target_cpu.h | 4 ++-- linux-user/tilegx/target_cpu.h | 4 ++-- linux-user/unicore32/target_cpu.h | 4 ++-- 15 files changed, 31 insertions(+), 31 deletions(-) (limited to 'linux-user') diff --git a/linux-user/aarch64/target_cpu.h b/linux-user/aarch64/target_cpu.h index b5593dc..777ce29 100644 --- a/linux-user/aarch64/target_cpu.h +++ b/linux-user/aarch64/target_cpu.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_CPU_H -#define TARGET_CPU_H +#ifndef AARCH64_TARGET_CPU_H +#define AARCH64_TARGET_CPU_H static inline void cpu_clone_regs(CPUARMState *env, target_ulong newsp) { diff --git a/linux-user/alpha/target_cpu.h b/linux-user/alpha/target_cpu.h index 4256245..ad124da 100644 --- a/linux-user/alpha/target_cpu.h +++ b/linux-user/alpha/target_cpu.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_CPU_H -#define TARGET_CPU_H +#ifndef ALPHA_TARGET_CPU_H +#define ALPHA_TARGET_CPU_H static inline void cpu_clone_regs(CPUAlphaState *env, target_ulong newsp) { diff --git a/linux-user/arm/target_cpu.h b/linux-user/arm/target_cpu.h index 6832262..d888219 100644 --- a/linux-user/arm/target_cpu.h +++ b/linux-user/arm/target_cpu.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_CPU_H -#define TARGET_CPU_H +#ifndef ARM_TARGET_CPU_H +#define ARM_TARGET_CPU_H static inline void cpu_clone_regs(CPUARMState *env, target_ulong newsp) { diff --git a/linux-user/cris/target_cpu.h b/linux-user/cris/target_cpu.h index 4d787e5..c43aac6 100644 --- a/linux-user/cris/target_cpu.h +++ b/linux-user/cris/target_cpu.h @@ -17,8 +17,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_CPU_H -#define TARGET_CPU_H +#ifndef CRIS_TARGET_CPU_H +#define CRIS_TARGET_CPU_H static inline void cpu_clone_regs(CPUCRISState *env, target_ulong newsp) { diff --git a/linux-user/i386/target_cpu.h b/linux-user/i386/target_cpu.h index 58f8645..7fbcf9b 100644 --- a/linux-user/i386/target_cpu.h +++ b/linux-user/i386/target_cpu.h @@ -17,8 +17,8 @@ * License along with this library; if not, see . */ -#ifndef TARGET_CPU_H -#define TARGET_CPU_H +#ifndef I386_TARGET_CPU_H +#define I386_TARGET_CPU_H static inline void cpu_clone_regs(CPUX86State *env, target_ulong newsp) { @@ -45,4 +45,4 @@ static inline void cpu_set_tls(CPUX86State *env, target_ulong newtls) } #endif /* defined(TARGET_ABI32) */ -#endif /* !defined(TARGET_CPU_H) */ +#endif /* I386_TARGET_CPU_H */ diff --git a/linux-user/m68k/target_cpu.h b/linux-user/m68k/target_cpu.h index bb4d3fa..cc0bfc2 100644 --- a/linux-user/m68k/target_cpu.h +++ b/linux-user/m68k/target_cpu.h @@ -18,8 +18,8 @@ * License along with this library; if not, see . */ -#ifndef TARGET_CPU_H -#define TARGET_CPU_H +#ifndef M68K_TARGET_CPU_H +#define M68K_TARGET_CPU_H static inline void cpu_clone_regs(CPUM68KState *env, target_ulong newsp) { diff --git a/linux-user/microblaze/target_cpu.h b/linux-user/microblaze/target_cpu.h index c6386ea..7dd979f 100644 --- a/linux-user/microblaze/target_cpu.h +++ b/linux-user/microblaze/target_cpu.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_CPU_H -#define TARGET_CPU_H +#ifndef MICROBLAZE_TARGET_CPU_H +#define MICROBLAZE_TARGET_CPU_H static inline void cpu_clone_regs(CPUMBState *env, target_ulong newsp) { diff --git a/linux-user/mips/target_cpu.h b/linux-user/mips/target_cpu.h index 19b8855..2002920 100644 --- a/linux-user/mips/target_cpu.h +++ b/linux-user/mips/target_cpu.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_CPU_H -#define TARGET_CPU_H +#ifndef MIPS_TARGET_CPU_H +#define MIPS_TARGET_CPU_H static inline void cpu_clone_regs(CPUMIPSState *env, target_ulong newsp) { diff --git a/linux-user/openrisc/target_cpu.h b/linux-user/openrisc/target_cpu.h index 32a46ac..a21ed1a 100644 --- a/linux-user/openrisc/target_cpu.h +++ b/linux-user/openrisc/target_cpu.h @@ -17,8 +17,8 @@ * License along with this library; if not, see . */ -#ifndef TARGET_CPU_H -#define TARGET_CPU_H +#ifndef OPENRISC_TARGET_CPU_H +#define OPENRISC_TARGET_CPU_H static inline void cpu_clone_regs(CPUOpenRISCState *env, target_ulong newsp) { diff --git a/linux-user/ppc/target_cpu.h b/linux-user/ppc/target_cpu.h index 26f4ba2..3aab3d1 100644 --- a/linux-user/ppc/target_cpu.h +++ b/linux-user/ppc/target_cpu.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_CPU_H -#define TARGET_CPU_H +#ifndef PPC_TARGET_CPU_H +#define PPC_TARGET_CPU_H static inline void cpu_clone_regs(CPUPPCState *env, target_ulong newsp) { diff --git a/linux-user/s390x/target_cpu.h b/linux-user/s390x/target_cpu.h index f10abe8..87ea4d2 100644 --- a/linux-user/s390x/target_cpu.h +++ b/linux-user/s390x/target_cpu.h @@ -19,8 +19,8 @@ * You should have received a copy of the GNU (Lesser) General Public * License along with this library; if not, see . */ -#ifndef TARGET_CPU_H -#define TARGET_CPU_H +#ifndef S390X_TARGET_CPU_H +#define S390X_TARGET_CPU_H static inline void cpu_clone_regs(CPUS390XState *env, target_ulong newsp) { diff --git a/linux-user/sh4/target_cpu.h b/linux-user/sh4/target_cpu.h index 141856f..9d305d2 100644 --- a/linux-user/sh4/target_cpu.h +++ b/linux-user/sh4/target_cpu.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_CPU_H -#define TARGET_CPU_H +#ifndef SH4_TARGET_CPU_H +#define SH4_TARGET_CPU_H static inline void cpu_clone_regs(CPUSH4State *env, target_ulong newsp) { diff --git a/linux-user/sparc/target_cpu.h b/linux-user/sparc/target_cpu.h index 4944d46..f2fe526 100644 --- a/linux-user/sparc/target_cpu.h +++ b/linux-user/sparc/target_cpu.h @@ -17,8 +17,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_CPU_H -#define TARGET_CPU_H +#ifndef SPARC_TARGET_CPU_H +#define SPARC_TARGET_CPU_H static inline void cpu_clone_regs(CPUSPARCState *env, target_ulong newsp) { diff --git a/linux-user/tilegx/target_cpu.h b/linux-user/tilegx/target_cpu.h index c96e81d..4878e01 100644 --- a/linux-user/tilegx/target_cpu.h +++ b/linux-user/tilegx/target_cpu.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_CPU_H -#define TARGET_CPU_H +#ifndef TILEGX_TARGET_CPU_H +#define TILEGX_TARGET_CPU_H static inline void cpu_clone_regs(CPUTLGState *env, target_ulong newsp) { diff --git a/linux-user/unicore32/target_cpu.h b/linux-user/unicore32/target_cpu.h index fb79087..d7d2e7b 100644 --- a/linux-user/unicore32/target_cpu.h +++ b/linux-user/unicore32/target_cpu.h @@ -8,8 +8,8 @@ * published by the Free Software Foundation, or (at your option) any * later version. See the COPYING file in the top-level directory. */ -#ifndef TARGET_CPU_H -#define TARGET_CPU_H +#ifndef UNICORE32_TARGET_CPU_H +#define UNICORE32_TARGET_CPU_H static inline void cpu_clone_regs(CPUUniCore32State *env, target_ulong newsp) { -- cgit v1.1 From 9c93ae13a4014055c5c78e81078e5ccdc60c1cfa Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 29 Jun 2016 16:09:50 +0200 Subject: linux-user: Clean up target_signal.h header guards 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 Reviewed-by: Richard Henderson --- linux-user/aarch64/target_signal.h | 6 +++--- linux-user/alpha/target_signal.h | 6 +++--- linux-user/arm/target_signal.h | 6 +++--- linux-user/cris/target_signal.h | 6 +++--- linux-user/i386/target_signal.h | 6 +++--- linux-user/m68k/target_signal.h | 6 +++--- linux-user/microblaze/target_signal.h | 6 +++--- linux-user/mips/target_signal.h | 6 +++--- linux-user/mips64/target_signal.h | 6 +++--- linux-user/openrisc/target_signal.h | 6 +++--- linux-user/ppc/target_signal.h | 6 +++--- linux-user/s390x/target_signal.h | 6 +++--- linux-user/sh4/target_signal.h | 6 +++--- linux-user/sparc/target_signal.h | 6 +++--- linux-user/sparc64/target_signal.h | 6 +++--- linux-user/tilegx/target_signal.h | 6 +++--- linux-user/unicore32/target_signal.h | 6 +++--- linux-user/x86_64/target_signal.h | 6 +++--- 18 files changed, 54 insertions(+), 54 deletions(-) (limited to 'linux-user') diff --git a/linux-user/aarch64/target_signal.h b/linux-user/aarch64/target_signal.h index e8c677d..e66367c 100644 --- a/linux-user/aarch64/target_signal.h +++ b/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" @@ -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 */ diff --git a/linux-user/alpha/target_signal.h b/linux-user/alpha/target_signal.h index 4c78319..f1ed00d 100644 --- a/linux-user/alpha/target_signal.h +++ b/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" @@ -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 */ diff --git a/linux-user/arm/target_signal.h b/linux-user/arm/target_signal.h index fb31f4c..cbbeb09 100644 --- a/linux-user/arm/target_signal.h +++ b/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" @@ -27,4 +27,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUARMState *state) } -#endif /* TARGET_SIGNAL_H */ +#endif /* ARM_TARGET_SIGNAL_H */ diff --git a/linux-user/cris/target_signal.h b/linux-user/cris/target_signal.h index e0f1382..664621b 100644 --- a/linux-user/cris/target_signal.h +++ b/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" @@ -27,4 +27,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUCRISState *state) } -#endif /* TARGET_SIGNAL_H */ +#endif /* CRIS_TARGET_SIGNAL_H */ diff --git a/linux-user/i386/target_signal.h b/linux-user/i386/target_signal.h index 9baf7fb..837e90f 100644 --- a/linux-user/i386/target_signal.h +++ b/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" @@ -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 */ diff --git a/linux-user/m68k/target_signal.h b/linux-user/m68k/target_signal.h index 9deaa89..9d2d734 100644 --- a/linux-user/m68k/target_signal.h +++ b/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" @@ -27,4 +27,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUM68KState *state) } -#endif /* TARGET_SIGNAL_H */ +#endif /* M68K_TARGET_SIGNAL_H */ diff --git a/linux-user/microblaze/target_signal.h b/linux-user/microblaze/target_signal.h index acdf3b5..de2b0f4 100644 --- a/linux-user/microblaze/target_signal.h +++ b/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" @@ -27,4 +27,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUMBState *state) } -#endif /* TARGET_SIGNAL_H */ +#endif /* MICROBLAZE_TARGET_SIGNAL_H */ diff --git a/linux-user/mips/target_signal.h b/linux-user/mips/target_signal.h index 460cc9f..8dd27ce 100644 --- a/linux-user/mips/target_signal.h +++ b/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" @@ -27,4 +27,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUMIPSState *state) } -#endif /* TARGET_SIGNAL_H */ +#endif /* MIPS_TARGET_SIGNAL_H */ diff --git a/linux-user/mips64/target_signal.h b/linux-user/mips64/target_signal.h index a2dc514..67ef5a1 100644 --- a/linux-user/mips64/target_signal.h +++ b/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" @@ -27,4 +27,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUMIPSState *state) } -#endif /* TARGET_SIGNAL_H */ +#endif /* MIPS64_TARGET_SIGNAL_H */ diff --git a/linux-user/openrisc/target_signal.h b/linux-user/openrisc/target_signal.h index f600501..9f2c493 100644 --- a/linux-user/openrisc/target_signal.h +++ b/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" @@ -24,4 +24,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUOpenRISCState *state) } -#endif /* TARGET_SIGNAL_H */ +#endif /* OPENRISC_TARGET_SIGNAL_H */ diff --git a/linux-user/ppc/target_signal.h b/linux-user/ppc/target_signal.h index 4f01dd4..865c52f 100644 --- a/linux-user/ppc/target_signal.h +++ b/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" @@ -27,4 +27,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUPPCState *state) } -#endif /* TARGET_SIGNAL_H */ +#endif /* PPC_TARGET_SIGNAL_H */ diff --git a/linux-user/s390x/target_signal.h b/linux-user/s390x/target_signal.h index a6fb287..6f7b6ab 100644 --- a/linux-user/s390x/target_signal.h +++ b/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" @@ -24,4 +24,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUS390XState *state) } -#endif /* TARGET_SIGNAL_H */ +#endif /* S390X_TARGET_SIGNAL_H */ diff --git a/linux-user/sh4/target_signal.h b/linux-user/sh4/target_signal.h index f9911aa..cbf23b6 100644 --- a/linux-user/sh4/target_signal.h +++ b/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" @@ -27,4 +27,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUSH4State *state) } -#endif /* TARGET_SIGNAL_H */ +#endif /* SH4_TARGET_SIGNAL_H */ diff --git a/linux-user/sparc/target_signal.h b/linux-user/sparc/target_signal.h index 2df38c8..e445e2b 100644 --- a/linux-user/sparc/target_signal.h +++ b/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" @@ -34,4 +34,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUSPARCState *state) } -#endif /* TARGET_SIGNAL_H */ +#endif /* SPARC_TARGET_SIGNAL_H */ diff --git a/linux-user/sparc64/target_signal.h b/linux-user/sparc64/target_signal.h index 2df38c8..4449457 100644 --- a/linux-user/sparc64/target_signal.h +++ b/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" @@ -34,4 +34,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUSPARCState *state) } -#endif /* TARGET_SIGNAL_H */ +#endif /* SPARC64_TARGET_SIGNAL_H */ diff --git a/linux-user/tilegx/target_signal.h b/linux-user/tilegx/target_signal.h index fcf1040..f64551a 100644 --- a/linux-user/tilegx/target_signal.h +++ b/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" @@ -26,4 +26,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUTLGState *state) } -#endif /* TARGET_SIGNAL_H */ +#endif /* TILEGX_TARGET_SIGNAL_H */ diff --git a/linux-user/unicore32/target_signal.h b/linux-user/unicore32/target_signal.h index 7c44238..c6496fb 100644 --- a/linux-user/unicore32/target_signal.h +++ b/linux-user/unicore32/target_signal.h @@ -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 { @@ -27,4 +27,4 @@ static inline abi_ulong get_sp_from_cpustate(CPUUniCore32State *state) } -#endif /* TARGET_SIGNAL_H */ +#endif /* UNICORE32_TARGET_SIGNAL_H */ diff --git a/linux-user/x86_64/target_signal.h b/linux-user/x86_64/target_signal.h index 9baf7fb..1e95f4a 100644 --- a/linux-user/x86_64/target_signal.h +++ b/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" @@ -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 */ -- cgit v1.1 From 35003856977599497f7a873c026c95f2ed3a56e3 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 29 Jun 2016 16:15:33 +0200 Subject: linux-user: Clean up target_structs.h header guards These headers all use TARGET_STRUCTS_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_STRUCTS_H for linux-user/$target/target_structs.h. Signed-off-by: Markus Armbruster Reviewed-by: Richard Henderson --- linux-user/aarch64/target_structs.h | 4 ++-- linux-user/alpha/target_structs.h | 4 ++-- linux-user/arm/target_structs.h | 4 ++-- linux-user/cris/target_structs.h | 4 ++-- linux-user/i386/target_structs.h | 4 ++-- linux-user/m68k/target_structs.h | 4 ++-- linux-user/microblaze/target_structs.h | 4 ++-- linux-user/mips/target_structs.h | 4 ++-- linux-user/openrisc/target_structs.h | 4 ++-- linux-user/ppc/target_structs.h | 4 ++-- linux-user/s390x/target_structs.h | 4 ++-- linux-user/sh4/target_structs.h | 4 ++-- linux-user/sparc/target_structs.h | 4 ++-- linux-user/sparc64/target_structs.h | 4 ++-- linux-user/tilegx/target_structs.h | 4 ++-- linux-user/unicore32/target_structs.h | 4 ++-- linux-user/x86_64/target_structs.h | 4 ++-- 17 files changed, 34 insertions(+), 34 deletions(-) (limited to 'linux-user') diff --git a/linux-user/aarch64/target_structs.h b/linux-user/aarch64/target_structs.h index 21c1f2c..a4998a7 100644 --- a/linux-user/aarch64/target_structs.h +++ b/linux-user/aarch64/target_structs.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_STRUCTS_H -#define TARGET_STRUCTS_H +#ifndef AARCH64_TARGET_STRUCTS_H +#define AARCH64_TARGET_STRUCTS_H struct target_ipc_perm { abi_int __key; /* Key. */ diff --git a/linux-user/alpha/target_structs.h b/linux-user/alpha/target_structs.h index 50e7708..db2bfe2 100644 --- a/linux-user/alpha/target_structs.h +++ b/linux-user/alpha/target_structs.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_STRUCTS_H -#define TARGET_STRUCTS_H +#ifndef ALPHA_TARGET_STRUCTS_H +#define ALPHA_TARGET_STRUCTS_H struct target_ipc_perm { abi_int __key; /* Key. */ diff --git a/linux-user/arm/target_structs.h b/linux-user/arm/target_structs.h index f3c85d4..0bf034c 100644 --- a/linux-user/arm/target_structs.h +++ b/linux-user/arm/target_structs.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_STRUCTS_H -#define TARGET_STRUCTS_H +#ifndef ARM_TARGET_STRUCTS_H +#define ARM_TARGET_STRUCTS_H struct target_ipc_perm { abi_int __key; /* Key. */ diff --git a/linux-user/cris/target_structs.h b/linux-user/cris/target_structs.h index e4a1ffb..76f9653 100644 --- a/linux-user/cris/target_structs.h +++ b/linux-user/cris/target_structs.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_STRUCTS_H -#define TARGET_STRUCTS_H +#ifndef CRIS_TARGET_STRUCTS_H +#define CRIS_TARGET_STRUCTS_H struct target_ipc_perm { abi_int __key; /* Key. */ diff --git a/linux-user/i386/target_structs.h b/linux-user/i386/target_structs.h index 65f535e..25388a7 100644 --- a/linux-user/i386/target_structs.h +++ b/linux-user/i386/target_structs.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_STRUCTS_H -#define TARGET_STRUCTS_H +#ifndef I386_TARGET_STRUCTS_H +#define I386_TARGET_STRUCTS_H struct target_ipc_perm { abi_int __key; /* Key. */ diff --git a/linux-user/m68k/target_structs.h b/linux-user/m68k/target_structs.h index de257c9..a003676 100644 --- a/linux-user/m68k/target_structs.h +++ b/linux-user/m68k/target_structs.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_STRUCTS_H -#define TARGET_STRUCTS_H +#ifndef M68K_TARGET_STRUCTS_H +#define M68K_TARGET_STRUCTS_H struct target_ipc_perm { abi_int __key; /* Key. */ diff --git a/linux-user/microblaze/target_structs.h b/linux-user/microblaze/target_structs.h index 325e2f6..70dbdb6 100644 --- a/linux-user/microblaze/target_structs.h +++ b/linux-user/microblaze/target_structs.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_STRUCTS_H -#define TARGET_STRUCTS_H +#ifndef MICROBLAZE_TARGET_STRUCTS_H +#define MICROBLAZE_TARGET_STRUCTS_H struct target_ipc_perm { abi_int __key; /* Key. */ diff --git a/linux-user/mips/target_structs.h b/linux-user/mips/target_structs.h index 16021e8..fbd9955 100644 --- a/linux-user/mips/target_structs.h +++ b/linux-user/mips/target_structs.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_STRUCTS_H -#define TARGET_STRUCTS_H +#ifndef MIPS_TARGET_STRUCTS_H +#define MIPS_TARGET_STRUCTS_H struct target_ipc_perm { abi_int __key; /* Key. */ diff --git a/linux-user/openrisc/target_structs.h b/linux-user/openrisc/target_structs.h index f4d560f..afbb7ad 100644 --- a/linux-user/openrisc/target_structs.h +++ b/linux-user/openrisc/target_structs.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_STRUCTS_H -#define TARGET_STRUCTS_H +#ifndef OPENRISC_TARGET_STRUCTS_H +#define OPENRISC_TARGET_STRUCTS_H struct target_ipc_perm { abi_int __key; /* Key. */ diff --git a/linux-user/ppc/target_structs.h b/linux-user/ppc/target_structs.h index 2b87613..6b1f579 100644 --- a/linux-user/ppc/target_structs.h +++ b/linux-user/ppc/target_structs.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_STRUCTS_H -#define TARGET_STRUCTS_H +#ifndef PPC_TARGET_STRUCTS_H +#define PPC_TARGET_STRUCTS_H struct target_ipc_perm { abi_int __key; /* Key. */ diff --git a/linux-user/s390x/target_structs.h b/linux-user/s390x/target_structs.h index 6b6f5b5..cadff6d 100644 --- a/linux-user/s390x/target_structs.h +++ b/linux-user/s390x/target_structs.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_STRUCTS_H -#define TARGET_STRUCTS_H +#ifndef S390X_TARGET_STRUCTS_H +#define S390X_TARGET_STRUCTS_H struct target_ipc_perm { diff --git a/linux-user/sh4/target_structs.h b/linux-user/sh4/target_structs.h index 32b235e..3e832bf 100644 --- a/linux-user/sh4/target_structs.h +++ b/linux-user/sh4/target_structs.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_STRUCTS_H -#define TARGET_STRUCTS_H +#ifndef SH4_TARGET_STRUCTS_H +#define SH4_TARGET_STRUCTS_H struct target_ipc_perm { abi_int __key; /* Key. */ diff --git a/linux-user/sparc/target_structs.h b/linux-user/sparc/target_structs.h index c139e09..ee24c3b 100644 --- a/linux-user/sparc/target_structs.h +++ b/linux-user/sparc/target_structs.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_STRUCTS_H -#define TARGET_STRUCTS_H +#ifndef SPARC_TARGET_STRUCTS_H +#define SPARC_TARGET_STRUCTS_H struct target_ipc_perm { abi_int __key; /* Key. */ diff --git a/linux-user/sparc64/target_structs.h b/linux-user/sparc64/target_structs.h index fc17290..1808132 100644 --- a/linux-user/sparc64/target_structs.h +++ b/linux-user/sparc64/target_structs.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_STRUCTS_H -#define TARGET_STRUCTS_H +#ifndef SPARC64_TARGET_STRUCTS_H +#define SPARC64_TARGET_STRUCTS_H struct target_ipc_perm { abi_int __key; /* Key. */ diff --git a/linux-user/tilegx/target_structs.h b/linux-user/tilegx/target_structs.h index 7d3ff78..de8b1f2 100644 --- a/linux-user/tilegx/target_structs.h +++ b/linux-user/tilegx/target_structs.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_STRUCTS_H -#define TARGET_STRUCTS_H +#ifndef TILEGX_TARGET_STRUCTS_H +#define TILEGX_TARGET_STRUCTS_H struct target_ipc_perm { abi_int __key; /* Key. */ diff --git a/linux-user/unicore32/target_structs.h b/linux-user/unicore32/target_structs.h index 7893695..fbd4fa3 100644 --- a/linux-user/unicore32/target_structs.h +++ b/linux-user/unicore32/target_structs.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_STRUCTS_H -#define TARGET_STRUCTS_H +#ifndef UNICORE32_TARGET_STRUCTS_H +#define UNICORE32_TARGET_STRUCTS_H struct target_ipc_perm { abi_int __key; /* Key. */ diff --git a/linux-user/x86_64/target_structs.h b/linux-user/x86_64/target_structs.h index d934056..3489827 100644 --- a/linux-user/x86_64/target_structs.h +++ b/linux-user/x86_64/target_structs.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#ifndef TARGET_STRUCTS_H -#define TARGET_STRUCTS_H +#ifndef X86_64_TARGET_STRUCTS_H +#define X86_64_TARGET_STRUCTS_H struct target_ipc_perm { abi_int __key; /* Key. */ -- cgit v1.1 From 59e96bcbf904aa05185ac4161a65306dc26cda31 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 29 Jun 2016 16:22:46 +0200 Subject: linux-user: Clean up hostdep.h header guards These headers all use QEMU_HOSTDEP_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_HOSTDEP_H for linux-user/host/$target/hostdep.h. Signed-off-by: Markus Armbruster Reviewed-by: Richard Henderson --- linux-user/host/aarch64/hostdep.h | 4 ++-- linux-user/host/arm/hostdep.h | 4 ++-- linux-user/host/i386/hostdep.h | 4 ++-- linux-user/host/ia64/hostdep.h | 4 ++-- linux-user/host/mips/hostdep.h | 4 ++-- linux-user/host/ppc/hostdep.h | 4 ++-- linux-user/host/ppc64/hostdep.h | 4 ++-- linux-user/host/s390/hostdep.h | 4 ++-- linux-user/host/s390x/hostdep.h | 4 ++-- linux-user/host/sparc/hostdep.h | 4 ++-- linux-user/host/sparc64/hostdep.h | 4 ++-- linux-user/host/x32/hostdep.h | 4 ++-- linux-user/host/x86_64/hostdep.h | 4 ++-- 13 files changed, 26 insertions(+), 26 deletions(-) (limited to 'linux-user') diff --git a/linux-user/host/aarch64/hostdep.h b/linux-user/host/aarch64/hostdep.h index b79eaf1..64f75ce 100644 --- a/linux-user/host/aarch64/hostdep.h +++ b/linux-user/host/aarch64/hostdep.h @@ -9,8 +9,8 @@ * See the COPYING file in the top-level directory. */ -#ifndef QEMU_HOSTDEP_H -#define QEMU_HOSTDEP_H +#ifndef AARCH64_HOSTDEP_H +#define AARCH64_HOSTDEP_H /* We have a safe-syscall.inc.S */ #define HAVE_SAFE_SYSCALL diff --git a/linux-user/host/arm/hostdep.h b/linux-user/host/arm/hostdep.h index 8e1ff2f..5c1ae60 100644 --- a/linux-user/host/arm/hostdep.h +++ b/linux-user/host/arm/hostdep.h @@ -9,8 +9,8 @@ * See the COPYING file in the top-level directory. */ -#ifndef QEMU_HOSTDEP_H -#define QEMU_HOSTDEP_H +#ifndef ARM_HOSTDEP_H +#define ARM_HOSTDEP_H /* We have a safe-syscall.inc.S */ #define HAVE_SAFE_SYSCALL diff --git a/linux-user/host/i386/hostdep.h b/linux-user/host/i386/hostdep.h index 5a12f4a..d834bd8 100644 --- a/linux-user/host/i386/hostdep.h +++ b/linux-user/host/i386/hostdep.h @@ -9,8 +9,8 @@ * See the COPYING file in the top-level directory. */ -#ifndef QEMU_HOSTDEP_H -#define QEMU_HOSTDEP_H +#ifndef I386_HOSTDEP_H +#define I386_HOSTDEP_H /* We have a safe-syscall.inc.S */ #define HAVE_SAFE_SYSCALL diff --git a/linux-user/host/ia64/hostdep.h b/linux-user/host/ia64/hostdep.h index 7609bf5..263bf76 100644 --- a/linux-user/host/ia64/hostdep.h +++ b/linux-user/host/ia64/hostdep.h @@ -9,7 +9,7 @@ * See the COPYING file in the top-level directory. */ -#ifndef QEMU_HOSTDEP_H -#define QEMU_HOSTDEP_H +#ifndef IA64_HOSTDEP_H +#define IA64_HOSTDEP_H #endif diff --git a/linux-user/host/mips/hostdep.h b/linux-user/host/mips/hostdep.h index 7609bf5..ba111d7 100644 --- a/linux-user/host/mips/hostdep.h +++ b/linux-user/host/mips/hostdep.h @@ -9,7 +9,7 @@ * See the COPYING file in the top-level directory. */ -#ifndef QEMU_HOSTDEP_H -#define QEMU_HOSTDEP_H +#ifndef MIPS_HOSTDEP_H +#define MIPS_HOSTDEP_H #endif diff --git a/linux-user/host/ppc/hostdep.h b/linux-user/host/ppc/hostdep.h index 7609bf5..23d8bd9 100644 --- a/linux-user/host/ppc/hostdep.h +++ b/linux-user/host/ppc/hostdep.h @@ -9,7 +9,7 @@ * See the COPYING file in the top-level directory. */ -#ifndef QEMU_HOSTDEP_H -#define QEMU_HOSTDEP_H +#ifndef PPC_HOSTDEP_H +#define PPC_HOSTDEP_H #endif diff --git a/linux-user/host/ppc64/hostdep.h b/linux-user/host/ppc64/hostdep.h index 310e7d1..0b0f5f7 100644 --- a/linux-user/host/ppc64/hostdep.h +++ b/linux-user/host/ppc64/hostdep.h @@ -9,8 +9,8 @@ * See the COPYING file in the top-level directory. */ -#ifndef QEMU_HOSTDEP_H -#define QEMU_HOSTDEP_H +#ifndef PPC64_HOSTDEP_H +#define PPC64_HOSTDEP_H /* We have a safe-syscall.inc.S */ #define HAVE_SAFE_SYSCALL diff --git a/linux-user/host/s390/hostdep.h b/linux-user/host/s390/hostdep.h index 7609bf5..afcba5a 100644 --- a/linux-user/host/s390/hostdep.h +++ b/linux-user/host/s390/hostdep.h @@ -9,7 +9,7 @@ * See the COPYING file in the top-level directory. */ -#ifndef QEMU_HOSTDEP_H -#define QEMU_HOSTDEP_H +#ifndef S390_HOSTDEP_H +#define S390_HOSTDEP_H #endif diff --git a/linux-user/host/s390x/hostdep.h b/linux-user/host/s390x/hostdep.h index e95871c..6f9da9c 100644 --- a/linux-user/host/s390x/hostdep.h +++ b/linux-user/host/s390x/hostdep.h @@ -9,8 +9,8 @@ * See the COPYING file in the top-level directory. */ -#ifndef QEMU_HOSTDEP_H -#define QEMU_HOSTDEP_H +#ifndef S390X_HOSTDEP_H +#define S390X_HOSTDEP_H /* We have a safe-syscall.inc.S */ #define HAVE_SAFE_SYSCALL diff --git a/linux-user/host/sparc/hostdep.h b/linux-user/host/sparc/hostdep.h index 7609bf5..391ad92 100644 --- a/linux-user/host/sparc/hostdep.h +++ b/linux-user/host/sparc/hostdep.h @@ -9,7 +9,7 @@ * See the COPYING file in the top-level directory. */ -#ifndef QEMU_HOSTDEP_H -#define QEMU_HOSTDEP_H +#ifndef SPARC_HOSTDEP_H +#define SPARC_HOSTDEP_H #endif diff --git a/linux-user/host/sparc64/hostdep.h b/linux-user/host/sparc64/hostdep.h index 7609bf5..ce3968f 100644 --- a/linux-user/host/sparc64/hostdep.h +++ b/linux-user/host/sparc64/hostdep.h @@ -9,7 +9,7 @@ * See the COPYING file in the top-level directory. */ -#ifndef QEMU_HOSTDEP_H -#define QEMU_HOSTDEP_H +#ifndef SPARC64_HOSTDEP_H +#define SPARC64_HOSTDEP_H #endif diff --git a/linux-user/host/x32/hostdep.h b/linux-user/host/x32/hostdep.h index 7609bf5..2c2d6d3 100644 --- a/linux-user/host/x32/hostdep.h +++ b/linux-user/host/x32/hostdep.h @@ -9,7 +9,7 @@ * See the COPYING file in the top-level directory. */ -#ifndef QEMU_HOSTDEP_H -#define QEMU_HOSTDEP_H +#ifndef X32_HOSTDEP_H +#define X32_HOSTDEP_H #endif diff --git a/linux-user/host/x86_64/hostdep.h b/linux-user/host/x86_64/hostdep.h index 9dfbf3a..3b42596 100644 --- a/linux-user/host/x86_64/hostdep.h +++ b/linux-user/host/x86_64/hostdep.h @@ -9,8 +9,8 @@ * See the COPYING file in the top-level directory. */ -#ifndef QEMU_HOSTDEP_H -#define QEMU_HOSTDEP_H +#ifndef X86_64_HOSTDEP_H +#define X86_64_HOSTDEP_H /* We have a safe-syscall.inc.S */ #define HAVE_SAFE_SYSCALL -- cgit v1.1 From 1b3c4fdf30719ec97da2ec2f247f587be9e4aafb Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 29 Jun 2016 15:54:17 +0200 Subject: linux-user: Fix broken header guard in syscall_defs.h Found with scripts/clean-header-guards.pl. Signed-off-by: Markus Armbruster Reviewed-by: Richard Henderson --- linux-user/syscall_defs.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'linux-user') diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index dce1bcc..b43966e 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -5,8 +5,7 @@ necessary */ #ifndef SYSCALL_DEFS_H -#define SYSCALL_DEFS_H 1 - +#define SYSCALL_DEFS_H #include "syscall_nr.h" @@ -2577,8 +2576,6 @@ struct target_ucred { uint32_t gid; }; -#endif - typedef int32_t target_timer_t; #define TARGET_SIGEV_MAX_SIZE 64 @@ -2620,3 +2617,5 @@ struct target_user_cap_data { uint32_t permitted; uint32_t inheritable; }; + +#endif -- cgit v1.1 From 2a6a4076e117113ebec97b1821071afccfdfbc96 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 29 Jun 2016 13:47:03 +0200 Subject: Clean up ill-advised or unusual header guards Cleaned up with scripts/clean-header-guards.pl. Signed-off-by: Markus Armbruster Reviewed-by: Richard Henderson --- linux-user/arm/nwfpe/fpa11.h | 4 ++-- linux-user/arm/nwfpe/fpopcode.h | 4 ++-- linux-user/arm/nwfpe/fpsr.h | 4 ++-- linux-user/linux_loop.h | 5 +++-- linux-user/tilegx/syscall_nr.h | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) (limited to 'linux-user') diff --git a/linux-user/arm/nwfpe/fpa11.h b/linux-user/arm/nwfpe/fpa11.h index 7f6f654..d459c5d 100644 --- a/linux-user/arm/nwfpe/fpa11.h +++ b/linux-user/arm/nwfpe/fpa11.h @@ -18,8 +18,8 @@ along with this program; if not, see . */ -#ifndef __FPA11_H__ -#define __FPA11_H__ +#ifndef FPA11_H +#define FPA11_H #include "cpu.h" diff --git a/linux-user/arm/nwfpe/fpopcode.h b/linux-user/arm/nwfpe/fpopcode.h index 1b1137f..06cd909 100644 --- a/linux-user/arm/nwfpe/fpopcode.h +++ b/linux-user/arm/nwfpe/fpopcode.h @@ -18,8 +18,8 @@ along with this program; if not, see . */ -#ifndef __FPOPCODE_H__ -#define __FPOPCODE_H__ +#ifndef FPOPCODE_H +#define FPOPCODE_H /* ARM Floating Point Instruction Classes diff --git a/linux-user/arm/nwfpe/fpsr.h b/linux-user/arm/nwfpe/fpsr.h index 859dcd5..8c978f0 100644 --- a/linux-user/arm/nwfpe/fpsr.h +++ b/linux-user/arm/nwfpe/fpsr.h @@ -18,8 +18,8 @@ along with this program; if not, see . */ -#ifndef __FPSR_H__ -#define __FPSR_H__ +#ifndef FPSR_H +#define FPSR_H /* The FPSR is a 32 bit register consisting of 4 parts, each exactly diff --git a/linux-user/linux_loop.h b/linux-user/linux_loop.h index 8974caa..1f52403 100644 --- a/linux-user/linux_loop.h +++ b/linux-user/linux_loop.h @@ -1,6 +1,7 @@ /* Copied from 2.6.25 kernel headers to avoid problems on older hosts. */ -#ifndef _LINUX_LOOP_H -#define _LINUX_LOOP_H + +#ifndef LINUX_LOOP_H +#define LINUX_LOOP_H /* * include/linux/loop.h diff --git a/linux-user/tilegx/syscall_nr.h b/linux-user/tilegx/syscall_nr.h index 87fb72c..8e30cd1 100644 --- a/linux-user/tilegx/syscall_nr.h +++ b/linux-user/tilegx/syscall_nr.h @@ -1,5 +1,5 @@ -#ifndef TILEGX_SYSCALL_NR -#define TILEGX_SYSCALL_NR +#ifndef TILEGX_SYSCALL_NR_H +#define TILEGX_SYSCALL_NR_H /* * Copy from linux kernel asm-generic/unistd.h, which tilegx uses. -- cgit v1.1 From 175de52487ce0b0c78daa4cdf41a5a465a168a25 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 29 Jun 2016 15:29:06 +0200 Subject: Clean up decorations and whitespace around header guards Cleaned up with scripts/clean-header-guards.pl. Signed-off-by: Markus Armbruster Reviewed-by: Richard Henderson --- linux-user/uname.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linux-user') diff --git a/linux-user/uname.h b/linux-user/uname.h index cc62e76..4503094 100644 --- a/linux-user/uname.h +++ b/linux-user/uname.h @@ -1,5 +1,5 @@ #ifndef UNAME_H -#define UNAME_H 1 +#define UNAME_H #include #include @@ -7,4 +7,4 @@ const char *cpu_to_uname_machine(void *cpu_env); int sys_uname(struct new_utsname *buf); -#endif /* UNAME _H */ +#endif /* UNAME_H */ -- cgit v1.1