|
From: <sv...@va...> - 2005-06-18 18:58:16
|
Author: rjwalsh
Date: 2005-06-18 19:58:14 +0100 (Sat, 18 Jun 2005)
New Revision: 3943
Log:
Fix x86_64 build.
Also fix vgtest_ume (although it fails on x86_64.)
Modified:
trunk/coregrind/m_syswrap/syswrap-amd64-linux.c
trunk/memcheck/tests/Makefile.am
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-06-18 18:49:40 U=
TC (rev 3942)
+++ trunk/coregrind/m_syswrap/syswrap-amd64-linux.c 2005-06-18 18:58:14 U=
TC (rev 3943)
@@ -902,7 +902,7 @@
PRE(sys_semget)
{
PRINT("sys_semget ( %d, %d, %d )",ARG1,ARG2,ARG3);
- PRE_REG_READ3(long, "semget", key_t, key, int, nsems, int, semflg);
+ PRE_REG_READ3(long, "semget", vki_key_t, key, int, nsems, int, semflg=
);
}
=20
PRE(sys_semop)
@@ -962,14 +962,14 @@
PRE(sys_msgget)
{
PRINT("sys_msgget ( %d, %d )",ARG1,ARG2);
- PRE_REG_READ2(long, "msgget", key_t, key, int, msgflg);
+ PRE_REG_READ2(long, "msgget", vki_key_t, key, int, msgflg);
}
=20
PRE(sys_msgsnd)
{
PRINT("sys_msgsnd ( %d, %p, %d, %d )",ARG1,ARG2,ARG3,ARG4);
PRE_REG_READ4(long, "msgsnd",
- int, msqid, struct msgbuf *, msgp, size_t, msgsz, int, =
msgflg);
+ int, msqid, struct msgbuf *, msgp, vki_size_t, msgsz, i=
nt, msgflg);
VG_(generic_PRE_sys_msgsnd)(tid, ARG1,ARG2,ARG3,ARG4);
if ((ARG4 & VKI_IPC_NOWAIT) =3D=3D 0)
*flags |=3D SfMayBlock;
@@ -979,7 +979,7 @@
{
PRINT("sys_msgrcv ( %d, %p, %d, %d, %d )",ARG1,ARG2,ARG3,ARG4,ARG5);
PRE_REG_READ5(long, "msgrcv",
- int, msqid, struct msgbuf *, msgp, size_t, msgsz,
+ int, msqid, struct msgbuf *, msgp, vki_size_t, msgsz,
long, msgytp, int, msgflg);
VG_(generic_PRE_sys_msgrcv)(tid, ARG1,ARG2,ARG3,ARG4,ARG5);
if ((ARG4 & VKI_IPC_NOWAIT) =3D=3D 0)
@@ -1005,7 +1005,7 @@
PRE(sys_shmget)
{
PRINT("sys_shmget ( %d, %d, %d )",ARG1,ARG2,ARG3);
- PRE_REG_READ3(long, "shmget", key_t, key, size_t, size, int, shmflg);
+ PRE_REG_READ3(long, "shmget", vki_key_t, key, vki_size_t, size, int, =
shmflg);
}
=20
PRE(wrap_sys_shmat)
Modified: trunk/memcheck/tests/Makefile.am
=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/memcheck/tests/Makefile.am 2005-06-18 18:49:40 UTC (rev 3942)
+++ trunk/memcheck/tests/Makefile.am 2005-06-18 18:58:14 UTC (rev 3943)
@@ -202,6 +202,5 @@
=20
vgtest_ume_CFLAGS =3D -DVGA_$(VG_ARCH)
vgtest_ume_SOURCES =3D vgtest_ume.c
-vgtest_ume_LDADD =3D ../../coregrind/ume.o \
- ../../coregrind/jmp_with_stack.o
+vgtest_ume_LDADD =3D ../../coregrind/ume.o
=20
|