collect2.c (main): Use "-x c" instead of "-lang-c" for force the compiler into C...

        * collect2.c (main): Use "-x c" instead of "-lang-c" for force the
        compiler into C mode.

From-SVN: r21087

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7f23fd1..be1ed8b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jul 12 13:08:14 1998  Jeffrey A Law  (law@cygnus.com)
+
+       * collect2.c (main): Use "-x c" instead of "-lang-c" for force the
+       compiler into C mode.
+
 Sun Jul 12 01:27:05 1998  Jason Merrill  <jason@yorick.cygnus.com>
 
        * cplus-dem.c (demangle_nested_args): Return a value.

diff --git a/gcc/collect2.c b/gcc/collect2.c
index 442af24..539e088 100644 (file)
--- a/gcc/collect2.c
+++ b/gcc/collect2.c
@@ -930,7 +930,7 @@ main (argc, argv)
   char **object_lst    = (char **) xcalloc (sizeof (char *), argc);
   char **object                = object_lst;
   int first_file;
-  int num_c_args       = argc+8;
+  int num_c_args       = argc+9;
 
 #ifdef DEBUG
   debug = 1;
@@ -1137,7 +1137,8 @@ main (argc, argv)
 #endif
   ldout = make_temp_file (".ld");
   *c_ptr++ = c_file_name;
-  *c_ptr++ = "-lang-c";
+  *c_ptr++ = "-x";
+  *c_ptr++ = "c";
   *c_ptr++ = "-c";
   *c_ptr++ = "-o";
   *c_ptr++ = o_file;