From: Julian Seward <jseward@acm.org>
Date: Mon, 26 Nov 2007 21:34:30 +0000 (+0000)
Subject: drd: make the build silent regardless of platform, and abort at
X-Git-Tag: svn/VALGRIND_3_3_0~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=519f7dba030db58ec0462fc8946b2799424e280f;p=thirdparty%2Fvalgrind.git

drd: make the build silent regardless of platform, and abort at
     startup with a message if a not supported platform, like
     Omega.

omega: make the platform-not-supported-message a bit nicer.



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

diff --git a/exp-drd/drd_main.c b/exp-drd/drd_main.c
index 117b3085db..7ddb900c8c 100644
--- a/exp-drd/drd_main.c
+++ b/exp-drd/drd_main.c
@@ -553,7 +553,16 @@ void drd_pre_cond_destroy(Addr cond, SizeT s)
 
 static
 void drd_post_clo_init(void)
-{ }
+{
+#  if defined(VGP_x86_linux) || defined(VGP_amd64_linux)
+   /* fine */
+#  else
+   VG_(printf)("\nDRD currently only works on x86-linux and amd64-linux.\n");
+   VG_(printf)("At the very least you need to set PTHREAD_{MUTEX,COND}_SIZE\n");
+   VG_(printf)("in pthread_object_size.h to correct values.  Sorry.\n\n");
+   VG_(exit)(0);
+#  endif
+}
 
 static
 IRSB* drd_instrument(VgCallbackClosure* const closure,
diff --git a/exp-drd/pthread_object_size.h b/exp-drd/pthread_object_size.h
index 934014daa1..75b1baa17b 100644
--- a/exp-drd/pthread_object_size.h
+++ b/exp-drd/pthread_object_size.h
@@ -8,7 +8,7 @@
 # define PTHREAD_MUTEX_SIZE    40
 # define PTHREAD_COND_SIZE     48
 #else
-# warning "Unknown platform for PTHREAD_{MUTEX,COND}_SIZE"
+  /* FIXME: fill these fields in correctly.  32 is arbitrary. */
 # define PTHREAD_MUTEX_SIZE    32
 # define PTHREAD_COND_SIZE     32
 #endif
diff --git a/exp-omega/o_main.c b/exp-omega/o_main.c
index 8b63b5e89e..2af8510bd6 100644
--- a/exp-omega/o_main.c
+++ b/exp-omega/o_main.c
@@ -196,7 +196,7 @@ static UInt o_isReturnIgnoreReg(Addr reg)
     return 0;
   }
 #elif defined(VGA_ppc32) || defined(VGA_ppc64)
-  VG_(printf)("\n\nOmega does not currently work on ppc platforms."
+  VG_(printf)("\nOmega does not currently work on PowerPC/POWER platforms."
               "  Sorry.\n\n");
   VG_(exit)(0);
 #else
@@ -2820,7 +2820,7 @@ o_instrument(VgCallbackClosure* closure,
 
 #elif defined(VGA_ppc32) || defined(VGA_ppc64)
   default:
-  VG_(printf)("\n\nOmega does not currently work on ppc platforms."
+  VG_(printf)("\nOmega does not currently work on PowerPC/POWER platforms."
               "  Sorry.\n\n");
   VG_(exit)(0);
 #else