Merge r5765 (A couple of initialisations to keep gcc-4.1.0 happy.)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_1_BRANCH@5766

diff --git a/coregrind/m_aspacemgr/aspacemgr.c b/coregrind/m_aspacemgr/aspacemgr.c
index 693a784a5e65b6aef3128a476fb35f2d18d15e3a..a704d550c7b13a8846fe2b1f7c214b80b85e4d32 100644 (file)
--- a/coregrind/m_aspacemgr/aspacemgr.c
+++ b/coregrind/m_aspacemgr/aspacemgr.c
@@ -3228,6 +3228,8 @@ static void parse_procselfmaps (
    UWord  maj, min, dev;
    ULong  foffset;
 
+   foffset = ino = 0; /* keep gcc-4.1.0 happy */
+
    read_procselfmaps_into_buf();
 
    aspacem_assert('\0' != procmap_buf[0] && 0 != buf_n_tot);

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 8f4b4b7c75bdd44001cfe767fb032b96421428b8..ebc057a23fffaf2aff2345c71b70260d61b35940 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -1904,7 +1904,7 @@ Int main(Int argc, HChar **argv, HChar **envp)
    Addr    initial_client_SP = 0;
    Addr    clstack_top       = 0;
    SizeT   clstack_max_size  = 0;
-   UInt*   client_auxv;
+   UInt*   client_auxv       = NULL;
    Int     loglevel, i;
    Bool    logging_to_fd;
    struct vki_rlimit zero = { 0, 0 };