Merge remote-tracking branch 'origin/master' into xaig

diff --cc Makefile
Simple merge

diff --cc techlibs/ice40/synth_ice40.cc
index a13a81246ae7e4f607fe2386f2263ea82328d6c2,34501b335154a90e02210d06c78a866e4185434e..621b0b2bcafcff2596dc10c94deb1b3e7b6b4c43
--- 1/techlibs/ice40/synth_ice40.cc
--- 2/techlibs/ice40/synth_ice40.cc
+++ b/techlibs/ice40/synth_ice40.cc
@@@ -315,7 -306,7 +315,7 @@@ struct SynthIce40Pass : public ScriptPa
                                run("techmap -map +/gate2lut.v -D LUT_WIDTH=4", "(only if -noabc)");
                        }
                        if (!noabc) {
-                               run(abc + " -lut 4", "(skip if -noabc)");
 -                              run("abc -dress -lut 4", "(skip if -noabc)");
++                              run(abc + " -dress -lut 4", "(skip if -noabc)");
                        }
                        run("clean");
                        if (relut || help_mode) {