From: Mark Wielaard <mark@klomp.org>
Date: Tue, 26 Aug 2014 22:15:58 +0000 (+0000)
Subject: Fix typo in syswrap ppoll param, equate ppoll and poll for memcheck testcase.
X-Git-Tag: svn/VALGRIND_3_10_0~135
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e12b5e5ac2e944fb1ffea4f9e5ce39e008a8a864;p=thirdparty%2Fvalgrind.git

Fix typo in syswrap ppoll param, equate ppoll and poll for memcheck testcase.

ppoll argument is called ufds like the poll argument.
Newer architectures (aarch64) implement poll by calling ppoll directly.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14370
---

diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index 8e54740349..7139a690f5 100644
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -1271,7 +1271,7 @@ PRE(sys_ppoll)
                     (Addr)(&ufds[i].fd), sizeof(ufds[i].fd) );
       PRE_MEM_READ( "ppoll(ufds.events)",
                     (Addr)(&ufds[i].events), sizeof(ufds[i].events) );
-      PRE_MEM_WRITE( "ppoll(ufd.revents)",
+      PRE_MEM_WRITE( "ppoll(ufds.revents)",
                      (Addr)(&ufds[i].revents), sizeof(ufds[i].revents) );
    }
 
diff --git a/memcheck/tests/filter_stderr b/memcheck/tests/filter_stderr
index db671faee3..b55f24a693 100755
--- a/memcheck/tests/filter_stderr
+++ b/memcheck/tests/filter_stderr
@@ -26,6 +26,9 @@ perl -p -e "s/in loss record \d+ of \d+/in loss record ... of .../" |
 perl -p -e "s/\(syscall-template.S:[0-9]*\)/(in \/...libc...)/" |
 perl -p -e "s/\(socket.S:[0-9]*\)/(in \/...libc...)/" |
 
+# Newer architectures (aarch64) implement poll by calling ppoll directly.
+perl -p -e "s/Syscall param ppoll\(ufds/Syscall param poll\(ufds/" |
+
 $dir/../../memcheck/tests/filter_memcheck "$@"
 
 exit 0