--- a/build/common/common.mmh	Thu Jul 29 13:16:17 2010 +1000
+++ b/build/common/common.mmh	Thu Jul 29 14:11:57 2010 +1000
@@ -91,6 +91,9 @@
 #ifndef FSHELL_NO_SPCRE_SUPPORT
 #define FSHELL_SPCRE_SUPPORT
 #endif
+#ifndef FSHELL_NO_ARMCC_DIAG_SUPPRESS_SUPPORT
+#define FSHELL_ARMCC_DIAG_SUPPRESS_SUPPORT
+#endif
 
 //
 // PlatSec.

--- a/documentation/common_mmh.pod	Thu Jul 29 13:16:17 2010 +1000
+++ b/documentation/common_mmh.pod	Thu Jul 29 14:11:57 2010 +1000
@@ -218,6 +218,10 @@
 
 The TestExecute APIs are available.
 
+=item FSHELL_[NO_]ARMCC_DIAG_SUPPRESS_SUPPORT
+
+Defines whether ARM's RVCT compiler supports a C<--diag-supress> option (older versions appear not to), and hence whether fshell's build will try to use it.
+
 =back
 
 A couple of further macros follow - these are specifically for platforms that provide an custom implementation of the relevant command rather than using fshell's built-in version.

--- a/libraries/spcre/libpcre/group/libpcre.mmp	Thu Jul 29 13:16:17 2010 +1000
+++ b/libraries/spcre/libpcre/group/libpcre.mmp	Thu Jul 29 14:11:57 2010 +1000
@@ -63,8 +63,10 @@
 library         euser.lib
 library         estlib.lib
 
+#ifdef FSHELL_ARMCC_DIAG_SUPPRESS_SUPPORT
 // Remove some of the many warnings that armcc doesn't like
 // Warning:  #546-D: transfer of control bypasses initialization of:
 // Warning:  #1134-D: literal treated as "long long"
 // Warning: C2874W: othercase may be used before being set
 option ARMCC --diag-supress 1134,2874,546
+#endif
\ No newline at end of file