diff options
| -rw-r--r-- | main/coregrind/m_syswrap/syswrap-arm64-linux.c | 5 | ||||
| -rwxr-xr-x | merge.upstream.sh | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/main/coregrind/m_syswrap/syswrap-arm64-linux.c b/main/coregrind/m_syswrap/syswrap-arm64-linux.c index aa9260e38..f10dee139 100644 --- a/main/coregrind/m_syswrap/syswrap-arm64-linux.c +++ b/main/coregrind/m_syswrap/syswrap-arm64-linux.c @@ -933,6 +933,7 @@ static SyscallTableEntry syscall_main_table[] = { GENX_(__NR_write, sys_write), // 64 GENXY(__NR_readv, sys_readv), // 65 GENX_(__NR_writev, sys_writev), // 66 + GENXY(__NR_pread64, sys_pread64), // 67 GENX_(__NR_pwrite64, sys_pwrite64), // 68 LINX_(__NR_pselect6, sys_pselect6), // 72 LINXY(__NR_ppoll, sys_ppoll), // 73 @@ -973,6 +974,8 @@ static SyscallTableEntry syscall_main_table[] = { PLAX_(__NR_rt_sigreturn, sys_rt_sigreturn), // 139 GENX_(__NR_setpriority, sys_setpriority), // 140 GENX_(__NR_getpriority, sys_getpriority), // 141 + GENX_(__NR_setregid, sys_setregid), // 143 + GENX_(__NR_setreuid, sys_setreuid), // 145 LINX_(__NR_setresuid, sys_setresuid), // 147 LINXY(__NR_getresuid, sys_getresuid), // 148 LINXY(__NR_getresgid, sys_getresgid), // 150 @@ -1036,6 +1039,7 @@ static SyscallTableEntry syscall_main_table[] = { PLAX_(__NR3264_fadvise64, sys_fadvise64), // 223 GENXY(__NR_mprotect, sys_mprotect), // 226 + GENX_(__NR_msync, sys_msync), // 227 GENX_(__NR_madvise, sys_madvise), // 233 GENXY(__NR_wait4, sys_wait4), // 260 @@ -1230,7 +1234,6 @@ static SyscallTableEntry syscall_main_table[] = { //ZZ LINXY(__NR_rt_sigpending, sys_rt_sigpending), // 176 //ZZ LINXY(__NR_rt_sigtimedwait, sys_rt_sigtimedwait),// 177 //ZZ -//ZZ GENXY(__NR_pread64, sys_pread64), // 180 //ZZ LINX_(__NR_chown, sys_chown16), // 182 //ZZ //ZZ LINX_(__NR_capset, sys_capset), // 185 diff --git a/merge.upstream.sh b/merge.upstream.sh index eedc148ec..5c54da2b9 100755 --- a/merge.upstream.sh +++ b/merge.upstream.sh @@ -48,13 +48,13 @@ echo " vex : $upstream_vex_revision" if [ $upstream_valgrind_revision -gt $valgrind_revision ]; then echo "Merging valgrind... (in $valgrind_dir)" | tee $current_dir/merge.log cd $valgrind_dir - svn diff -r$valgrind_revision:$upstream_valgrind_revision $valgrind_svn_url | patch -p0 | tee -a $current_dir/merge.log + svn diff -r$valgrind_revision:$upstream_valgrind_revision $valgrind_svn_url | patch -Ep0 | tee -a $current_dir/merge.log fi if [ $upstream_vex_revision -gt $vex_revision ]; then echo "Merging vex... (in $vex_dir)" | tee -a $current_dir/merge.log cd $vex_dir - svn diff -r$vex_revision:$upstream_vex_revision $vex_svn_url | patch -p0 | tee -a $current_dir/merge.log + svn diff -r$vex_revision:$upstream_vex_revision $vex_svn_url | patch -Ep0 | tee -a $current_dir/merge.log fi echo "val: $upstream_valgrind_revision" > $current_dir/upstream.revs.txt |