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

diff --cc techlibs/xilinx/synth_xilinx.cc
index 2f3dfb012063200011f76e8ef75c9ebf486c22ac,7dbd980556e76f347aba547517dc9c1126cf1abf..c72c0ba8ce6d42b5ebec9937399d0a4334fbab72
--- 1/techlibs/xilinx/synth_xilinx.cc
--- 2/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@@ -104,9 -100,8 +105,9 @@@ struct SynthXilinxPass : public ScriptP
                log("\n");
        }
  
-       std::string top_opt, edif_file, blif_file, arch;
+       std::string top_opt, edif_file, blif_file, family;
        bool flatten, retime, vpr, nobram, nodram, nosrl, nocarry, nowidelut, abc9;
 +      int widemux;
  
        void clear_flags() YS_OVERRIDE
        {
@@@ -207,12 -197,9 +208,12 @@@
                }
                extra_args(args, argidx, design);
  
-               if (arch != "xcup" && arch != "xcu" && arch != "xc7" && arch != "xc6s")
-                       log_cmd_error("Invalid Xilinx -arch setting: %s\n", arch.c_str());
+               if (family != "xcup" && family != "xcu" && family != "xc7" && family != "xc6s")
+                       log_cmd_error("Invalid Xilinx -family setting: %s\n", family.c_str());
  
 +              if (widemux != 0 && widemux < 5)
 +                      log_cmd_error("-widemux value must be 0 or >= 5.\n");
 +
                if (!design->full_selection())
                        log_cmd_error("This command only operates on fully selected designs!\n");