From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Fri, 10 Nov 2023 16:56:52 +0000 (+0100)
Subject: Bug 476787 - Build of Valgrind 3.21.0 fails when SOLARIS_PT_SUNDWTRACE_THRP is defined
X-Git-Tag: VALGRIND_3_23_0~278
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=242d8881e10328ff98c37ceb7fd31955a29cad82;p=thirdparty%2Fvalgrind.git

Bug 476787 - Build of Valgrind 3.21.0 fails when SOLARIS_PT_SUNDWTRACE_THRP is defined

Patch provided by
   Jakub Kulik kulikjak@gmail.com
---

diff --git a/NEWS b/NEWS
index 33327182ee..79482f2076 100644
--- a/NEWS
+++ b/NEWS
@@ -29,6 +29,7 @@ are not entered into bugzilla tend to get forgotten about or ignored.
 475498  Add reallocarray wrapper
 476320  Build failure with GCC
 476535  Difference in allocation size for massif/tests/overloaded-new between clang++/libc++ and g++/libstdc++
+476787  Build of Valgrind 3.21.0 fails when SOLARIS_PT_SUNDWTRACE_THRP is defined
 
 To see details of a given bug, visit
   https://bugs.kde.org/show_bug.cgi?id=XXXXXX
diff --git a/coregrind/m_debuginfo/readelf.c b/coregrind/m_debuginfo/readelf.c
index fb64ed9769..3af8072d20 100644
--- a/coregrind/m_debuginfo/readelf.c
+++ b/coregrind/m_debuginfo/readelf.c
@@ -2421,6 +2421,12 @@ Bool ML_(read_elf_object) ( struct _DebugInfo* di )
 
       /* Accept .data where mapped as rw (data), even if zero-sized */
       if (0 == VG_(strcmp)(name, ".data")) {
+         if (inrw2) {
+            inrw = inrw2;
+         } else {
+            inrw = inrw1;
+         }
+
 #        if defined(SOLARIS_PT_SUNDWTRACE_THRP)
          if ((size == VKI_PT_SUNWDTRACE_SIZE) && (svma == dtrace_data_vaddr)) {
             TRACE_SYMTAB("ignoring .data section for dtrace_data "
@@ -2428,12 +2434,6 @@ Bool ML_(read_elf_object) ( struct _DebugInfo* di )
          } else
 #        endif /* SOLARIS_PT_SUNDWTRACE_THRP */
 
-        if (inrw2) {
-           inrw = inrw2;
-        } else {
-           inrw = inrw1;
-        }
-
          if (inrw && !di->data_present) {
             di->data_present = True;
             di->data_svma = svma;