Commit d6550e9e authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20160527' into staging 



linux-user pull request v2 for may 2016

# gpg: Signature made Fri 27 May 2016 12:51:10 BST using RSA key ID DE3C9BC0
# gpg: Good signature from "Riku Voipio <riku.voipio@iki.fi>"
# gpg:                 aka "Riku Voipio <riku.voipio@linaro.org>"

* remotes/riku/tags/pull-linux-user-20160527: (38 commits)
  linux-user,target-ppc: fix use of MSR_LE
  linux-user/signal.c: Use s390 target space address instead of host space
  linux-user/signal.c: Use target address instead of host address for microblaze restorer
  linux-user/signal.c: Generate opcode data for restorer in setup_rt_frame
  linux-user: arm: Remove ARM_cpsr and similar #defines
  linux-user: Use direct syscalls for setuid(), etc
  linux-user: x86_64: Don't use 16-bit UIDs
  linux-user: Use g_try_malloc() in do_msgrcv()
  linux-user: Handle msgrcv error case correctly
  linux-user: Handle negative values in timespec conversion
  linux-user: Use safe_syscall for futex syscall
  linux-user: Use safe_syscall for pselect, select syscalls
  linux-user: Use safe_syscall for execve syscall
  linux-user: Use safe_syscall for wait system calls
  linux-user: Use safe_syscall for open and openat system calls
  linux-user: Use safe_syscall for read and write system calls
  linux-user: Provide safe_syscall for fixing races between signals and syscalls
  linux-user: Add debug code to exercise restarting system calls
  linux-user: Support for restarting system calls for Microblaze targets
  linux-user: Set r14 on exit from microblaze syscall
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 34c99d7b 49e55cba

Makefile.target

+6 −1
Original line number Diff line number Diff line
@@ -108,7 +108,12 @@ obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/dpd/decimal128.o 


ifdef CONFIG_LINUX_USER



QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) -I$(SRC_PATH)/linux-user

# Note that we only add linux-user/host/$ARCH if it exists, and

# that it must come before linux-user/host/generic in the search path.

QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) \

             $(patsubst %,-I%,$(wildcard $(SRC_PATH)/linux-user/host/$(ARCH))) \

             -I$(SRC_PATH)/linux-user/host/generic \

             -I$(SRC_PATH)/linux-user



obj-y += linux-user/

obj-y += gdbstub.o thunk.o user-exec.o

linux-user/Makefile.objs

+2 −1
Original line number Diff line number Diff line 
obj-y = main.o syscall.o strace.o mmap.o signal.o \

	elfload.o linuxload.o uaccess.o uname.o

	elfload.o linuxload.o uaccess.o uname.o \

	safe-syscall.o



obj-$(TARGET_HAS_BFLT) += flatload.o

obj-$(TARGET_I386) += vm86.o

linux-user/alpha/target_signal.h

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ static inline abi_ulong get_sp_from_cpustate(CPUAlphaState *state) 
    return state->ir[IR_SP];

}





/* From <asm/gentrap.h>.  */

#define TARGET_GEN_INTOVF      -1      /* integer overflow */

#define TARGET_GEN_INTDIV      -2      /* integer division by zero */

linux-user/arm/target_signal.h

+1 −0
Original line number Diff line number Diff line
@@ -26,4 +26,5 @@ static inline abi_ulong get_sp_from_cpustate(CPUARMState *state) 
   return state->regs[13];

}





#endif /* TARGET_SIGNAL_H */

linux-user/arm/target_syscall.h

+1 −19
Original line number Diff line number Diff line
@@ -4,29 +4,11 @@ 
/* this struct defines the way the registers are stored on the

   stack during a system call. */



/* uregs[0..15] are r0 to r15; uregs[16] is CPSR; uregs[17] is ORIG_r0 */

struct target_pt_regs {

    abi_long uregs[18];

};



#define ARM_cpsr	uregs[16]

#define ARM_pc		uregs[15]

#define ARM_lr		uregs[14]

#define ARM_sp		uregs[13]

#define ARM_ip		uregs[12]

#define ARM_fp		uregs[11]

#define ARM_r10		uregs[10]

#define ARM_r9		uregs[9]

#define ARM_r8		uregs[8]

#define ARM_r7		uregs[7]

#define ARM_r6		uregs[6]

#define ARM_r5		uregs[5]

#define ARM_r4		uregs[4]

#define ARM_r3		uregs[3]

#define ARM_r2		uregs[2]

#define ARM_r1		uregs[1]

#define ARM_r0		uregs[0]

#define ARM_ORIG_r0	uregs[17]



#define ARM_SYSCALL_BASE	0x900000

#define ARM_THUMB_SYSCALL	0