|
From: <sv...@va...> - 2006-03-15 12:13:39
|
Author: sewardj
Date: 2006-03-15 12:13:30 +0000 (Wed, 15 Mar 2006)
New Revision: 5766
Log:
Merge r5765 (A couple of initialisations to keep gcc-4.1.0 happy.)
Modified:
branches/VALGRIND_3_1_BRANCH/coregrind/m_aspacemgr/aspacemgr.c
branches/VALGRIND_3_1_BRANCH/coregrind/m_main.c
Modified: branches/VALGRIND_3_1_BRANCH/coregrind/m_aspacemgr/aspacemgr.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/VALGRIND_3_1_BRANCH/coregrind/m_aspacemgr/aspacemgr.c 2006-0=
3-15 11:50:32 UTC (rev 5765)
+++ branches/VALGRIND_3_1_BRANCH/coregrind/m_aspacemgr/aspacemgr.c 2006-0=
3-15 12:13:30 UTC (rev 5766)
@@ -3228,6 +3228,8 @@
UWord maj, min, dev;
ULong foffset;
=20
+ foffset =3D ino =3D 0; /* keep gcc-4.1.0 happy */
+
read_procselfmaps_into_buf();
=20
aspacem_assert('\0' !=3D procmap_buf[0] && 0 !=3D buf_n_tot);
Modified: branches/VALGRIND_3_1_BRANCH/coregrind/m_main.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/VALGRIND_3_1_BRANCH/coregrind/m_main.c 2006-03-15 11:50:32 U=
TC (rev 5765)
+++ branches/VALGRIND_3_1_BRANCH/coregrind/m_main.c 2006-03-15 12:13:30 U=
TC (rev 5766)
@@ -1904,7 +1904,7 @@
Addr initial_client_SP =3D 0;
Addr clstack_top =3D 0;
SizeT clstack_max_size =3D 0;
- UInt* client_auxv;
+ UInt* client_auxv =3D NULL;
Int loglevel, i;
Bool logging_to_fd;
struct vki_rlimit zero =3D { 0, 0 };
|