Fix AMD64 breakage and possibly the PPC32 breakage, too.

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

diff --git a/coregrind/m_syswrap/syswrap-amd64-linux.c b/coregrind/m_syswrap/syswrap-amd64-linux.c
index ec270479aaa307c82cac3492f7014bff145b66ce..c25b15aa9e99cd11bef0109acf27345989797a16 100644 (file)
--- a/coregrind/m_syswrap/syswrap-amd64-linux.c
+++ b/coregrind/m_syswrap/syswrap-amd64-linux.c
@@ -1040,7 +1040,7 @@ PRE(sys_msgsnd)
    PRINT("sys_msgsnd ( %d, %p, %d, %d )",ARG1,ARG2,ARG3,ARG4);
    PRE_REG_READ4(long, "msgsnd",
                  int, msqid, struct msgbuf *, msgp, vki_size_t, msgsz, int, msgflg);
-   ML_(generic_PRE_sys_msgsnd)(tid, ARG1,ARG2,ARG3,ARG4);
+   ML_(linux_PRE_sys_msgsnd)(tid, ARG1,ARG2,ARG3,ARG4);
    if ((ARG4 & VKI_IPC_NOWAIT) == 0)
       *flags |= SfMayBlock;
 }
@@ -1051,7 +1051,7 @@ PRE(sys_msgrcv)
    PRE_REG_READ5(long, "msgrcv",
                  int, msqid, struct msgbuf *, msgp, vki_size_t, msgsz,
                  long, msgytp, int, msgflg);
-   ML_(generic_PRE_sys_msgrcv)(tid, ARG1,ARG2,ARG3,ARG4,ARG5);
+   ML_(linux_PRE_sys_msgrcv)(tid, ARG1,ARG2,ARG3,ARG4,ARG5);
    if ((ARG4 & VKI_IPC_NOWAIT) == 0)
       *flags |= SfMayBlock;
 }
@@ -1065,7 +1065,7 @@ PRE(sys_msgctl)
    PRINT("sys_msgctl ( %d, %d, %p )",ARG1,ARG2,ARG3);
    PRE_REG_READ3(long, "msgctl",
                  int, msqid, int, cmd, struct msqid_ds *, buf);
-   ML_(generic_PRE_sys_msgctl)(tid, ARG1,ARG2,ARG3);
+   ML_(linux_PRE_sys_msgctl)(tid, ARG1,ARG2,ARG3);
 }
 POST(sys_msgctl)
 {

diff --git a/coregrind/m_syswrap/syswrap-ppc32-linux.c b/coregrind/m_syswrap/syswrap-ppc32-linux.c
index 5d24e28347a7d8678a558d44d8942a7edc7ac84a..a0d7771e5bb64d4c8e01e185559161f535e7326e 100644 (file)
--- a/coregrind/m_syswrap/syswrap-ppc32-linux.c
+++ b/coregrind/m_syswrap/syswrap-ppc32-linux.c
@@ -1277,7 +1277,7 @@ PRE(sys_ipc)
       *flags |= SfMayBlock;
       break;
     case VKI_MSGSND:
-      ML_(generic_PRE_sys_msgsnd)( tid, ARG2, ARG5, ARG3, ARG4 );
+      ML_(linux_PRE_sys_msgsnd)( tid, ARG2, ARG5, ARG3, ARG4 );
       if ((ARG4 & VKI_IPC_NOWAIT) == 0)
        *flags |= SfMayBlock;
       break;
@@ -1293,7 +1293,7 @@ PRE(sys_ipc)
                             (Addr) (&((struct vki_ipc_kludge *)ARG5)->msgtyp),
                             "msgrcv(msgp)" );
 
-       ML_(generic_PRE_sys_msgrcv)( tid, ARG2, msgp, ARG3, msgtyp, ARG4 );
+       ML_(linux_PRE_sys_msgrcv)( tid, ARG2, msgp, ARG3, msgtyp, ARG4 );
 
        if ((ARG4 & VKI_IPC_NOWAIT) == 0)
          *flags |= SfMayBlock;
@@ -1302,7 +1302,7 @@ PRE(sys_ipc)
     case VKI_MSGGET:
       break;
     case VKI_MSGCTL:
-      ML_(generic_PRE_sys_msgctl)( tid, ARG2, ARG3, ARG5 );
+      ML_(linux_PRE_sys_msgctl)( tid, ARG2, ARG3, ARG5 );
       break;
     case VKI_SHMAT:
       {
@@ -1745,7 +1745,7 @@ PRE(sys_sigreturn)
 //..       /* tst->sys_flags |= MayBlock; */
 //..       break;
 //..    case VKI_MSGSND:
-//..       ML_(generic_PRE_sys_msgsnd)( tid, ARG2, ARG5, ARG3, ARG4 );
+//..       ML_(linux_PRE_sys_msgsnd)( tid, ARG2, ARG5, ARG3, ARG4 );
 //..       /* if ((ARG4 & VKI_IPC_NOWAIT) == 0)
 //..             tst->sys_flags |= MayBlock;
 //..       */
@@ -1762,7 +1762,7 @@ PRE(sys_sigreturn)
 //..                      (Addr) (&((struct vki_ipc_kludge *)ARG5)->msgtyp),
 //..                      "msgrcv(msgp)" );
 //.. 
-//..       ML_(generic_PRE_sys_msgrcv)( tid, ARG2, msgp, ARG3, msgtyp, ARG4 );
+//..       ML_(linux_PRE_sys_msgrcv)( tid, ARG2, msgp, ARG3, msgtyp, ARG4 );
 //.. 
 //..       /* if ((ARG4 & VKI_IPC_NOWAIT) == 0)
 //..             tst->sys_flags |= MayBlock;
@@ -1772,7 +1772,7 @@ PRE(sys_sigreturn)
 //..    case VKI_MSGGET:
 //..       break;
 //..    case VKI_MSGCTL:
-//..       ML_(generic_PRE_sys_msgctl)( tid, ARG2, ARG3, ARG5 );
+//..       ML_(linux_PRE_sys_msgctl)( tid, ARG2, ARG3, ARG5 );
 //..       break;
 //..    case VKI_SHMAT:
 //..       PRE_MEM_WRITE( "shmat(raddr)", ARG4, sizeof(Addr) );