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

diff --cc techlibs/common/Makefile.inc
index e6d1c2f2940bf9fa23e2ddfd44420ab70110748d,de94798af6e5f9dcdfc51c795e141d9a3f4710f0..6c0a4fe66dd1db757c030c7f0ff426fcc7f02728
--- 1/techlibs/common/Makefile.inc
--- 2/techlibs/common/Makefile.inc
+++ b/techlibs/common/Makefile.inc
@@@ -28,4 -28,4 +28,5 @@@ $(eval $(call add_share_file,share,tech
  $(eval $(call add_share_file,share,techlibs/common/gate2lut.v))
  $(eval $(call add_share_file,share,techlibs/common/cmp2lut.v))
  $(eval $(call add_share_file,share,techlibs/common/cells.lib))
 +$(eval $(call add_share_file,share,techlibs/common/mul2dsp.v))
+ $(eval $(call add_share_file,share,techlibs/common/dummy.box))

diff --cc techlibs/ecp5/Makefile.inc
index a0c4e34e3c3ec678935963c369250a99e6b83af9,9efb6347fbca4db07b7137a24b49ed3b7c4e0da7..80eee5004e57432e7ca04a486c01e951b2493616
--- 1/techlibs/ecp5/Makefile.inc
--- 2/techlibs/ecp5/Makefile.inc
+++ b/techlibs/ecp5/Makefile.inc
@@@ -13,8 -13,10 +13,11 @@@ $(eval $(call add_share_file,share/ecp5
  $(eval $(call add_share_file,share/ecp5,techlibs/ecp5/bram.txt))
  $(eval $(call add_share_file,share/ecp5,techlibs/ecp5/arith_map.v))
  $(eval $(call add_share_file,share/ecp5,techlibs/ecp5/latches_map.v))
 +$(eval $(call add_share_file,share/ecp5,techlibs/ecp5/dsp_map.v))
  
+ $(eval $(call add_share_file,share/ecp5,techlibs/ecp5/abc_map.v))
+ $(eval $(call add_share_file,share/ecp5,techlibs/ecp5/abc_unmap.v))
+ $(eval $(call add_share_file,share/ecp5,techlibs/ecp5/abc_model.v))
  $(eval $(call add_share_file,share/ecp5,techlibs/ecp5/abc_5g.box))
  $(eval $(call add_share_file,share/ecp5,techlibs/ecp5/abc_5g.lut))
  $(eval $(call add_share_file,share/ecp5,techlibs/ecp5/abc_5g_nowide.lut))

diff --cc techlibs/ecp5/synth_ecp5.cc
Simple merge

diff --cc techlibs/ice40/synth_ice40.cc
Simple merge

diff --cc techlibs/xilinx/Makefile.inc
index 8996b20fa3b7656d2c1b2de2cbca6d77ccab4353,2efcf7d90cfb7a234cfe0a193577dee7c5fcd5cf..2cf0e8e330863f591e6cf55b1e7699efd8e97ab3
--- 1/techlibs/xilinx/Makefile.inc
--- 2/techlibs/xilinx/Makefile.inc
+++ b/techlibs/xilinx/Makefile.inc
@@@ -38,8 -38,10 +38,11 @@@ $(eval $(call add_share_file,share/xili
  $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/ff_map.v))
  $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/lut_map.v))
  $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/mux_map.v))
 +$(eval $(call add_share_file,share/xilinx,techlibs/xilinx/dsp_map.v))
  
+ $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/abc_map.v))
+ $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/abc_unmap.v))
+ $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/abc_model.v))
  $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/abc_xc7.box))
  $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/abc_xc7.lut))
  $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/abc_xc7_nowide.lut))

diff --cc techlibs/xilinx/cells_sim.v
Simple merge

diff --cc techlibs/xilinx/synth_xilinx.cc
Simple merge