diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4118e9da0aa2..e90b2db819e2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-08  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	PR driver/35665
+	* collect2.c (write_c_file): Don't wrap in "#ifdef __cplusplus".
+
 2008-04-09  Richard Guenther  <rguenther@suse.de>
 
 	* tree-cfg.c (verify_stmt): Print complete bogus stmt.
diff --git a/gcc/collect2.c b/gcc/collect2.c
index bba108d27491..af8bc799a38b 100644
--- a/gcc/collect2.c
+++ b/gcc/collect2.c
@@ -2043,14 +2043,12 @@ write_c_file_glob (FILE *stream, const char *name ATTRIBUTE_UNUSED)
 static void
 write_c_file (FILE *stream, const char *name)
 {
-  fprintf (stream, "#ifdef __cplusplus\nextern \"C\" {\n#endif\n");
 #ifndef LD_INIT_SWITCH
   if (! shared_obj)
     write_c_file_glob (stream, name);
   else
 #endif
     write_c_file_stat (stream, name);
-  fprintf (stream, "#ifdef __cplusplus\n}\n#endif\n");
 }
 
 #ifdef COLLECT_EXPORT_LIST