Merge branch 'linux-user-for-upstream' of git://git.linaro.org/people/rikuvoipio...

* 'linux-user-for-upstream' of git://git.linaro.org/people/rikuvoipio/qemu:
  linux-user: register align p{read, write}64
  linux-user: ppc: mark as long long aligned
  tcg: Remove TCG_TARGET_HAS_GUEST_BASE define
  configure: Remove unnecessary host_guest_base code
  linux-user: If loading fails, print error as string, not number
  linux-user: Fix siginfo handling
  alpha-linux-user: Fix sigaltstack structure definition
  linux-user: Implement gethostname
  linux-user: Perform more checks on iovec lists
  linux-user: fix multi-threaded /proc/self/maps
  linux-user: fix statfs

diff --cc configure
Simple merge

diff --cc linux-user/main.c
Simple merge

diff --cc linux-user/syscall.c
Simple merge

diff --cc tcg/arm/tcg-target.h
index 0df33520f8a88be2e61e9789a7ab146c53730114,2bc7dff84665f1530e9b12e369e0cdddf8bd4bd9..98fa11b2867466a97a5d8f41df9b718071d53141
--- 1/tcg/arm/tcg-target.h
--- 2/tcg/arm/tcg-target.h
+++ b/tcg/arm/tcg-target.h
@@@ -73,10 -73,8 +73,8 @@@ typedef enum 
  #define TCG_TARGET_HAS_nand_i32         0
  #define TCG_TARGET_HAS_nor_i32          0
  #define TCG_TARGET_HAS_deposit_i32      0
 -#define TCG_TARGET_HAS_movcond_i32      0
 +#define TCG_TARGET_HAS_movcond_i32      1
  
- #define TCG_TARGET_HAS_GUEST_BASE
- 
  enum {
      TCG_AREG0 = TCG_REG_R6,
  };

diff --cc tcg/ia64/tcg-target.h
Simple merge

diff --cc tcg/sparc/tcg-target.h
index c2fbb23abb2bb93d43e2bce37293daadee95e218,4a17f1e118e39606d9cfdd8fb02d4890231ceeb0..0e7d398a41772d404f44dae78ebfdda865e165f2
--- 1/tcg/sparc/tcg-target.h
--- 2/tcg/sparc/tcg-target.h
+++ b/tcg/sparc/tcg-target.h
@@@ -122,11 -121,9 +122,9 @@@ typedef enum 
  #define TCG_TARGET_HAS_nand_i64         0
  #define TCG_TARGET_HAS_nor_i64          0
  #define TCG_TARGET_HAS_deposit_i64      0
 -#define TCG_TARGET_HAS_movcond_i64      0
 +#define TCG_TARGET_HAS_movcond_i64      1
  #endif
  
- #define TCG_TARGET_HAS_GUEST_BASE
- 
  #define TCG_AREG0 TCG_REG_I0
  
  static inline void flush_icache_range(tcg_target_ulong start,

diff --cc tcg/tcg.c
Simple merge