[Qemu-commits] [qemu/qemu] 4aa3f4: linux-user: Fix i386 safe-syscall.S

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 4aa3f4dd5bb9c2282627bf99d85eff61b325beb0
      
https://github.com/qemu/qemu/commit/4aa3f4dd5bb9c2282627bf99d85eff61b325beb0
  Author: Richard Henderson <address@hidden>
  Date:   2016-07-07 (Thu, 07 Jul 2016)

  Changed paths:
    M linux-user/host/i386/safe-syscall.inc.S

  Log Message:
  -----------
  linux-user: Fix i386 safe-syscall.S

Clang insists that "cmp" is ambiguous with a memory destination,
requiring an explicit size suffix.

There was a true error in the use of .cfi_def_cfa_offset in the
epilogue, but changing to use the proper .cfi_adjust_cfa_offset
runs afoul of a clang bug wrt .cfi_restore_state.  Better to
fold the two epilogues so that we don't trigger the bug.

Signed-off-by: Richard Henderson <address@hidden>


  Commit: cdbd727c20ad7aac7797dc8c95e485e1a4c6901b
      
https://github.com/qemu/qemu/commit/cdbd727c20ad7aac7797dc8c95e485e1a4c6901b
  Author: Richard Henderson <address@hidden>
  Date:   2016-07-10 (Sun, 10 Jul 2016)

  Changed paths:
    M configure
    M pc-bios/optionrom/Makefile
    M rules.mak

  Log Message:
  -----------
  build: Use $(AS) for optionrom explicitly

For clang before 3.5, -fno-integrated-as does not exist,
so the workaround in 5f6f0e27fb24 fails to build.

Use clang's default assembler for linux-user/safe-syscall.S,
and explicitly change to use the system assembler for the
option roms.

Tested-by: Alex Bennée <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>


  Commit: b3b22db69fdefbde00a4499453b76c6b57464711
      
https://github.com/qemu/qemu/commit/b3b22db69fdefbde00a4499453b76c6b57464711
  Author: Peter Maydell <address@hidden>
  Date:   2016-07-11 (Mon, 11 Jul 2016)

  Changed paths:
    M configure
    M linux-user/host/i386/safe-syscall.inc.S
    M pc-bios/optionrom/Makefile
    M rules.mak

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/rth/tags/pull-rth-20160710' into staging

build fix for travis

# gpg: Signature made Sun 10 Jul 2016 18:07:02 BST
# gpg:                using RSA key 0xAD1270CC4DD0279B
# gpg: Good signature from "Richard Henderson <address@hidden>"
# gpg:                 aka "Richard Henderson <address@hidden>"
# gpg:                 aka "Richard Henderson <address@hidden>"
# Primary key fingerprint: 9CB1 8DDA F8E8 49AD 2AFC  16A4 AD12 70CC 4DD0 279B

* remotes/rth/tags/pull-rth-20160710:
  build: Use $(AS) for optionrom explicitly
  linux-user: Fix i386 safe-syscall.S

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/f7d3f8c0c073...b3b22db69fde