Changeset 692be4e for driver/cfa.cc

Timestamp:

Jan 29, 2019, 1:49:06 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

72514aa

Parents:

528ccc8 (diff), 8f99233 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'jenkins-sandbox' of plg.uwaterloo.ca:software/cfa/cfa-cc into jenkins-sandbox

File:

• driver/cfa.cc (modified) (4 diffs)

driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Sep 14 23:02:59 2018
-// Update Count     : 277
+// Last Modified On : Tue Jan 15 20:56:03 2019
+// Update Count     : 280
 //
 
@@ -384 +384 @@
         nargs += 1;
 
+        for ( int i = 0; i < nlibs; i += 1 ) {                          // copy non-user libraries after all user libraries
+                args[nargs] = libs[i];
+                nargs += 1;
+        } // for
+
         if ( link ) {
                 args[nargs] = "-Xlinker";
@@ -414 +419 @@
                 nargs += 1;
                 args[nargs] = "-lrt";
+                nargs += 1;
+                args[nargs] = "-lm";
                 nargs += 1;
         } // if
@@ -498 +505 @@
                 args[nargs] = ( *new string( string("-B") + Bprefix ) ).c_str();
                 nargs += 1;
-                args[nargs] = "-lm";
-                nargs += 1;
         } else {
                 cerr << argv[0] << " error, compiler \"" << compiler_name << "\" unsupported." << endl;
                 exit( EXIT_FAILURE );
         } // if
-
-        for ( int i = 0; i < nlibs; i += 1 ) {                          // copy non-user libraries after all user libraries
-                args[nargs] = libs[i];
-                nargs += 1;
-        } // for
 
         args[nargs] = NULL;                                                                     // terminate with NULL