From: Eddie Hung <eddie@fpgeh.com>
Date: Tue, 4 Jun 2019 06:42:30 +0000 (-0700)
Subject: Respect -nocarry
X-Git-Tag: working-ls180~1208^2~207
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=09b778744dc036d54209644884e9dc9138f95771;p=yosys.git

Respect -nocarry
---

diff --git a/techlibs/xilinx/synth_xilinx.cc b/techlibs/xilinx/synth_xilinx.cc
index 19a19d14e..8ce552780 100644
--- a/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@ -270,9 +270,11 @@ struct SynthXilinxPass : public ScriptPass
 			if (vpr && !nocarry && !help_mode)
 				run("techmap -map +/techmap.v -map +/xilinx/arith_map.v -D _EXPLICIT_CARRY");
 			else if (abc == "abc9" && !nocarry && !help_mode)
-				run("techmap -map +/techmap.v -map +/xilinx/arith_map.v -D _CLB_CARRY", "(skip if '-nocarry')");
+				run("techmap -map +/techmap.v -map +/xilinx/arith_map.v -D _CLB_CARRY");
 			else if (!nocarry || help_mode)
 				run("techmap -map +/techmap.v -map +/xilinx/arith_map.v", "(skip if '-nocarry')");
+			else
+				run("techmap -map +/techmap.v");
 
 			run("opt -fast");
 		}