components/developer/valgrind/patches/05-dtrace-fix.patch

   1 The change that added this code did not take Solaris only block (hidden
   2 behind define macro) into consideration.
   3
   4 Should be reported upstream.
   5
   6 --- valgrind-3.22.0/coregrind/m_debuginfo/readelf.c
   7 +++ valgrind-3.22.0/coregrind/m_debuginfo/readelf.c
   8 @@ -2386,6 +2386,12 @@ Bool ML_(read_elf_debug_info) ( struct _
   9
  10        /* Accept .data where mapped as rw (data), even if zero-sized */
  11        if (0 == VG_(strcmp)(name, ".data")) {
  12 +        if (inrw2) {
  13 +           inrw = inrw2;
  14 +        } else {
  15 +           inrw = inrw1;
  16 +        }
  17 +
  18  #        if defined(SOLARIS_PT_SUNDWTRACE_THRP)
  19           if ((size == VKI_PT_SUNWDTRACE_SIZE) && (svma == dtrace_data_vaddr)) {
  20              TRACE_SYMTAB("ignoring .data section for dtrace_data "
  21 @@ -2393,12 +2399,6 @@ Bool ML_(read_elf_debug_info) ( struct _
  22           } else
  23  #        endif /* SOLARIS_PT_SUNDWTRACE_THRP */
  24
  25 -        if (inrw2) {
  26 -           inrw = inrw2;
  27 -        } else {
  28 -           inrw = inrw1;
  29 -        }
  30 -
  31           if (inrw && !di->data_present) {
  32              di->data_present = True;
  33              di->data_svma = svma;