Index: Jenkinsfile
===================================================================
--- Jenkinsfile	(revision 673eb7a23c93903af14453c0bbf51106c4b15ca2)
+++ Jenkinsfile	(revision a951171029ff1a4c39b1e4a74472db9969a2249f)
@@ -102,9 +102,4 @@
 
 		echo GitLogMessage()
-
-		// This is a complete hack but it solves problems with automake thinking it needs to regenerate makefiles
-		// We fudged automake/missing to handle that but automake stills bakes prints inside the makefiles
-		// and these cause more problems.
-		sh 'find . -name Makefile.in -exec touch {} +'
 	}
 }
@@ -465,5 +460,5 @@
 					description: 'Which compiler to use',					\
 					name: 'Compiler',									\
-					choices: 'gcc-9\ngcc-8\ngcc-7\ngcc-6\ngcc-5\ngcc-4.9\nclang',					\
+					choices: 'gcc-9\ngcc-8\ngcc-7\ngcc-6\ngcc-5\ngcc-4.9\nclang',	\
 					defaultValue: 'gcc-8',								\
 				],												\
Index: src/Common/Stats/ResolveTime.cc
===================================================================
--- src/Common/Stats/ResolveTime.cc	(revision a951171029ff1a4c39b1e4a74472db9969a2249f)
+++ src/Common/Stats/ResolveTime.cc	(revision a951171029ff1a4c39b1e4a74472db9969a2249f)
@@ -0,0 +1,59 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2019 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// ResolveTime.cc --
+//
+// Author           : Thierry Delisle
+// Created On       : Wed Sep 16 15:45:51 2020
+// Last Modified By :
+// Last Modified On :
+// Update Count     :
+//
+
+#include "ResolveTime.h"
+
+#include <fstream>
+#include <iomanip>
+
+#include "AST/Fwd.hpp"
+#include "AST/Expr.hpp"
+#include "AST/Print.hpp"
+#include "AST/Type.hpp"
+
+namespace Stats {
+	namespace ResolveTime {
+		static inline long long rdtscl(void) {
+			unsigned int lo, hi;
+			__asm__ __volatile__ ("rdtsc" : "=a"(lo), "=d"(hi));
+			return ( (unsigned long long)lo)|( ((unsigned long long)hi)<<32 );
+		}
+
+		extern bool enabled;
+		bool started = false;
+		long long before;
+		std::ostream & out = std::cout;
+
+		void start( const ast::Expr * expr ) {
+			if(enabled) {
+				assert(!started);
+				started = true;
+
+				out << expr->location << " : ";
+
+				before = rdtscl();
+			}
+		}
+		void stop() {
+			if(enabled) {
+				assert(started);
+				auto after = rdtscl();
+				out << (after - before) << std::endl;
+
+				started = false;
+			}
+		}
+	};
+};
Index: src/Common/Stats/ResolveTime.h
===================================================================
--- src/Common/Stats/ResolveTime.h	(revision a951171029ff1a4c39b1e4a74472db9969a2249f)
+++ src/Common/Stats/ResolveTime.h	(revision a951171029ff1a4c39b1e4a74472db9969a2249f)
@@ -0,0 +1,38 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2019 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// ResolveTime.h --
+//
+// Author           : Thierry Delisle
+// Created On       : Wed Sep 16 15:45:51 2020
+// Last Modified By :
+// Last Modified On :
+// Update Count     :
+//
+
+#pragma once
+
+#include "Common/Stats/Base.h"
+
+#if defined( NO_STATISTICS )
+	#define NO_RESOLVE_TIME_STATISTICS
+#endif
+
+namespace ast {
+	class Expr;
+}
+
+namespace Stats {
+	namespace ResolveTime {
+		#if defined(NO_RESOLVE_TIME_STATISTICS)
+			void start( const ast::Expr * ) {}
+			void stop() {}
+		#else
+			void start( const ast::Expr * );
+			void stop();
+		#endif
+	};
+};
Index: src/Common/Stats/Stats.cc
===================================================================
--- src/Common/Stats/Stats.cc	(revision 673eb7a23c93903af14453c0bbf51106c4b15ca2)
+++ src/Common/Stats/Stats.cc	(revision a951171029ff1a4c39b1e4a74472db9969a2249f)
@@ -35,4 +35,8 @@
 	}
 
+	namespace ResolveTime {
+		bool enabled = false;
+	}
+
 	struct {
 		const char * const opt;
@@ -43,4 +47,5 @@
 		{ "heap"    , Heap::enabled },
 		{ "time"    , Time::enabled },
+		{ "resolve" , ResolveTime::enabled },
 	};
 
Index: src/Common/module.mk
===================================================================
--- src/Common/module.mk	(revision 673eb7a23c93903af14453c0bbf51106c4b15ca2)
+++ src/Common/module.mk	(revision a951171029ff1a4c39b1e4a74472db9969a2249f)
@@ -40,4 +40,6 @@
       Common/Stats/Heap.cc \
       Common/Stats/Heap.h \
+      Common/Stats/ResolveTime.cc \
+      Common/Stats/ResolveTime.h \
       Common/Stats/Stats.cc \
       Common/Stats/Time.cc \
Index: src/ResolvExpr/Resolver.cc
===================================================================
--- src/ResolvExpr/Resolver.cc	(revision 673eb7a23c93903af14453c0bbf51106c4b15ca2)
+++ src/ResolvExpr/Resolver.cc	(revision a951171029ff1a4c39b1e4a74472db9969a2249f)
@@ -38,4 +38,5 @@
 #include "Common/PassVisitor.h"          // for PassVisitor
 #include "Common/SemanticError.h"        // for SemanticError
+#include "Common/Stats/ResolveTime.h"    // for ResolveTime::start(), ResolveTime::stop()
 #include "Common/utility.h"              // for ValueGuard, group_iterate
 #include "InitTweak/GenInit.h"
@@ -1169,5 +1170,8 @@
 			const ast::Expr * untyped, const ast::SymbolTable & symtab
 		) {
-			return findKindExpression( untyped, symtab );
+			Stats::ResolveTime::start( untyped );
+			auto res = findKindExpression( untyped, symtab );
+			Stats::ResolveTime::stop();
+			return res;
 		}
 	} // anonymous namespace
Index: tests/Makefile.am
===================================================================
--- tests/Makefile.am	(revision 673eb7a23c93903af14453c0bbf51106c4b15ca2)
+++ tests/Makefile.am	(revision a951171029ff1a4c39b1e4a74472db9969a2249f)
@@ -114,4 +114,5 @@
 	$(CFACOMPILETEST) -c -o $(abspath ${@}).o
 	$(CFACCLINK) ${@}.o -o $(abspath ${@})
+	rm $(abspath ${@}).o
 
 # implicit rule for c++ test
@@ -182,4 +183,5 @@
 	$(CFACOMPILETEST) -O0 -c -o $(abspath ${@}).o
 	$(CFACCLINK)  -O0 ${@}.o -o $(abspath ${@})
+	rm $(abspath ${@}).o
 
 #------------------------------------------------------------------------------
Index: tests/linking/.expect/linkerror.txt
===================================================================
--- tests/linking/.expect/linkerror.txt	(revision 673eb7a23c93903af14453c0bbf51106c4b15ca2)
+++ tests/linking/.expect/linkerror.txt	(revision a951171029ff1a4c39b1e4a74472db9969a2249f)
@@ -1,3 +1,2 @@
-CFA Version 1.0.0 (debug)
 linking/linkerror.o: In function `_X4mainFi___1':
 linking/linkerror.cfa:6: undefined reference to `_X18this_doesnot_existFv_i__1'