Fix a couple of gcc warnings following recent coredumping changes

(r4970).

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

diff --git a/coregrind/m_aspacemgr/aspacemgr.c b/coregrind/m_aspacemgr/aspacemgr.c
index ff710ab5e6b3f40c1538b0d29dbd5f067e69999a..bbd32d1ecea67c6928a49b10d857e8515c13813e 100644 (file)
--- a/coregrind/m_aspacemgr/aspacemgr.c
+++ b/coregrind/m_aspacemgr/aspacemgr.c
@@ -2523,9 +2523,9 @@ SysRes VG_(am_mmap_file_float_valgrind) ( SizeT length, UInt prot,
    seg.hasW   = toBool(prot & VKI_PROT_WRITE);
    seg.hasX   = toBool(prot & VKI_PROT_EXEC);
    if (get_inode_for_fd(fd, &dev, &ino, &mode)) {
-      seg.dev = dev;
-      seg.ino = ino;
-      seg.mode - mode;
+      seg.dev  = dev;
+      seg.ino  = ino;
+      seg.mode = mode;
    }
    if (get_name_for_fd(fd, buf, VKI_PATH_MAX)) {
       seg.fnIdx = allocate_segname( buf );

diff --git a/coregrind/m_coredump/coredump-x86-linux.c b/coregrind/m_coredump/coredump-x86-linux.c
index 87b9a575cd57154a3dc3ba2427b24109db67fc51..320c532bf09a2a4562ad6f98b0ea0c8b8bdea817 100644 (file)
--- a/coregrind/m_coredump/coredump-x86-linux.c
+++ b/coregrind/m_coredump/coredump-x86-linux.c
@@ -38,7 +38,7 @@
 void ML_(fill_elfregs_from_tst)(struct vki_user_regs_struct* regs, 
                                 const ThreadArchState* arch)
 {
-   regs->eflags = LibVEX_GuestX86_get_eflags(&arch->vex);
+   regs->eflags = LibVEX_GuestX86_get_eflags( &((ThreadArchState*)arch)->vex );
    regs->esp    = arch->vex.guest_ESP;
    regs->eip    = arch->vex.guest_EIP;
 

diff --git a/coregrind/m_signals.c b/coregrind/m_signals.c
index 63e1028c9ca508aec3ee3255ffde77f21909332b..15a39dc9b4fb37b05b1097012736e7e3be0b0078 100644 (file)
--- a/coregrind/m_signals.c
+++ b/coregrind/m_signals.c
@@ -102,6 +102,7 @@
 #include "pub_core_syscall.h"
 #include "pub_core_syswrap.h"
 #include "pub_core_tooliface.h"
+#include "pub_core_coredump.h"
 #include "vki_unistd.h"
 
 
@@ -1067,7 +1068,6 @@ static void default_action(const vki_siginfo_t *info, ThreadId tid)
       VG_(start_debugger)( tid );
    }
 
-      // See comment above about this temporary disabling of core dumps.
    if (core) {
       const static struct vki_rlimit zero = { 0, 0 };