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 117b3085db50cb67b683c4cb6f91165e4a75b690..7ddb900c8c9e2e826e2b72a3662ce683f38bd95a 100644 (file)
--- 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 934014daa194931babfe10e3f2559b06e6da9b2c..75b1baa17bc5c19764c4de7f05fd7bd6d2f28f41 100644 (file)
--- 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 8b63b5e89e00b0dbe314109f836d726b6e0f73a9..2af8510bd6d279eb277a24e3180b660875ac0652 100644 (file)
--- 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