Changeset 28c4f74

Timestamp:

Mar 10, 2020, 2:22:20 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

fd2b607

Parents:

dfda49f (diff), bf22bc6 (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 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• Jenkinsfile (modified) (3 diffs)

Jenkinsfile

@@ -126 +126 @@
                         }
 
-                        sh "${SrcDir}/configure CXX=${Settings.Compiler.CXX} CC=${Settings.Compiler.CC} ${Settings.Architecture.flags} AR=gcc-ar RANLIB=gcc-ranlib CXXFLAGS='-flto=auto' CFAFLAGS='-flto=auto' ${targets} --quiet"
+                        sh "${SrcDir}/configure CXX=${Settings.Compiler.CXX} CC=${Settings.Compiler.CC} ${Settings.Architecture.flags} AR=gcc-ar RANLIB=gcc-ranlib ${targets} --quiet"
 
                         // Configure libcfa
@@ -325 +325 @@
         public String CXX
         public String CC
-
-        CC_Desc(String name, String CXX, String CC) {
+        public String lto
+
+        CC_Desc(String name, String CXX, String CC, String lto) {
                 this.name = name
                 this.CXX = CXX
-                this.CC = CC
+                this.CC  = CC
+                this.lto = lto
         }
 }
@@ -364 +366 @@
                 switch( param.Compiler ) {
                         case 'gcc-9':
-                                this.Compiler = new CC_Desc('gcc-9', 'g++-9', 'gcc-9')
+                                this.Compiler = new CC_Desc('gcc-9', 'g++-9', 'gcc-9', '-flto=auto')
                         break
                         case 'gcc-8':
-                                this.Compiler = new CC_Desc('gcc-8', 'g++-8', 'gcc-8')
+                                this.Compiler = new CC_Desc('gcc-8', 'g++-8', 'gcc-8', '-flto=auto')
                         break
                         case 'gcc-7':
-                                this.Compiler = new CC_Desc('gcc-7', 'g++-7', 'gcc-7')
+                                this.Compiler = new CC_Desc('gcc-7', 'g++-7', 'gcc-7', '-flto=auto')
                         break
                         case 'gcc-6':
-                                this.Compiler = new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
+                                this.Compiler = new CC_Desc('gcc-6', 'g++-6', 'gcc-6', '-flto=auto')
                         break
                         case 'gcc-5':
-                                this.Compiler = new CC_Desc('gcc-5', 'g++-5', 'gcc-5')
+                                this.Compiler = new CC_Desc('gcc-5', 'g++-5', 'gcc-5', '-flto=auto')
                         break
                         case 'gcc-4.9':
-                                this.Compiler = new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9')
+                                this.Compiler = new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9', '-flto=auto')
                         break
                         case 'clang':
-                                this.Compiler = new CC_Desc('clang', 'clang++-6.0', 'gcc-6')
+                                this.Compiler = new CC_Desc('clang', 'clang++-6.0', 'gcc-6', '-flto=thin -flto-jobs=0')
                         break
                         default :