Commit 41feb5b9 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-3.0-pull-request' into staging 



move more data to arch specific files
fix SPARC %tick
replace strcpy() by g_strlcpy() in syscall.c

# gpg: Signature made Mon 04 Jun 2018 16:19:44 BST
# gpg:                using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>"
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/linux-user-for-3.0-pull-request:
  linux-user: remove useless #if
  linux-user: move hppa signal definitions to hppa/target_signal.h
  linux-user: move alpha signal definitions to alpha/target_signal.h
  linux-user: move openrisc signal definitions to openrisc/target_signal.h
  linux-user: move mips signal definitions to mips/target_signal.h
  linux-user: move sparc signal definitions to sparc/target_signal.h
  linux-user: move generic signal definitions to generic/signal.h
  linux-user: move get_sp_from_cpustate() to target_cpu.h
  linux-user: move sparc/sparc64 fcntl definitions to sparc/target_fcntl.h
  linux-user: move ppc fcntl definitions to ppc/target_fcntl.h
  linux-user: move mips/mips64 fcntl definitions to mips/target_fcntl.h
  linux-user: move arm/aarch64/m68k fcntl definitions to [arm|aarch64|m68k]/target_fcntl.h
  linux-user: move hppa fcntl definitions to hppa/target_fcntl.h
  linux-user: move alpha fcntl definitions to alpha/target_fcntl.h
  linux-user: move generic fcntl definitions to generic/fcntl.h
  linux-user: SPARC "rd %tick" can be used by user application
  syscall: replace strcpy() by g_strlcpy()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 0d514fa2 7ea65371

linux-user/aarch64/signal.c

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
 */

#include "qemu/osdep.h"

#include "qemu.h"

#include "target_signal.h"

#include "signal-common.h"

#include "linux-user/trace.h"

linux-user/aarch64/target_cpu.h

+4 −0
Original line number Diff line number Diff line
@@ -35,4 +35,8 @@ static inline void cpu_set_tls(CPUARMState *env, target_ulong newtls) 
    env->cp15.tpidr_el[0] = newtls;

}



static inline abi_ulong get_sp_from_cpustate(CPUARMState *state)

{

   return state->xregs[31];

}

#endif

linux-user/aarch64/target_fcntl.h

0 → 100644
+16 −0
Original line number Diff line number Diff line 
/*

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation, or (at your option) any

 * later version. See the COPYING file in the top-level directory.

 */



#ifndef AARCH64_TARGET_FCNTL_H

#define AARCH64_TARGET_FCNTL_H



#define TARGET_O_DIRECTORY      040000 /* must be a directory */

#define TARGET_O_NOFOLLOW      0100000 /* don't follow links */

#define TARGET_O_DIRECT        0200000 /* direct disk access hint */



#include "../generic/fcntl.h"

#endif

linux-user/aarch64/target_signal.h

+1 −6
Original line number Diff line number Diff line 
#ifndef AARCH64_TARGET_SIGNAL_H

#define AARCH64_TARGET_SIGNAL_H



#include "cpu.h"



/* this struct defines a stack used during syscall handling */



typedef struct target_sigaltstack {
@@ -21,10 +19,7 @@ typedef struct target_sigaltstack { 
#define TARGET_MINSIGSTKSZ 2048

#define TARGET_SIGSTKSZ 8192



static inline abi_ulong get_sp_from_cpustate(CPUARMState *state)

{

   return state->xregs[31];

}

#include "../generic/signal.h"



#define TARGET_ARCH_HAS_SETUP_FRAME

#endif /* AARCH64_TARGET_SIGNAL_H */

linux-user/alpha/signal.c

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
 */

#include "qemu/osdep.h"

#include "qemu.h"

#include "target_signal.h"

#include "signal-common.h"

#include "linux-user/trace.h"