build: Rename all "syscall.h" in target directories to "target_syscall.h".
PATCH 1/1 build: Rename all "syscall.h" in target directories to "target_syscall.h".
This fixes double-definitions in *-user builds when using the UST tracing backend (which indirectly includes the system's "syscall.h").
---
bsd-user/qemu.h | 2 +-
linux-user/aarch64/target_syscall.h | 5 +++++
linux-user/alpha/target_syscall.h | 5 +++++
linux-user/arm/target_syscall.h | 4 ++++
linux-user/cris/target_syscall.h | 0
linux-user/i386/target_syscall.h | 5 +++++
linux-user/m68k/target_syscall.h | 4 ++++
linux-user/mips/target_syscall.h | 4 ++++
linux-user/mips64/target_syscall.h | 4 ++++
linux-user/openrisc/target_syscall.h | 5 +++++
linux-user/ppc/target_syscall.h | 5 +++++
linux-user/qemu.h | 2 +-
linux-user/s390x/target_syscall.h | 5 +++++
linux-user/sh4/target_syscall.h | 5 +++++
linux-user/sparc/target_syscall.h | 5 +++++
linux-user/sparc64/target_syscall.h | 5 +++++
linux-user/unicore32/target_syscall.h | 0
linux-user/x86_64/target_syscall.h | 5 +++++
target-microblaze/target_syscall.h | 1 +
target-tilegx/target_syscall.h | 1 +
20 files changed, 70 insertions(+), 2 deletions(-)
rename linux-user/aarch64/{syscall.h => target_syscall.h} (80%)
rename linux-user/alpha/{syscall.h => target_syscall.h} (98%)
rename linux-user/arm/{syscall.h => target_syscall.h} (93%)
rename linux-user/cris/{syscall.h => target_syscall.h} (100%)
rename linux-user/i386/{syscall.h => target_syscall.h} (97%)
rename linux-user/m68k/{syscall.h => target_syscall.h} (87%)
rename linux-user/mips/{syscall.h => target_syscall.h} (99%)
rename linux-user/mips64/{syscall.h => target_syscall.h} (99%)
rename linux-user/openrisc/{syscall.h => target_syscall.h} (90%)
rename linux-user/ppc/{syscall.h => target_syscall.h} (96%)
rename linux-user/s390x/{syscall.h => target_syscall.h} (89%)
rename linux-user/sh4/{syscall.h => target_syscall.h} (83%)
rename linux-user/sparc/{syscall.h => target_syscall.h} (87%)
rename linux-user/sparc64/{syscall.h => target_syscall.h} (87%)
rename linux-user/unicore32/{syscall.h => target_syscall.h} (100%)
rename linux-user/x86_64/{syscall.h => target_syscall.h} (96%)
create mode 100644 target-microblaze/target_syscall.h
create mode 100644 target-tilegx/target_syscall.hbsd-user/qemu.h +1 -1
@@ -38,7 +38,7 @@ enum BSDType {extern enum BSDType bsd_type;#include "syscall_defs.h" -#include "syscall.h" +#include "target_syscall.h" #include "target_signal.h" #include "exec/gdbstub.h"
linux-user/aarch64/target_syscall.h renamed from linux-user/aarch64/syscall.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_SYSCALL_H + struct target_pt_regs { uint64_t regs[31]; uint64_t sp;
@@ -11,3 +14,5 @@ struct target_pt_regs {#define TARGET_MINSIGSTKSZ 2048#define TARGET_MLOCKALL_MCL_CURRENT 1#define TARGET_MLOCKALL_MCL_FUTURE 2 + +#endif /* TARGET_SYSCALL_H */
linux-user/alpha/target_syscall.h renamed from linux-user/alpha/syscall.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_SYSCALL_H +/* default linux values for the selectors */ #define __USER_DS (1)
@@ -255,3 +258,5 @@ struct target_pt_regs {#define TARGET_MINSIGSTKSZ 4096#define TARGET_MLOCKALL_MCL_CURRENT 0x2000#define TARGET_MLOCKALL_MCL_FUTURE 0x4000 + +#endif /* TARGET_SYSCALL_H */
linux-user/arm/target_syscall.h renamed from linux-user/arm/syscall.h +4 -0
@@ -1,3 +1,5 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_SYSCALL_H /* this struct defines the way the registers are stored on the stack during a system call. */
@@ -48,3 +50,5 @@ struct target_pt_regs {#define TARGET_MINSIGSTKSZ 2048#define TARGET_MLOCKALL_MCL_CURRENT 1#define TARGET_MLOCKALL_MCL_FUTURE 2 + +#endif /* TARGET_SYSCALL_H */
linux-user/cris/target_syscall.h renamed from linux-user/cris/syscall.h +0 -0
linux-user/i386/target_syscall.h renamed from linux-user/i386/syscall.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_SYSCALL_H +/* default linux values for the selectors */ #define __USER_CS (0x23)#define __USER_DS (0x2B)
@@ -150,3 +153,5 @@ struct target_vm86plus_struct {#define TARGET_MINSIGSTKSZ 2048#define TARGET_MLOCKALL_MCL_CURRENT 1#define TARGET_MLOCKALL_MCL_FUTURE 2 + +#endif /* TARGET_SYSCALL_H */
linux-user/m68k/target_syscall.h renamed from linux-user/m68k/syscall.h +4 -0
@@ -1,3 +1,5 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_SYSCALL_H /* this struct defines the way the registers are stored on the stack during a system call. */
@@ -23,3 +25,5 @@ struct target_pt_regs {#define TARGET_MLOCKALL_MCL_FUTURE 2void do_m68k_simcall (CPUM68KState *,int ); + +#endif /* TARGET_SYSCALL_H */
linux-user/mips/target_syscall.h renamed from linux-user/mips/syscall.h +4 -0
@@ -1,3 +1,5 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_SYSCALL_H /* this struct defines the way the registers are stored on the stack during a system call. */
@@ -231,3 +233,5 @@ struct target_pt_regs {#define TARGET_MINSIGSTKSZ 2048#define TARGET_MLOCKALL_MCL_CURRENT 1#define TARGET_MLOCKALL_MCL_FUTURE 2 + +#endif /* TARGET_SYSCALL_H */
linux-user/mips64/target_syscall.h renamed from linux-user/mips64/syscall.h +4 -0
@@ -1,3 +1,5 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_SYSCALL_H /* this struct defines the way the registers are stored on the stack during a system call. */
@@ -228,3 +230,5 @@ struct target_pt_regs {#define TARGET_MINSIGSTKSZ 2048#define TARGET_MLOCKALL_MCL_CURRENT 1#define TARGET_MLOCKALL_MCL_FUTURE 2 + +#endif /* TARGET_SYSCALL_H */
linux-user/openrisc/target_syscall.h renamed from linux-user/openrisc/syscall.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_SYSCALL_H + struct target_pt_regs { union { struct {
@@ -27,3 +30,5 @@ struct target_pt_regs {#define TARGET_MINSIGSTKSZ 2048#define TARGET_MLOCKALL_MCL_CURRENT 1#define TARGET_MLOCKALL_MCL_FUTURE 2 + +#endif /* TARGET_SYSCALL_H */
linux-user/ppc/target_syscall.h renamed from linux-user/ppc/syscall.h +5 -0
@@ -17,6 +17,9 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#ifndef TARGET_SYSCALL_H +#define TARGET_SYSCALL_H +/* XXX: ABSOLUTELY BUGGY: * for now, this is quite just a cut-and-paste from i386 target... */
@@ -73,3 +76,5 @@ struct target_revectored_struct {#define TARGET_MINSIGSTKSZ 2048#define TARGET_MLOCKALL_MCL_CURRENT 0x2000#define TARGET_MLOCKALL_MCL_FUTURE 0x4000 + +#endif /* TARGET_SYSCALL_H */
linux-user/qemu.h +1 -1
@@ -16,7 +16,7 @@#include "exec/user/thunk.h" #include "syscall_defs.h" -#include "syscall.h" +#include "target_syscall.h" #include "exec/gdbstub.h" #include "qemu/queue.h"
linux-user/s390x/target_syscall.h renamed from linux-user/s390x/syscall.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_SYSCALL_H + /* this typedef defines how a Program Status Word looks like */ typedef struct { abi_ulong mask;
@@ -27,3 +30,5 @@ struct target_pt_regs {#define TARGET_MINSIGSTKSZ 2048#define TARGET_MLOCKALL_MCL_CURRENT 1#define TARGET_MLOCKALL_MCL_FUTURE 2 + +#endif /* TARGET_SYSCALL_H */
linux-user/sh4/target_syscall.h renamed from linux-user/sh4/syscall.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_SYSCALL_H + struct target_pt_regs { unsigned long regs[16]; unsigned long pc;
@@ -15,3 +18,5 @@ struct target_pt_regs {#define TARGET_MINSIGSTKSZ 2048#define TARGET_MLOCKALL_MCL_CURRENT 1#define TARGET_MLOCKALL_MCL_FUTURE 2 + +#endif /* TARGET_SYSCALL_H */
linux-user/sparc/target_syscall.h renamed from linux-user/sparc/syscall.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_SYSCALL_H + struct target_pt_regs { abi_ulong psr; abi_ulong pc;
@@ -18,3 +21,5 @@ struct target_pt_regs {#define TARGET_MINSIGSTKSZ 4096#define TARGET_MLOCKALL_MCL_CURRENT 0x2000#define TARGET_MLOCKALL_MCL_FUTURE 0x4000 + +#endif /* TARGET_SYSCALL_H */
linux-user/sparc64/target_syscall.h renamed from linux-user/sparc64/syscall.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_SYSCALL_H + struct target_pt_regs { abi_ulong u_regs[16]; abi_ulong tstate;
@@ -19,3 +22,5 @@ struct target_pt_regs {#define TARGET_MINSIGSTKSZ 4096#define TARGET_MLOCKALL_MCL_CURRENT 0x2000#define TARGET_MLOCKALL_MCL_FUTURE 0x4000 + +#endif /* TARGET_SYSCALL_H */
linux-user/unicore32/target_syscall.h renamed from linux-user/unicore32/syscall.h +0 -0
linux-user/x86_64/target_syscall.h renamed from linux-user/x86_64/syscall.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_SYSCALL_H +#define __USER_CS (0x33)#define __USER_DS (0x2B)
@@ -100,3 +103,5 @@ struct target_msqid64_ds {#define TARGET_MINSIGSTKSZ 2048#define TARGET_MLOCKALL_MCL_CURRENT 1#define TARGET_MLOCKALL_MCL_FUTURE 2 + +#endif /* TARGET_SYSCALL_H */
target-microblaze/target_syscall.h new file +1 -0
@@ -0,0 +1 @@ +#include <syscall.h>
target-tilegx/target_syscall.h new file +1 -0
@@ -0,0 +1 @@ +#include <syscall.h>
Quoted 50 lines · Lluís Vilanova
This fixes double-definitions in *-user builds when using the UST tracing backend (which indirectly includes the system's "
syscall.h").Signed-off-by Lluís Vilanova <[email protected]>--- bsd-user/qemu.h | 2 +- linux-user/aarch64/target_syscall.h | 5 +++++ linux-user/alpha/target_syscall.h | 5 +++++ linux-user/arm/target_syscall.h | 4 ++++ linux-user/cris/target_syscall.h | 0 linux-user/i386/target_syscall.h | 5 +++++ linux-user/m68k/target_syscall.h | 4 ++++ linux-user/mips/target_syscall.h | 4 ++++ linux-user/mips64/target_syscall.h | 4 ++++ linux-user/openrisc/target_syscall.h | 5 +++++ linux-user/ppc/target_syscall.h | 5 +++++ linux-user/qemu.h | 2 +- linux-user/s390x/target_syscall.h | 5 +++++ linux-user/sh4/target_syscall.h | 5 +++++ linux-user/sparc/target_syscall.h | 5 +++++ linux-user/sparc64/target_syscall.h | 5 +++++ linux-user/unicore32/target_syscall.h | 0 linux-user/x86_64/target_syscall.h | 5 +++++ target-microblaze/target_syscall.h | 1 + target-tilegx/target_syscall.h | 1 + 20 files changed, 70 insertions(+), 2 deletions(-) rename linux-user/aarch64/{syscall.h => target_syscall.h} (80%) rename linux-user/alpha/{syscall.h => target_syscall.h} (98%) rename linux-user/arm/{syscall.h => target_syscall.h} (93%) rename linux-user/cris/{syscall.h => target_syscall.h} (100%) rename linux-user/i386/{syscall.h => target_syscall.h} (97%) rename linux-user/m68k/{syscall.h => target_syscall.h} (87%) rename linux-user/mips/{syscall.h => target_syscall.h} (99%) rename linux-user/mips64/{syscall.h => target_syscall.h} (99%) rename linux-user/openrisc/{syscall.h => target_syscall.h} (90%) rename linux-user/ppc/{syscall.h => target_syscall.h} (96%) rename linux-user/s390x/{syscall.h => target_syscall.h} (89%) rename linux-user/sh4/{syscall.h => target_syscall.h} (83%) rename linux-user/sparc/{syscall.h => target_syscall.h} (87%) rename linux-user/sparc64/{syscall.h => target_syscall.h} (87%) rename linux-user/unicore32/{syscall.h => target_syscall.h} (100%) rename linux-user/x86_64/{syscall.h => target_syscall.h} (96%) create mode 100644 target-microblaze/target_syscall.h create mode 100644 target-tilegx/target_syscall.hbsd-user/qemu.h +0
-0
bsd-user/qemu.h enum BSDType { · line 41
Quoted 5 lines
bsd-user/qemu.h +1
-1@@ -38,7 +38,7 @@ enum BSDType {extern enum BSDType bsd_type;#include "syscall_defs.h" -#include "syscall.h" +#include "target_syscall.h"
If you want to change this you need to rename all the bsd-user/*/syscall.h too. Otherwise bsd-user compilation will break.
Personally I think I'd do linux-user in one patch and bsd-user in a second patch.
thanks
-- PMM
Quoted 61 lines · Peter Maydell
Quoted 50 lines · Lluís Vilanova
This fixes double-definitions in *-user builds when using the UST tracing backend (which indirectly includes the system's "
syscall.h").Signed-off-by Lluís Vilanova <[email protected]>---
bsd-user/qemu.h | 2 +- linux-user/aarch64/target_syscall.h | 5 +++++ linux-user/alpha/target_syscall.h | 5 +++++ linux-user/arm/target_syscall.h | 4 ++++ linux-user/cris/target_syscall.h | 0 linux-user/i386/target_syscall.h | 5 +++++ linux-user/m68k/target_syscall.h | 4 ++++ linux-user/mips/target_syscall.h | 4 ++++ linux-user/mips64/target_syscall.h | 4 ++++ linux-user/openrisc/target_syscall.h | 5 +++++ linux-user/ppc/target_syscall.h | 5 +++++ linux-user/qemu.h | 2 +- linux-user/s390x/target_syscall.h | 5 +++++ linux-user/sh4/target_syscall.h | 5 +++++ linux-user/sparc/target_syscall.h | 5 +++++ linux-user/sparc64/target_syscall.h | 5 +++++ linux-user/unicore32/target_syscall.h | 0 linux-user/x86_64/target_syscall.h | 5 +++++ target-microblaze/target_syscall.h | 1 + target-tilegx/target_syscall.h | 1 + 20 files changed, 70 insertions(+), 2 deletions(-)rename
linux-user/aarch64/{syscall.h=>target_syscall.h} (80%) renamelinux-user/alpha/{syscall.h=>target_syscall.h} (98%) renamelinux-user/arm/{syscall.h=>target_syscall.h} (93%) renamelinux-user/cris/{syscall.h=>target_syscall.h} (100%) renamelinux-user/i386/{syscall.h=>target_syscall.h} (97%) renamelinux-user/m68k/{syscall.h=>target_syscall.h} (87%) renamelinux-user/mips/{syscall.h=>target_syscall.h} (99%) renamelinux-user/mips64/{syscall.h=>target_syscall.h} (99%) renamelinux-user/openrisc/{syscall.h=>target_syscall.h} (90%) renamelinux-user/ppc/{syscall.h=>target_syscall.h} (96%) renamelinux-user/s390x/{syscall.h=>target_syscall.h} (89%) renamelinux-user/sh4/{syscall.h=>target_syscall.h} (83%) renamelinux-user/sparc/{syscall.h=>target_syscall.h} (87%) renamelinux-user/sparc64/{syscall.h=>target_syscall.h} (87%) renamelinux-user/unicore32/{syscall.h=>target_syscall.h} (100%) renamelinux-user/x86_64/{syscall.h=>target_syscall.h} (96%) create mode 100644target-microblaze/target_syscall.hcreate mode 100644target-tilegx/target_syscall.hbsd-user/qemu.h +0
-0bsd-user/qemu.h enum BSDType { · line 41
Quoted 5 lines
bsd-user/qemu.h +1
-1@@ -38,7 +38,7 @@ enum BSDType {extern enum BSDType bsd_type;#include "syscall_defs.h" -#include "syscall.h" +#include "target_syscall.h" If you want to change this you need to rename all the
bsd-user/*/syscall.htoo. Otherwise bsd-user compilation will break.
Quoted 2 lines
Personally I think I'd do linux-user in one patch and bsd-user in a second patch.
True, my bad (my build did not catch this one). I'll send a v2 series.
Thanks,
Lluis