- Update emulators/qemu-sbruno to latest github snapshot, fixing

  the bsd-user targets on 8 and 9.
- Switch emulators/qemu-user-static to be slave of emulators/qemu-sbruno.
- Update emulators/qemu-devel to latest upstream release 2.2.0, now
  w/o bsd-user patches and knob again.  (Or at least until the
  patches are merged upstream...) [1]
- Add appropriate CONFLICTS to emulators/qemu too and bump its
  PORTREVISION.

Suggested by:	andrew [1] (for the benefit of testing aarch64 guests)

1 files changed, 12 insertions, 0 deletions

diff --git a/emulators/qemu-devel/files/patch-disas-libvixl-a64-disasm-a64.cc b/emulators/qemu-devel/files/patch-disas-libvixl-a64-disasm-a64.cc
new file mode 100644
index 000000000000..3cfe79312f65
--- /dev/null
+++ b/emulators/qemu-devel/files/patch-disas-libvixl-a64-disasm-a64.cc
@@ -0,0 +1,12 @@
+--- a/disas/libvixl/a64/disasm-a64.cc
++++ b/disas/libvixl/a64/disasm-a64.cc
+@@ -1337,7 +1337,8 @@ void Disassembler::AppendPCRelativeOffse
+                                                   int64_t offset) {
+   USE(instr);
+   char sign = (offset < 0) ? '-' : '+';
+-  AppendToOutput("#%c0x%" PRIx64, sign, std::abs(offset));
++  // AppendToOutput("#%c0x%" PRIx64, sign, std::abs(offset));
++  AppendToOutput("#%c0x%" PRIx64, sign, offset < 0 ? -offset : offset);
+ }
+ 
+