From: clairexen <claire@symbioticeda.com>
Date: Wed, 15 Jul 2020 09:49:09 +0000 (+0200)
Subject: Merge pull request #2257 from antmicro/fix-conflicts
X-Git-Tag: working-ls180~381
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=021ce8e59646ed9a6dff4447e11cceae9d3e615c;p=yosys.git

Merge pull request #2257 from antmicro/fix-conflicts

Restore #2203 and #2244 and fix parser conflicts
---

021ce8e59646ed9a6dff4447e11cceae9d3e615c