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

diff --cc techlibs/xilinx/Makefile.inc
index 59fd61cf0d001868d676dd7de441fa6af6a4a810,e9ea10e48cf35e85b4a56d4ceca93e7c0c1ed8c1..17c5df37d8c925deb06e2f0559fd5f08df8bda6d
--- 1/techlibs/xilinx/Makefile.inc
--- 2/techlibs/xilinx/Makefile.inc
+++ b/techlibs/xilinx/Makefile.inc
@@@ -30,9 -30,10 +30,11 @@@ $(eval $(call add_share_file,share/xili
  $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/arith_map.v))
  $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/ff_map.v))
  $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/lut_map.v))
 +$(eval $(call add_share_file,share/xilinx,techlibs/xilinx/mux_map.v))
+ 
  $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/abc_xc7.box))
  $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/abc_xc7.lut))
+ $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/abc_xc7_nowide.lut))
  
  $(eval $(call add_gen_share_file,share/xilinx,techlibs/xilinx/brams_init_36.vh))
  $(eval $(call add_gen_share_file,share/xilinx,techlibs/xilinx/brams_init_32.vh))

diff --cc techlibs/xilinx/cells_map.v
index b13f8d1eed4b0e73b45cf18ccd860dc994bd2601,9a316fc969ec0ab0a7491518c47289dc0f693ecc..27e8608018196f03157037545127372f8af95446
--- 1/techlibs/xilinx/cells_map.v
--- 2/techlibs/xilinx/cells_map.v
+++ b/techlibs/xilinx/cells_map.v
@@@ -94,11 -94,11 +94,8 @@@ module \$__XILINX_SHREG_ (input C, inpu
        \$__XILINX_SHREG_ #(.DEPTH(DEPTH-64), .INIT(INIT[DEPTH-64-1:0]), .CLKPOL(CLKPOL), .ENPOL(ENPOL)) fpga_srl_2 (.C(C), .D(T3), .L(L[4:0]), .E(E), .Q(T4));
        if (&_TECHMAP_CONSTMSK_L_)
          assign Q = T4;
--      else begin
--        MUXF7 fpga_mux_0 (.O(T5), .I0(T0), .I1(T2), .S(L[5]));
--        MUXF7 fpga_mux_1 (.O(T6), .I0(T4), .I1(1'b0 /* unused */), .S(L[5]));
--        MUXF8 fpga_mux_2 (.O(Q), .I0(T5), .I1(T6), .S(L[6]));
--      end
++      else
++        \$__XILINX_MUXF78 fpga_hard_mux (.I0(T0), .I1(T2), .I2(T4), .I3(1'bx), .S0(L[5]), .S1(L[6]), .O(Q));
      end else
      if (DEPTH > 97 && DEPTH < 128) begin
        wire T0, T1, T2, T3, T4, T5, T6, T7, T8;
@@@ -108,11 -108,11 +105,8 @@@
        \$__XILINX_SHREG_ #(.DEPTH(DEPTH-96), .INIT(INIT[DEPTH-96-1:0]), .CLKPOL(CLKPOL), .ENPOL(ENPOL)) fpga_srl_3 (.C(C), .D(T5), .L(L[4:0]), .E(E), .Q(T6));
        if (&_TECHMAP_CONSTMSK_L_)
          assign Q = T6;
--      else begin
--        MUXF7 fpga_mux_0 (.O(T7), .I0(T0), .I1(T2), .S(L[5]));
--        MUXF7 fpga_mux_1 (.O(T8), .I0(T4), .I1(T6), .S(L[5]));
--        MUXF8 fpga_mux_2 (.O(Q), .I0(T7), .I1(T8), .S(L[6]));
--      end
++      else
++        \$__XILINX_MUXF78 fpga_hard_mux (.I0(T0), .I1(T2), .I2(T4), .I3(T6), .S0(L[5]), .S1(L[6]), .O(Q));
      end
      else if (DEPTH == 128) begin
        wire T0, T1, T2, T3, T4, T5, T6;
@@@ -122,12 -122,12 +116,8 @@@
        SRLC32E #(.INIT(INIT_R[128-1:96]), .IS_CLK_INVERTED(~CLKPOL[0])) fpga_srl_3 (.A(L[4:0]), .CE(CE), .CLK(C), .D(T5), .Q(T6), .Q31(SO));
        if (&_TECHMAP_CONSTMSK_L_)
          assign Q = T6;
--      else begin
--        wire T7, T8;
--        MUXF7 fpga_mux_0 (.O(T7), .I0(T0), .I1(T2), .S(L[5]));
--        MUXF7 fpga_mux_1 (.O(T8), .I0(T4), .I1(T6), .S(L[5]));
--        MUXF8 fpga_mux_2 (.O(Q), .I0(T7), .I1(T8), .S(L[6]));
--      end
++      else
++        \$__XILINX_MUXF78 fpga_hard_mux (.I0(T0), .I1(T2), .I2(T4), .I3(T6), .S0(L[5]), .S1(L[6]), .O(Q));
      end
      else if (DEPTH <= 129 && ~&_TECHMAP_CONSTMSK_L_) begin
        // Handle cases where fixed-length depth is