[Valgrind-developers] valgrind: r6161 - in branches/AIX5/coregrind: m_sigframe m_syswrap

[<sv...@va...>]

Author: sewardj
Date: 2006-10-03 22:44:23 +0100 (Tue, 03 Oct 2006)
New Revision: 6161

Log:
Unbreak amd64-linux.

Modified:
   branches/AIX5/coregrind/m_sigframe/sigframe-amd64-linux.c
   branches/AIX5/coregrind/m_syswrap/syscall-amd64-linux.S
   branches/AIX5/coregrind/m_syswrap/syswrap-amd64-linux.c


Modified: branches/AIX5/coregrind/m_sigframe/sigframe-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
--- branches/AIX5/coregrind/m_sigframe/sigframe-amd64-linux.c	2006-10-03 =
21:40:46 UTC (rev 6160)
+++ branches/AIX5/coregrind/m_sigframe/sigframe-amd64-linux.c	2006-10-03 =
21:44:23 UTC (rev 6161)
@@ -30,6 +30,7 @@
 */
=20
 #include "pub_core_basics.h"
+#include "pub_core_vki.h"
 #include "pub_core_threadstate.h"
 #include "pub_core_aspacemgr.h"
 #include "pub_core_libcbase.h"
@@ -37,12 +38,11 @@
 #include "pub_core_libcprint.h"
 #include "pub_core_machine.h"
 #include "pub_core_options.h"
-#include "pub_core_sigframe.h"
 #include "pub_core_signals.h"
 #include "pub_core_tooliface.h"
 #include "pub_core_trampoline.h"
+#include "pub_core_sigframe.h"   /* self */
=20
-
 /* This module creates and removes signal frames for signal deliveries
    on amd64-linux.
=20

Modified: branches/AIX5/coregrind/m_syswrap/syscall-amd64-linux.S
=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
--- branches/AIX5/coregrind/m_syswrap/syscall-amd64-linux.S	2006-10-03 21=
:40:46 UTC (rev 6160)
+++ branches/AIX5/coregrind/m_syswrap/syscall-amd64-linux.S	2006-10-03 21=
:44:23 UTC (rev 6161)
@@ -29,7 +29,7 @@
 */
=20
 #include "pub_core_basics_asm.h"
-#include "vki_unistd.h"
+#include "pub_core_vkiscnums.h"
 #include "libvex_guest_offsets.h"
=20
=20

Modified: branches/AIX5/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
--- branches/AIX5/coregrind/m_syswrap/syswrap-amd64-linux.c	2006-10-03 21=
:40:46 UTC (rev 6160)
+++ branches/AIX5/coregrind/m_syswrap/syswrap-amd64-linux.c	2006-10-03 21=
:44:23 UTC (rev 6161)
@@ -29,6 +29,8 @@
 */
=20
 #include "pub_core_basics.h"
+#include "pub_core_vki.h"
+#include "pub_core_vkiscnums.h"
 #include "pub_core_threadstate.h"
 #include "pub_core_aspacemgr.h"
 #include "pub_core_debuglog.h"
@@ -51,9 +53,7 @@
 #include "priv_syswrap-linux-variants.h" /* decls of linux variant wrapp=
ers */
 #include "priv_syswrap-main.h"
=20
-#include "vki_unistd.h"              /* for the __NR_* constants */
=20
-
 /* ---------------------------------------------------------------------
    clone() handling
    ------------------------------------------------------------------ */
@@ -205,7 +205,7 @@
    ThreadState* ptst =3D VG_(get_ThreadState)(ptid);
    ThreadState* ctst =3D VG_(get_ThreadState)(ctid);
    UWord*       stack;
-   NSegment*    seg;
+   NSegment const* seg;
    SysRes       res;
    Long         rax;
    vki_sigset_t blockall, savedmask;