Index: driver/cfa.cc
===================================================================
--- driver/cfa.cc	(revision 6dc19544a8ab55bf4ec65a6beabc94ee9570549a)
+++ driver/cfa.cc	(revision 2026bb680ed5d5d8295cce3291a89b31b8ec7de2)
@@ -405,8 +405,4 @@
 		args[nargs] = "--undefined=__cfaabi_appready_startup";
 		nargs += 1;
-		args[nargs] = "-Xlinker";
-		nargs += 1;
-		args[nargs] = "--undefined=__cfaabi_dbg_record";
-		nargs += 1;
 
 		// include the cfa library in case it's needed
@@ -414,4 +410,10 @@
 		nargs += 1;
 		args[nargs] = ( *new string( string("-Wl,-rpath," ) + libdir + (intree ? "/src/.libs" : "")) ).c_str();
+		nargs += 1;
+		args[nargs] = "-Wl,--push-state,--as-needed";
+		nargs += 1;
+		args[nargs] = "-lcfathread";
+		nargs += 1;
+		args[nargs] = "-Wl,--pop-state";
 		nargs += 1;
 		args[nargs] = "-lcfa";