Merge branch 'fixes' into 'derivgrind'

Fixes to support newer GCC versions that handle
certain warnings as errors by default.
Thanks to tungcg1906 for reporting the bug.

See merge request aehle/valgrind!30

Author: maxaehle

derivgrind/dg_shadow.c

@@ -104,9 +104,9 @@
  *  \param[in] tag - Tag that is also printed.
  *  \param[in] value - Printed value.
  */
-static VG_REGPARM(0) void dg_Print_double(ULong tag, ULong value){ VG_(printf)("Value for %d : ", tag); VG_(printf)("%lf\n", *(double*)&value); }
-static VG_REGPARM(0) void dg_Print_unsignedlong(ULong tag, ULong value){ VG_(printf)("Value for %d : ", tag); VG_(printf)("%p\n", (void*)value); }
-static VG_REGPARM(0) void dg_Print_unsignedint(ULong tag, Int value){ VG_(printf)("Value for %d : ", tag); VG_(printf)("%p\n", (void*)value); }
+static VG_REGPARM(0) void dg_Print_double(ULong tag, ULong value){ VG_(printf)("Value for %Lu : ", tag); VG_(printf)("%lf\n", *(double*)&value); }
+static VG_REGPARM(0) void dg_Print_unsignedlong(ULong tag, ULong value){ VG_(printf)("Value for %Lu : ", tag); VG_(printf)("%p\n", (void*)value); }
+static VG_REGPARM(0) void dg_Print_unsignedint(ULong tag, Int value){ VG_(printf)("Value for %Lu : ", tag); VG_(printf)("%p\n", (void*)value); }
 
 /*! Debugging help. Add a dirty statement to IRSB that prints the value of expr whenever it is run.
  *  \param[in] tag - Tag of your choice, will be printed alongside.
@@ -115,7 +115,7 @@ static VG_REGPARM(0) void dg_Print_unsignedint(ULong tag, Int value){ VG_(printf
  */
 void dg_add_print_stmt(ULong tag, IRSB* sb_out, IRExpr* expr){
   IRType type = typeOfIRExpr(sb_out->tyenv, expr);
-  char* fname;
+  char const* fname;
   void* fptr;
   IRExpr* expr_to_print;
   switch(type){

derivgrind/dg_shadow.h

@@ -37,7 +37,9 @@
 #include "pub_tool_mallocfree.h"
 #include "pub_tool_libcassert.h"
 #include "pub_tool_gdbserver.h"
+#include "pub_tool_machine.h"
 #include "pub_tool_libcbase.h"
+#include "pub_tool_libcprint.h"
 
 #include "dg_utils.h"
 

derivgrind/dg_utils.h

@@ -34,6 +34,7 @@
 
 #include "pub_tool_basics.h"
 #include "pub_tool_tooliface.h"
+#include "pub_tool_libcprint.h"
 
 #ifndef __GNUC__
   #error "Only tested with GCC."

derivgrind/dot/dg_dot_diffquotdebug.h

@@ -10,6 +10,8 @@
 #include "pub_tool_libcassert.h"
 #include "pub_tool_gdbserver.h"
 #include "pub_tool_libcbase.h"
+#include "pub_tool_libcprint.h"
+#include "pub_tool_machine.h"
 
 #include "dg_utils.h"
 

derivgrind/trick/dg_trick.h

@@ -33,6 +33,8 @@
 #define DG_TRICK_H
 
 #include "pub_tool_basics.h"
+#include "pub_tool_threadstate.h"
+#include "pub_tool_stacktrace.h"
 #include "../dg_utils.h"
 
 /*! Add bit-trick-finding instrumentation to output IRSB.