|
From: <sv...@va...> - 2007-05-02 10:43:27
|
Author: sewardj
Date: 2007-05-02 11:43:25 +0100 (Wed, 02 May 2007)
New Revision: 6725
Log:
Merge r6722 (Avoid compilation warnings with gcc-4.2.)
Modified:
branches/VALGRIND_3_2_BRANCH/coregrind/m_debuginfo/readelf.c
branches/VALGRIND_3_2_BRANCH/coregrind/m_scheduler/scheduler.c
branches/VALGRIND_3_2_BRANCH/coregrind/m_ume.c
Modified: branches/VALGRIND_3_2_BRANCH/coregrind/m_debuginfo/readelf.c
===================================================================
--- branches/VALGRIND_3_2_BRANCH/coregrind/m_debuginfo/readelf.c 2007-05-02 10:28:07 UTC (rev 6724)
+++ branches/VALGRIND_3_2_BRANCH/coregrind/m_debuginfo/readelf.c 2007-05-02 10:43:25 UTC (rev 6725)
@@ -242,7 +242,7 @@
return False;
/* Ignore if nameless, or zero-sized. */
- if (sym->st_name == (ElfXX_Word)NULL
+ if (sym->st_name == (ElfXX_Word)0
|| /* VG_(strlen)(sym_name) == 0 */
/* equivalent but cheaper ... */
sym_name[0] == 0
Modified: branches/VALGRIND_3_2_BRANCH/coregrind/m_scheduler/scheduler.c
===================================================================
--- branches/VALGRIND_3_2_BRANCH/coregrind/m_scheduler/scheduler.c 2007-05-02 10:28:07 UTC (rev 6724)
+++ branches/VALGRIND_3_2_BRANCH/coregrind/m_scheduler/scheduler.c 2007-05-02 10:43:25 UTC (rev 6725)
@@ -707,7 +707,7 @@
static void handle_syscall(ThreadId tid)
{
- ThreadState *tst = VG_(get_ThreadState)(tid);
+ ThreadState * volatile tst = VG_(get_ThreadState)(tid);
Bool jumped;
/* Syscall may or may not block; either way, it will be
Modified: branches/VALGRIND_3_2_BRANCH/coregrind/m_ume.c
===================================================================
--- branches/VALGRIND_3_2_BRANCH/coregrind/m_ume.c 2007-05-02 10:28:07 UTC (rev 6724)
+++ branches/VALGRIND_3_2_BRANCH/coregrind/m_ume.c 2007-05-02 10:43:25 UTC (rev 6725)
@@ -823,7 +823,8 @@
ret = do_exec_inner(exe_name, info);
if (0 != ret) {
- ret = do_exec_shell_followup(ret, (Char*)exe_name, info);
+ Char* exe_name_casted = (Char*)exe_name;
+ ret = do_exec_shell_followup(ret, exe_name_casted, info);
}
return ret;
}
|