On 29 January 2016 at 18:53, Lluís Vilanova <vilan...@ac.upc.edu> wrote:
> 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 <vilan...@ac.upc.edu>
> ---
> 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.h
>
> diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
> index 735cb40..1a361df 100644
> --- a/bsd-user/qemu.h
> +++ b/bsd-user/qemu.h
> @@ -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
