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

diff --cc CHANGELOG
index f0a0d0fae9efc339cdae7ab332d926fe2852e470,e416d152c97bcf0a7c51d3464f328f2e64c7cf97..50c611b8d247eb699c9c2323df4ff814d470572d
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -38,11 -38,7 +38,12 @@@ Yosys 0.9 .. Yosys 0.9-de
      - Improvements in pmgen: slices, choices, define, generate
      - Added "xilinx_srl" for Xilinx shift register extraction
      - Removed "shregmap -tech xilinx" (superseded by "xilinx_srl")
+     - Added "_TECHMAP_WIREINIT_*_" attribute and "_TECHMAP_REMOVEINIT_*_" wire for "techmap" pass
 +    - Added +/mul2dsp.v for decomposing wide multipliers to custom-sized ones
 +    - Added "xilinx_dsp" for Xilinx DSP packing
 +    - "synth_xilinx" to now infer DSP blocks (-nodsp to disable)
 +    - "synth_ecp5" to now infer DSP blocks (-nodsp to disable, experimental)
 +    - "synth_ice40 -dsp" to infer DSP blocks
  
  Yosys 0.8 .. Yosys 0.9
  ----------------------

diff --cc techlibs/xilinx/Makefile.inc
index 2cf0e8e330863f591e6cf55b1e7699efd8e97ab3,b5e81a79dbf41feec3580a8ce4a5f9771d7c8d0e..5f5aa55189dc08ee23818a30b6f511a7c8069205
--- 1/techlibs/xilinx/Makefile.inc
--- 2/techlibs/xilinx/Makefile.inc
+++ b/techlibs/xilinx/Makefile.inc
@@@ -35,10 -35,10 +35,11 @@@ $(eval $(call add_share_file,share/xili
  $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/lutrams.txt))
  $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/lutrams_map.v))
  $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/arith_map.v))
- $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/ff_map.v))
+ $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/xc6s_ff_map.v))
+ $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/xc7_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))

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