g77spec.c (lang_specific_driver): Check whether MATH_LIBRARY is null to decide whethe...

        * g77spec.c (lang_specific_driver): Check whether MATH_LIBRARY is
        null to decide whether to use it.

From-SVN: r26383

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 291745c801e0a87e90572ad050c410af71ddb72e..9d2f1342d6c21dd559f85ae732a11e8765354e2f 100644 (file)
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,8 @@
+Sun Apr 11 21:33:33 1999  Mumit Khan  <khan@xraylith.wisc.edu>
+
+       * g77spec.c (lang_specific_driver): Check whether MATH_LIBRARY is
+       null to decide whether to use it.
+
 Wed Apr  7 09:47:09 1999  Kaveh R. Ghazi  <ghazi@snafu.rutgers.edu>
 
        * ansify.c (die): Specify void argument.

diff --git a/gcc/f/g77spec.c b/gcc/f/g77spec.c
index 3cc2ac7724c30aa11e60ba5e30295b0b82e48a8e..f1e85de6fce9086060ecd2b9e5c16fe5da31f700 100644 (file)
--- a/gcc/f/g77spec.c
+++ b/gcc/f/g77spec.c
@@ -286,6 +286,9 @@ lang_specific_driver (fn, in_argc, in_argv, in_added_libraries)
      2 => last two args were -l<library> -lm.  */
   int saw_library = 0;
 
+  /* By default, we throw on the math library if we have one.  */
+  int need_math = (MATH_LIBRARY[0] != '\0');
+
   /* The number of input and output files in the incoming arg list.  */
   int n_infiles = 0;
   int n_outfiles = 0;
@@ -466,7 +469,7 @@ Report bugs to <egcs-bugs@cygnus.org>.\n");
        {
          /* Not a filename or library. */
 
-         if (saw_library == 1) /* -l<library>. */
+        if (saw_library == 1 && need_math)    /* -l<library>. */
            append_arg (MATH_LIBRARY);
 
          saw_library = 0;
@@ -521,7 +524,7 @@ Report bugs to <egcs-bugs@cygnus.org>.\n");
            saw_library = 1;    /* -l<library>. */
          else
            {           /* Other library, or filename. */
-             if (saw_library == 1)
+            if (saw_library == 1 && need_math)
                append_arg (MATH_LIBRARY);
              saw_library = 0;
            }
@@ -541,7 +544,8 @@ Report bugs to <egcs-bugs@cygnus.org>.\n");
        case 0:
          append_arg (library);
        case 1:
-         append_arg (MATH_LIBRARY);
+        if (need_math)
+          append_arg (MATH_LIBRARY);
        default:
          break;
        }