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/tilegx/target_syscall.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linux-user/tilegx') diff --git a/linux-user/tilegx/target_syscall.h b/linux-user/tilegx/target_syscall.h index a938d4e90c..d731acdafa 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" -- cgit v1.2.3 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/tilegx/target_cpu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linux-user/tilegx') diff --git a/linux-user/tilegx/target_cpu.h b/linux-user/tilegx/target_cpu.h index c96e81d05e..4878e01b03 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) { -- cgit v1.2.3 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/tilegx/target_signal.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'linux-user/tilegx') diff --git a/linux-user/tilegx/target_signal.h b/linux-user/tilegx/target_signal.h index fcf10405c4..f64551a8cf 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 */ -- cgit v1.2.3 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/tilegx/target_structs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linux-user/tilegx') diff --git a/linux-user/tilegx/target_structs.h b/linux-user/tilegx/target_structs.h index 7d3ff782fd..de8b1f2f45 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. */ -- cgit v1.2.3 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/tilegx/syscall_nr.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linux-user/tilegx') diff --git a/linux-user/tilegx/syscall_nr.h b/linux-user/tilegx/syscall_nr.h index 87fb72c554..8e30cd1ae9 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.2.3