Merge commit '3110e2925489c571901e945e315942ce84fe696f' into upstream-merge

Merge commit '3110e2925489c571901e945e315942ce84fe696f' into upstream-merge

* commit '3110e2925489c571901e945e315942ce84fe696f': (41 commits)
  s390x: Enable s390x-softmmu target
  s390x: Prepare cpu.h for emulation
  move helpers.h to helper.h
  libcacard: fix opposite usage of isspace
  target-mips: clear softfpu exception state for comparison instructions
  target-mips: fix c.ps.* instructions
  target-mips: don't hardcode softfloat exception bits
  target-mips: simplify FP comparisons
  target-ppc: fix SPE comparison functions
  softfloat: improve description of comparison functions
  softfloat: move float*_eq and float*_eq_quiet
  softfloat: rename float*_eq_signaling() into float*_eq()
  softfloat: rename float*_eq() into float*_eq_quiet()
  target-i386: fix CMPUNORDPS/D and CMPORDPS/D instructions
  target-mips: use new float*_unordered*() functions
  target-alpha: use new float64_unordered_quiet() function
  softfloat-native: add float*_unordered_quiet() functions
  softfloat: add float*_unordered_{,quiet}() functions
  target-i386: add floatx_{add,mul,sub} and use them
  target-i386: use float unions from cpu-all.h
  ...

Conflicts:
	cpu-exec.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>