From: Eddie Hung <eddie@fpgeh.com>
Date: Tue, 4 Jun 2019 06:07:08 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/master' into xc7mux
X-Git-Tag: working-ls180~1208^2~210
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f81a0ed92e900604e77be01e92f1150c6c5cbde3;p=yosys.git

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

f81a0ed92e900604e77be01e92f1150c6c5cbde3
diff --cc techlibs/xilinx/synth_xilinx.cc
index 97464ffe4,a293081f1..e316c268e
--- a/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@@ -274,10 -237,11 +274,14 @@@ struct SynthXilinxPass : public ScriptP
  				run("shregmap -tech xilinx -minlen 3", "(skip if '-nosrl')");
  			}
  
 +			if (!nomux || help_mode)
 +				run("techmap -map +/xilinx/cells_map.v");
 +
- 			run("techmap");
+ 			if (!vpr || help_mode)
+ 				run("techmap -map +/techmap.v -map +/xilinx/arith_map.v");
+ 			else
+ 				run("techmap -map +/techmap.v +/xilinx/arith_map.v -D _EXPLICIT_CARRY");
+ 
  			run("opt -fast");
  		}