Bug 501850 - FreeBSD syscall arguments 7 and 8 incorrect.

diff --git a/NEWS b/NEWS
index 7c0bba57744c7e3859271047c9c50804526534ec..741ea7319157661411730ce0f2477650215094da 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -59,12 +59,13 @@ are not entered into bugzilla tend to get forgotten about or ignored.
 499183  FreeBSD: differences in avx-vmovq output
 499212  mmap() with MAP_ALIGNED() returns unaligned pointer
 501119  memcheck/tests/pointer-trace fails when run on NFS filesystem
-501194  Fix ML_(check_macho_and_get_rw_loads) so that it is correct for any number of segment commands
+501194  Fix ML_(check_macho_and_get_rw_loads) so that it is correct for
+        any number of segment commands
 501348  glibc built with -march=x86-64-v3 does not work due to ld.so memcmp
 501479  Illumos DRD pthread_mutex_init wrapper errors
 501365  syscall userfaultfd not wrapped
 501846  Add x86 Linux shm wrappers
-
+501850  FreeBSD syscall arguments 7 and 8 incorrect.
 
 To see details of a given bug, visit
   https://bugs.kde.org/show_bug.cgi?id=XXXXXX

diff --git a/coregrind/m_syscall.c b/coregrind/m_syscall.c
index 8ff9c90bdc5c9682a85af30c9c64d04a81f4ffb7..54c7bd8952044f60c796734f094bdc0ff278a5f3 100644 (file)
--- a/coregrind/m_syscall.c
+++ b/coregrind/m_syscall.c
@@ -783,9 +783,9 @@ asm(
 "      movq    %r8,  %r10\n"    /* a4 */
 "      movq    %r9,  %r8\n"     /* a5 */
 "      movq    16(%rbp), %r9\n" /* a6 last arg from stack, account for %rbp */
-"      movq    24(%rbp), %r11\n" /* a7 from stack */
+"      movq    32(%rbp), %r11\n" /* a7 from stack */
 "      pushq  %r11\n"
-"      movq    32(%rbp), %r11\n" /* a8 from stack */
+"      movq    24(%rbp), %r11\n" /* a8 from stack */
 "      pushq  %r11\n"
 "      subq    $8,%rsp\n"       /* fake return addr */
 "      syscall\n"