Fix -nocarry

diff --git a/techlibs/xilinx/synth_xilinx.cc b/techlibs/xilinx/synth_xilinx.cc
index bde95c638c977a85e7e1ab664a4f70b719677370..a0e77021ab14160aea2fa5ffe699e52ad9daafac 100644 (file)
--- a/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@ -241,10 +241,10 @@ struct SynthXilinxPass : public ScriptPass
                        run("dff2dffe");
                        run("opt -full");
 
-                       if (!vpr || help_mode)
-                               run("techmap -map +/xilinx/arith_map.v");
-                       else
+                       if (vpr && !nocarry && !help_mode)
                                run("techmap -map +/xilinx/arith_map.v -D _EXPLICIT_CARRY");
+                       else if (!nocarry || help_mode)
+                               run("techmap -map +/xilinx/arith_map.v", "(skip if '-nocarry')");
 
                        if (!nosrl || help_mode) {
                                // shregmap operates on bit-level flops, not word-level,