From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 8 Jun 2016 17:34:32 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20160608' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b66e10e4c9ae738412b9742db49457f6b703e349;p=qemu.git

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

linux-user pull request for June 2016

# gpg: Signature made Wed 08 Jun 2016 14:27:14 BST
# gpg:                using RSA key 0xB44890DEDE3C9BC0
# gpg: Good signature from "Riku Voipio <riku.voipio@iki.fi>"
# gpg:                 aka "Riku Voipio <riku.voipio@linaro.org>"

* remotes/riku/tags/pull-linux-user-20160608: (44 commits)
  linux-user: In fork_end(), remove correct CPUs from CPU list
  linux-user: Special-case ERESTARTSYS in target_strerror()
  linux-user: Make target_strerror() return 'const char *'
  linux-user: Correct signedness of target_flock l_start and l_len fields
  linux-user: Use safe_syscall wrapper for ioctl
  linux-user: Use safe_syscall wrapper for accept and accept4 syscalls
  linux-user: Use safe_syscall wrapper for semop
  linux-user: Use safe_syscall wrapper for epoll_wait syscalls
  linux-user: Use safe_syscall wrapper for poll and ppoll syscalls
  linux-user: Use safe_syscall wrapper for sleep syscalls
  linux-user: Use safe_syscall wrapper for rt_sigtimedwait syscall
  linux-user: Use safe_syscall wrapper for flock
  linux-user: Use safe_syscall wrapper for mq_timedsend and mq_timedreceive
  linux-user: Use safe_syscall wrapper for msgsnd and msgrcv
  linux-user: Use safe_syscall wrapper for send* and recv* syscalls
  linux-user: Use safe_syscall wrapper for connect syscall
  linux-user: Use safe_syscall wrapper for readv and writev syscalls
  linux-user: Fix error conversion in 64-bit fadvise syscall
  linux-user: Fix NR_fadvise64 and NR_fadvise64_64 for 32-bit guests
  linux-user: Fix handling of arm_fadvise64_64 syscall
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Conflicts:
	configure
	scripts/qemu-binfmt-conf.sh
---

b66e10e4c9ae738412b9742db49457f6b703e349
diff --cc configure
index 4627d2c1eb,e995ddd7c9..8c2f90b312
--- a/configure
+++ b/configure
@@@ -4528,25 -4512,17 +4514,38 @@@ if compile_prog "" "" ; the
      have_fsxattr=yes
  fi
  
++##########################################
++# check if rtnetlink.h exists and is useful
+ have_rtnetlink=no
+ cat > $TMPC << EOF
+ #include <linux/rtnetlink.h>
+ int main(void) {
+   return IFLA_PROTO_DOWN;
+ }
+ EOF
+ if compile_prog "" "" ; then
+     have_rtnetlink=yes
+ fi
+ 
 +#################################################
 +# Sparc implicitly links with --relax, which is
 +# incompatible with -r, so --no-relax should be
 +# given. It does no harm to give it on other
 +# platforms too.
 +
 +# Note: the prototype is needed since QEMU_CFLAGS
 +#       contains -Wmissing-prototypes
 +cat > $TMPC << EOF
 +extern int foo(void);
 +int foo(void) { return 0; }
 +EOF
 +if ! compile_object ""; then
 +  error_exit "Failed to compile object file for LD_REL_FLAGS test"
 +fi
 +if do_cc -nostdlib -Wl,-r -Wl,--no-relax -o $TMPMO $TMPO; then
 +  LD_REL_FLAGS="-Wl,--no-relax"
 +fi
 +
  ##########################################
  # End of CC checks
  # After here, no more $cc or $ld runs