Index: boost/config/compiler/nvcc.hpp
===================================================================
--- boost/config/compiler/nvcc.hpp      (revision 84549)
+++ boost/config/compiler/nvcc.hpp      (working copy)
@@ -17,12 +17,96 @@
 
 // Boost support macro for NVCC 
 // NVCC Basically behaves like some flavor of MSVC6 + some specific quirks
-#ifdef __GNUC__
+#if defined(__GCCXML__)
+// GCC-XML emulates other compilers, it has to appear first here!
+#include <"boost/config/compiler/gcc_xml.hpp">
 
-#include <boost/config/compiler/gcc.hpp>
+#elif defined(_CRAYC)
+// EDG based Cray compiler:
+#include <"boost/config/compiler/cray.hpp">
 
-#elif defined(_MSC_VER)
+#elif defined __COMO__
+//  Comeau C++
+#include <"boost/config/compiler/comeau.hpp">
 
-#include <boost/config/compiler/visualc.hpp>
+#elif defined(__PATHSCALE__) && (__PATHCC__ >= 4)
+// PathScale EKOPath compiler (has to come before clang and gcc)
+#include <"boost/config/compiler/pathscale.hpp">
 
+#elif defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)
+//  Intel
+#include <"boost/config/compiler/intel.hpp">
+
+#elif defined __clang__
+//  Clang C++ emulates GCC, so it has to appear early.
+#include <"boost/config/compiler/clang.hpp">
+
+#elif defined __DMC__
+//  Digital Mars C++
+#include <"boost/config/compiler/digitalmars.hpp">
+
+# elif defined __GNUC__
+//  GNU C++:
+#include <"boost/config/compiler/gcc.hpp">
+
+#elif defined __KCC
+//  Kai C++
+#include <"boost/config/compiler/kai.hpp">
+
+#elif defined __sgi
+//  SGI MIPSpro C++
+#include <"boost/config/compiler/sgi_mipspro.hpp">
+
+#elif defined __DECCXX
+//  Compaq Tru64 Unix cxx
+#include <"boost/config/compiler/compaq_cxx.hpp">
+
+#elif defined __ghs
+//  Greenhills C++
+#include <"boost/config/compiler/greenhills.hpp">
+
+#elif defined __CODEGEARC__
+//  CodeGear - must be checked for before Borland
+#include <"boost/config/compiler/codegear.hpp">
+
+#elif defined __BORLANDC__
+//  Borland
+#include <"boost/config/compiler/borland.hpp">
+
+#elif defined  __MWERKS__
+//  Metrowerks CodeWarrior
+#include <"boost/config/compiler/metrowerks.hpp">
+
+#elif defined  __SUNPRO_CC
+//  Sun Workshop Compiler C++
+#include <"boost/config/compiler/sunpro_cc.hpp">
+
+#elif defined __HP_aCC
+//  HP aCC
+#include <"boost/config/compiler/hp_acc.hpp">
+
+#elif defined(__MRC__) || defined(__SC__)
+//  MPW MrCpp or SCpp
+#include <"boost/config/compiler/mpw.hpp">
+
+#elif defined(__IBMCPP__)
+//  IBM Visual Age
+#include <"boost/config/compiler/vacpp.hpp">
+
+#elif defined(__PGI)
+//  Portland Group Inc.
+#include <"boost/config/compiler/pgi.hpp">
+
+#elif defined _MSC_VER
+//  Microsoft Visual C++
+//
+//  Must remain the last #elif since some other vendors (Metrowerks, for
+//  example) also #define _MSC_VER
+#include <"boost/config/compiler/visualc.hpp">
+
+#elif defined (BOOST_ASSERT_CONFIG)
+// this must come last - generate an error if we don't
+// recognise the compiler:
+#  error "Unknown compiler - please configure (http://www.boost.org/libs/config/config.htm#configuring) and report the results to the main boost mailing list (http://www.boost.org/more/mailing_lists.htm#main)"
+
 #endif