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

diff --cc Makefile
Simple merge

diff --cc kernel/rtlil.h
Simple merge

diff --cc techlibs/xilinx/synth_xilinx.cc
index 090bcce857c45f5a1bc791de91e1c47146d26b96,397c83ac6f8cc489b2b59bd35e327a0f1d8d4d03..8a531c49727418ed8761591e7a94088fd009b482
--- 1/techlibs/xilinx/synth_xilinx.cc
--- 2/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@@ -275,9 -268,10 +276,10 @@@ struct SynthXilinxPass : public Pas
  
                if (check_label(active, run_from, run_to, "map_luts"))
                {
 -                      Pass::call(design, "abc -luts 2:2,3,6:5,10,20" + string(retime ? " -dff" : ""));
+                       Pass::call(design, "techmap -map +/techmap.v -map +/xilinx/ff_map.v t:$_DFF_?N?");
 +                      Pass::call(design, abc + " -luts 2:2,3,6:5,10,20" + string(retime ? " -dff" : ""));
                        Pass::call(design, "clean");
-                       Pass::call(design, "techmap -map +/xilinx/lut_map.v");
+                       Pass::call(design, "techmap -map +/xilinx/lut_map.v -map +/xilinx/ff_map.v");
                }
  
                if (check_label(active, run_from, run_to, "map_cells"))