From: Eddie Hung <eddie@fpgeh.com>
Date: Fri, 26 Apr 2019 22:35:55 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/master' into xc7mux
X-Git-Tag: working-ls180~1208^2~304
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=76b7c5d4cc8b1fe942e50302b0de1e9f08815324;p=yosys.git

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

76b7c5d4cc8b1fe942e50302b0de1e9f08815324
diff --cc techlibs/xilinx/synth_xilinx.cc
index 1320673e5,58dd928a0..524c54d3b
--- a/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@@ -292,14 -269,12 +292,13 @@@ struct SynthXilinxPass : public Pas
  			Pass::call(design, "dffsr2dff");
  			Pass::call(design, "dff2dffe");
  
 -			if (vpr) {
 -				Pass::call(design, "techmap -map +/xilinx/arith_map.v -D _EXPLICIT_CARRY");
 -			} else {
 -				Pass::call(design, "techmap -map +/xilinx/arith_map.v");
 +			if (!nocarry) {
 +				if (vpr)
 +					Pass::call(design, "techmap -map +/xilinx/arith_map.v -D _EXPLICIT_CARRY");
 +				else
 +					Pass::call(design, "techmap -map +/xilinx/arith_map.v");
  			}
  
- 			Pass::call(design, "hierarchy -check");
  			Pass::call(design, "opt -fast");
  		}