From: Eddie Hung <eddieh@ece.ubc.ca>
Date: Thu, 21 Feb 2019 19:23:00 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/master' into xaig
X-Git-Tag: working-ls180~1237^2~277
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a8803a1519ce9191c43cd9a0f09d6c3ae99666e9;p=yosys.git

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

a8803a1519ce9191c43cd9a0f09d6c3ae99666e9
diff --cc techlibs/ice40/synth_ice40.cc
index f77ea7f80,d6d047fe7..a13a81246
--- a/techlibs/ice40/synth_ice40.cc
+++ b/techlibs/ice40/synth_ice40.cc
@@@ -98,8 -98,8 +101,9 @@@ struct SynthIce40Pass : public ScriptPa
  		log("\n");
  	}
  
 -	string top_opt, blif_file, edif_file, json_file;
++
 +	string top_opt, blif_file, edif_file, json_file, abc;
- 	bool nocarry, nodffe, nobram, flatten, retime, relut, noabc, abc2, vpr;
+ 	bool nocarry, nodffe, nobram, dsp, flatten, retime, relut, noabc, abc2, vpr;
  	int min_ce_use;
  
  	void clear_flags() YS_OVERRIDE