diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 28979d58b47..e474fc8893d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-11  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* config/nvptx/nvptx.h (LIBSTDCXX): Define to "gcc".
+
 2015-03-11  Marek Polacek  <polacek@redhat.com>
 
 	PR tree-optimization/65388
diff --git a/gcc/config/nvptx/nvptx.h b/gcc/config/nvptx/nvptx.h
index e74d16f075a..e4e58dd9536 100644
--- a/gcc/config/nvptx/nvptx.h
+++ b/gcc/config/nvptx/nvptx.h
@@ -366,4 +366,8 @@ struct GTY(()) machine_function
 #define FUNCTION_MODE QImode
 #define HAS_INIT_SECTION 1
 
+/* The C++ front end insists to link against libstdc++ -- which we don't build.
+   Tell it to instead link against the innocuous libgcc.  */
+#define LIBSTDCXX "gcc"
+
 #endif /* GCC_NVPTX_H */