|
From: <sv...@va...> - 2005-09-27 19:57:46
|
Author: sewardj
Date: 2005-09-27 20:57:35 +0100 (Tue, 27 Sep 2005)
New Revision: 4792
Log:
Unbreak build on amd64 following aspacem merge.
Modified:
trunk/coregrind/m_syswrap/syswrap-amd64-linux.c
Modified: trunk/coregrind/m_syswrap/syswrap-amd64-linux.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_syswrap/syswrap-amd64-linux.c 2005-09-27 19:52:02 U=
TC (rev 4791)
+++ trunk/coregrind/m_syswrap/syswrap-amd64-linux.c 2005-09-27 19:57:35 U=
TC (rev 4792)
@@ -1168,13 +1168,8 @@
GENXY(__NR_fstat, sys_newfstat), // 5=20
GENXY(__NR_lstat, sys_newlstat), // 6=20
GENXY(__NR_poll, sys_poll), // 7=20
-<<<<<<< .working
LINX_(__NR_lseek, sys_lseek), // 8=20
- LINXY(__NR_mmap, sys_mmap2), // 9=20
-=3D=3D=3D=3D=3D=3D=3D
- GENX_(__NR_lseek, sys_lseek), // 8=20
- GENX_(__NR_mmap, sys_mmap2), // 9=20
->>>>>>> .merge-right.r4787
+ LINX_(__NR_mmap, sys_mmap2), // 9=20
=20
GENXY(__NR_mprotect, sys_mprotect), // 10=20
GENXY(__NR_munmap, sys_munmap), // 11=20
|