diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 49601612d2227ced793dc8146e5cb609f4d4cab1..008bc865401ecdd4cdfc390390c5865af211939f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,22 @@
+2008-04-09  Richard Sandiford  <richard@codesourcery.com>
+
+	* lib/target-supports.exp (check_effective_target_vxworks_kernel):
+	Fix comment.
+	(check_effective_target_vxworks_rtp): New procedure.
+	* g++.dg/opt/20050511-1.C: Rename UINT32 for VxWorks kernel mode.
+	* g++.dg/warn/miss-format-1.C: XFAIL for VxWorks.
+	* g++.old-deja/g++.abi/cxa_vec.C: XFAIL for VxWorks kernels.
+	* g++.old-deja/g++.brendan/new3.C: Likewise.
+	* g++.old-deja/g++.eh/badalloc1.C: XFAIL for VxWorks RTPs.
+	* g++.old-deja/g++.law/missed-error2.C: Undefine max for
+	VxWorks kernel mode.
+	* g++.old-deja/g++.mike/init1.C: XFAIL for VxWorks kernel mode.
+	* g++.old-deja/g++.mike/p2736.C: Likewise.
+	* g++.old-deja/g++.mike/p658.C: Undefine OK for VxWorks kernel mode.
+	* g++.old-deja/g++.other/headers1.C: Likewise min and max.
+	* g++.old-deja/g++.robertl/eb79.C: Undefine max for VxWorks
+	kernel mode.
+
 2008-04-09  Jakub Jelinek  <jakub@redhat.com>
 
 	* gfortran.dg/namelist_47.f90: New test.
diff --git a/gcc/testsuite/g++.dg/opt/20050511-1.C b/gcc/testsuite/g++.dg/opt/20050511-1.C
index 2fbd3e1be5e998d84726b20ac1ef2d91d0537818..a8929030af4e1fb783e77348f8b7f0b9b72df6fb 100644
--- a/gcc/testsuite/g++.dg/opt/20050511-1.C
+++ b/gcc/testsuite/g++.dg/opt/20050511-1.C
@@ -4,6 +4,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+// The VxWorks kernel headers define their own UINT32
+#if defined __vxworks && !defined __RTP__
+#define UINT32 my_UINT32
+#endif
+
 typedef signed short SINT16 ;
 typedef unsigned long UINT32 ;
 typedef unsigned int UINT ;
diff --git a/gcc/testsuite/g++.dg/warn/miss-format-1.C b/gcc/testsuite/g++.dg/warn/miss-format-1.C
index 56a5c7b1383f744e027a12eb2655fa07a01623ee..ec9dbc1c3bdf0b19f89b4dcef754d24a0b14075f 100644
--- a/gcc/testsuite/g++.dg/warn/miss-format-1.C
+++ b/gcc/testsuite/g++.dg/warn/miss-format-1.C
@@ -2,7 +2,8 @@
 /* Origin: Joseph Myers <jsm28@cam.ac.uk> */
 /* { dg-do compile } */
 /* { dg-options "-Wmissing-format-attribute" } */
-/* { dg-error "not declared" "" { target *-*-solaris2.5.1 *-*-solaris2.[5-8] } 24 } */
+/* VxWorks does not provide vscanf, either in kernel or RTP mode.  */
+/* { dg-error "not declared" "" { target *-*-solaris2.5.1 *-*-solaris2.[5-8] *-*-vxworks* } 25 } */
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -21,7 +22,7 @@ bar (const char *fmt, ...)
 {
   va_list ap;
   va_start (ap, fmt);
-  vscanf (fmt, ap); /* { dg-warning "candidate" "scanf attribute warning" { xfail *-*-solaris2.5.1 *-*-solaris2.[5-8] } } */
+  vscanf (fmt, ap); /* { dg-warning "candidate" "scanf attribute warning" { xfail *-*-solaris2.5.1 *-*-solaris2.[5-8] *-*-vxworks* } } */
   va_end (ap);
 }
 
diff --git a/gcc/testsuite/g++.old-deja/g++.abi/cxa_vec.C b/gcc/testsuite/g++.old-deja/g++.abi/cxa_vec.C
index 7be9185638b8d335ca3a78d542d555f887bcd09f..5370fb8981df03f1cc0387666fb034c043614652 100644
--- a/gcc/testsuite/g++.old-deja/g++.abi/cxa_vec.C
+++ b/gcc/testsuite/g++.old-deja/g++.abi/cxa_vec.C
@@ -1,4 +1,9 @@
-// { dg-do run { xfail powerpc-ibm-aix* } }
+// This test fails on VxWorks in kernel mode because it depends on the
+// library version of "::operator new[]" calling the "::operator new"
+// defined in this module.  This doesn't work because the library version
+// of "::operator new[]" is built into the kernel itself; library relocations
+// are resolved when the kernel is linked.
+// { dg-do run { xfail { powerpc-ibm-aix* || vxworks_kernel } } }
 // { dg-options "-flat_namespace" { target *-*-darwin[67]* } }
 // Test __cxa_vec routines
 // Copyright (C) 2000, 2005 Free Software Foundation, Inc.
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/new3.C b/gcc/testsuite/g++.old-deja/g++.brendan/new3.C
index b5bfb4a83b059d89ea253a483e579519cb58d517..791d00bac9635ebf202ad781a49a59bbfdf5ad49 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/new3.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/new3.C
@@ -1,4 +1,9 @@
-// { dg-do run { xfail powerpc-ibm-aix* } }
+// This test fails on VxWorks in kernel mode because it depends on the
+// library version of "::operator new[]" calling the "::operator new"
+// defined in this module.  This doesn't work because the library version
+// of "::operator new[]" is built into the kernel itself; library relocations
+// are resolved when the kernel is linked.
+// { dg-do run { xfail { powerpc-ibm-aix* || vxworks_kernel } } }
 // { dg-options "-flat_namespace" { target *-*-darwin[67]* } }
 // GROUPS passed operator-new
 #include <stdio.h>
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/badalloc1.C b/gcc/testsuite/g++.old-deja/g++.eh/badalloc1.C
index 3c9941d65c82a0a43cc9e9de5dff659b43a4e499..b2e7f62b9b30b1bfaec206e26c03d7b8c29607a4 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/badalloc1.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/badalloc1.C
@@ -1,4 +1,8 @@
-// { dg-do run { xfail xstormy16-*-* *-*-darwin[1-7]* } }
+// This fails for VxWorks RTPs because the initialization of
+// __cxa_allocate_exception's emergency buffer mutex will
+// itself call malloc(), and will fail if there is no more
+// memory available.
+// { dg-do run { xfail { { xstormy16-*-* *-*-darwin[1-7]* } || vxworks_rtp } } }
 // Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc.
 // Contributed by Nathan Sidwell 6 June 2000 <nathan@codesourcery.com>
 
diff --git a/gcc/testsuite/g++.old-deja/g++.law/missed-error2.C b/gcc/testsuite/g++.old-deja/g++.law/missed-error2.C
index d9d6195dfe8ddc81ee690c2890c7e8d75e9c28dc..a26f456f20a0925fd22ffb18f8f19fd4b6bad6c1 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/missed-error2.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/missed-error2.C
@@ -8,6 +8,12 @@
 
 #include <iostream>
 
+// The VxWorks kernel-mode headers define a macro named "max", which is not
+// ISO-compliant, but is part of the VxWorks API.
+#if defined __vxworks && !defined __RTP__
+#undef max
+#endif
+
 inline int max(int a, int b) {return a > b ? a : b;}; // { dg-error "" } candidate
 inline double max(double a, double b) {return a > b ? a : b;}; // { dg-error "" } candidate
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/init1.C b/gcc/testsuite/g++.old-deja/g++.mike/init1.C
index 0b47fb7e7059f27a06982f7f246de1f8d6e79a39..5bc1ea4a9ac975e767fee09e3f53f15911720ee3 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/init1.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/init1.C
@@ -1,4 +1,6 @@
-// { dg-do run  }
+// The VxWorks kernel has no implementation of atexit, so local statics
+// are never destroyed. 
+// { dg-do run { xfail vxworks_kernel } }
 int count;
 
 extern "C" void _exit(int);
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p2736.C b/gcc/testsuite/g++.old-deja/g++.mike/p2736.C
index a0a8b314338e1c24007a066e3c75ac6c4140d245..6ae61e89260ae7e53acca4b1ddf290976772f16e 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p2736.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p2736.C
@@ -1,4 +1,6 @@
-// { dg-do run  }
+// The VxWorks kernel has no implementation of atexit, so local statics
+// are never destroyed. 
+// { dg-do run { xfail vxworks_kernel } }
 // This is a poor test case, it is meant to ensure that function local
 // statics are destroyed at the right time.  See PR 2736 for details.
 // prms-id: 2736
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p658.C b/gcc/testsuite/g++.old-deja/g++.mike/p658.C
index 1a4fefddc07bd88872918f22f231bdcba33952f2..8fc7cd51b2be34c13f759f3fc80247665a6fd157 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p658.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p658.C
@@ -12,6 +12,12 @@
 #define TRUE true
 #endif
 
+// The VxWorks kernel-mode headers define a macro named "OK", which is not
+// ISO-compliant, but is part of the VxWorks API.
+#if defined __vxworks && !defined __RTP__
+#undef OK
+#endif
+
 class Object {
 public:
     Object();
diff --git a/gcc/testsuite/g++.old-deja/g++.other/headers1.C b/gcc/testsuite/g++.old-deja/g++.other/headers1.C
index 31de3558f1e2d694fa93b44d3db811535eded001..1080fe38c8ac708e04acfc6a3b6e754c7caa7a71 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/headers1.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/headers1.C
@@ -44,6 +44,12 @@
 #include <string>
 #include <typeinfo>
 #include <utility>
+// The VxWorks kernel-mode headers define macros named "max" and
+// "min", which is not ISO-compliant, but is part of the VxWorks API.
+#if defined __vxworks && !defined __RTP__
+#undef max
+#undef min
+#endif
 #include <valarray>
 #include <vector>
 
diff --git a/gcc/testsuite/g++.old-deja/g++.robertl/eb79.C b/gcc/testsuite/g++.old-deja/g++.robertl/eb79.C
index e5905ffbec009c21f38570aa26545a8c165cff6a..8d1c94d168ffcb732fecff0e86a2b6c26eddb3b4 100644
--- a/gcc/testsuite/g++.old-deja/g++.robertl/eb79.C
+++ b/gcc/testsuite/g++.old-deja/g++.robertl/eb79.C
@@ -2,6 +2,12 @@
 // Makes bogus x86 assembly code.
 #include <iostream>
 
+// The VxWorks kernel-mode headers define a macro named "max", which is not
+// ISO-compliant, but is part of the VxWorks API.
+#if defined __vxworks && !defined __RTP__
+#undef max
+#endif
+
 using namespace std;
 
 template<class T>
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 2d50643485b63e3eaba5650718107ef5b86366f2..c1bdc79b5e54e23dd453dccac5d3f5c000606f18 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -2221,7 +2221,7 @@ proc check_effective_target_simulator { } {
     return 0
 }
 
-# Return 1 if the target is a VxWorks RTP.
+# Return 1 if the target is a VxWorks kernel.
 
 proc check_effective_target_vxworks_kernel { } {
     return [check_no_compiler_messages vxworks_kernel assembly {
@@ -2231,6 +2231,16 @@ proc check_effective_target_vxworks_kernel { } {
     }]
 }
 
+# Return 1 if the target is a VxWorks RTP.
+
+proc check_effective_target_vxworks_rtp { } {
+    return [check_no_compiler_messages vxworks_rtp assembly {
+	#if !defined __vxworks || !defined __RTP__
+	#error NO
+	#endif
+    }]
+}
+
 # Return 1 if the target is expected to provide wide character support.
 
 proc check_effective_target_wchar { } {