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

diff --cc techlibs/xilinx/synth_xilinx.cc
index 2a641e933d2a0e542dd5afa3865be32225e7239a,83c2edc866278f8e46905dc148eefbed57b5c46f..0372cb43cfe7ccece1bfd01167fc414d41d8f88e
--- 1/techlibs/xilinx/synth_xilinx.cc
--- 2/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@@ -104,9 -99,8 +104,9 @@@ struct SynthXilinxPass : public ScriptP
                log("\n");
        }
  
-       std::string top_opt, edif_file, blif_file, abc, arch;
+       std::string top_opt, edif_file, blif_file, arch;
        bool flatten, retime, vpr, nobram, nodram, nosrl, nocarry, nowidelut, abc9;
 +      int widemux;
  
        void clear_flags() YS_OVERRIDE
        {