Merge branch 'master' of github.com:YosysHQ/yosys into clifford/pmgen

diff --cc CHANGELOG
index cceb9fc9ff211f0e7e827eefe7c02008fead1007,291c8d249d0a752e1ed219b9ea689d41b95c1703..1324b22037f2f3901ad5ab71b06d0c857f0170a1
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -19,7 -19,9 +19,10 @@@ Yosys 0.9 .. Yosys 0.9-de
      - Added automatic gzip compression (based on filename extension) for backends
      - Improve attribute and parameter encoding in JSON to avoid ambiguities between
        bit vectors and strings containing [01xz]*
 +    - Improvements in pmgen: subpattern and recursive matches
+     - Added "opt_share" pass, run as part of "opt -full"
+     - Added "ice40_wrapcarry" to encapsulate SB_LUT+SB_CARRY pairs for techmapping
+     - Removed "ice40_unlut"
  
  Yosys 0.8 .. Yosys 0.8-dev
  --------------------------

diff --cc Makefile
Simple merge

diff --cc passes/pmgen/Makefile.inc
index bea21d9714d7ecf48ed328ccc6ec9e026917dc53,c036061524af565c4a0873a396984951662f933e..790811d4c2ba846b6030b7648647d9f58c192519
--- 1/passes/pmgen/Makefile.inc
--- 2/passes/pmgen/Makefile.inc
+++ b/passes/pmgen/Makefile.inc
@@@ -3,15 -4,21 +3,21 @@@
  
  # --------------------------------------
  
 -passes/pmgen/ice40_dsp.o: passes/pmgen/ice40_dsp_pm.h
 -EXTRA_OBJS += passes/pmgen/ice40_dsp_pm.h
 -.SECONDARY: passes/pmgen/ice40_dsp_pm.h
++OBJS += passes/pmgen/test_pmgen.o
++passes/pmgen/test_pmgen.o: passes/pmgen/test_pmgen_pm.h
++$(eval $(call add_extra_objs,passes/pmgen/test_pmgen_pm.h))
+ 
 -passes/pmgen/ice40_dsp_pm.h: passes/pmgen/pmgen.py passes/pmgen/ice40_dsp.pmg
 -      $(P) mkdir -p passes/pmgen && python3 $< -o $@ -p ice40_dsp $(filter-out $<,$^)
++# --------------------------------------
++
 +OBJS += passes/pmgen/ice40_dsp.o
 +passes/pmgen/ice40_dsp.o: passes/pmgen/ice40_dsp_pm.h
 +$(eval $(call add_extra_objs,passes/pmgen/ice40_dsp_pm.h))
  
  # --------------------------------------
  
- OBJS += passes/pmgen/test_pmgen.o
- passes/pmgen/test_pmgen.o: passes/pmgen/test_pmgen_pm.h
++OBJS += passes/pmgen/ice40_wrapcarry.o
+ passes/pmgen/ice40_wrapcarry.o: passes/pmgen/ice40_wrapcarry_pm.h
 -EXTRA_OBJS += passes/pmgen/ice40_wrapcarry_pm.h
 -.SECONDARY: passes/pmgen/ice40_wrapcarry_pm.h
 -
 -passes/pmgen/ice40_wrapcarry_pm.h: passes/pmgen/pmgen.py passes/pmgen/ice40_wrapcarry.pmg
 -      $(P) mkdir -p passes/pmgen && python3 $< -o $@ -p ice40_wrapcarry $(filter-out $<,$^)
 +$(eval $(call add_extra_objs,passes/pmgen/test_pmgen_pm.h))
  
  # --------------------------------------