From: Bart Van Assche <bvanassche@acm.org>
Date: Mon, 13 Sep 2010 17:44:10 +0000 (+0000)
Subject: Restored original code for other compilers than ppc gcc 4.3.0 such that at least... 
X-Git-Tag: svn/VALGRIND_3_6_0~102
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6cf2bb4ffc8d054fefeb7c26743d2912617ab48;p=thirdparty%2Fvalgrind.git

Restored original code for other compilers than ppc gcc 4.3.0 such that at least one test invokes ANNOTATE_UNPROTECTED_READ().

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11355
---

diff --git a/drd/tests/annotate_static.cpp b/drd/tests/annotate_static.cpp
index 6c6fbabf7e..25ffd47e6c 100644
--- a/drd/tests/annotate_static.cpp
+++ b/drd/tests/annotate_static.cpp
@@ -21,10 +21,15 @@ static inline void AnnotateIgnoreReadsEnd() { ANNOTATE_IGNORE_READS_END(); }
 
 static void* thread_func(void*)
 {
+#if defined(__powerpc__) && __GNUC__ -0 == 4 && __GNUC_MINOR__ -0 == 3 \
+    && __GNUC_PATCHLEVEL__ -0 == 0
   AnnotateIgnoreReadsBegin();
   int i = s_j;
   AnnotateIgnoreReadsEnd();
   s_i = i;
+#else
+  s_i = ANNOTATE_UNPROTECTED_READ(s_j);
+#endif
   return 0;
 }