Fix x86_64 build.

Also fix vgtest_ume (although it fails on x86_64.)

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

diff --git a/coregrind/m_syswrap/syswrap-amd64-linux.c b/coregrind/m_syswrap/syswrap-amd64-linux.c
index 31df7e2efaa575680634bdefbdb89e5fd1538e06..9baa6f240d967d566f502bc022f1c4fa5351ce64 100644 (file)
--- a/coregrind/m_syswrap/syswrap-amd64-linux.c
+++ b/coregrind/m_syswrap/syswrap-amd64-linux.c
@@ -902,7 +902,7 @@ POST(sys_socketpair)
 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);
 }
 
 PRE(sys_semop)
@@ -962,14 +962,14 @@ POST(sys_semctl)
 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);
 }
 
 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, int, msgflg);
    VG_(generic_PRE_sys_msgsnd)(tid, ARG1,ARG2,ARG3,ARG4);
    if ((ARG4 & VKI_IPC_NOWAIT) == 0)
       *flags |= SfMayBlock;
@@ -979,7 +979,7 @@ PRE(sys_msgrcv)
 {
    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) == 0)
@@ -1005,7 +1005,7 @@ POST(sys_msgctl)
 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);
 }
 
 PRE(wrap_sys_shmat)

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 62faa6d9d7b420fec2a64fadbf5973aa7daf488d..6b8fffeeb155ac0bc876108a1930e1bb8c387455 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -202,6 +202,5 @@ endif
 
 vgtest_ume_CFLAGS      = -DVGA_$(VG_ARCH)
 vgtest_ume_SOURCES     = vgtest_ume.c
-vgtest_ume_LDADD       = ../../coregrind/ume.o \
-                         ../../coregrind/jmp_with_stack.o
+vgtest_ume_LDADD       = ../../coregrind/ume.o