Merge remote-tracking branch 'origin/master' into eddie/abc9_scratchpad

diff --cc passes/techmap/abc9.cc
index ec80e098f9f1755ccaa54fafedd0f81b299abbef,471c11a803e62de419b01dfb15de32a6cce6be23..bd4e506acb3e0f1e6c780f0bedd9a033a1eed259
--- 1/passes/techmap/abc9.cc
--- 2/passes/techmap/abc9.cc
+++ b/passes/techmap/abc9.cc
@@@ -915,13 -860,7 +912,12 @@@ struct Abc9Pass : public Pass 
                if (design->scratchpad.count("abc9.W")) {
                        wire_delay = "-W " + design->scratchpad_get_string("abc9.W");
                }
-               nomfs = design->scratchpad_get_bool("abc9.nomfs", nomfs);
  
 +              if (design->scratchpad_get_bool("abc9.debug")) {
 +                      cleanup = false;
 +                      show_tempdir = true;
 +              }
 +
                size_t argidx;
                char pwd [PATH_MAX];
                if (!getcwd(pwd, sizeof(pwd))) {